diff --git a/.vscode/launch.json b/.vscode/launch.json
index b389cbf2d..338d58fe3 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": "debugpy",
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 0b0629b4e..824ff170b 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/investments.py b/src/muse/investments.py
index 5ae9d2420..f5f4bed26 100644
--- a/src/muse/investments.py
+++ b/src/muse/investments.py
@@ -346,12 +346,15 @@ def scipy_match_demand(
             },
         )
         if not res.success:
-            getLogger(__name__).critical(res.message)
-            print(f"in sector containing {df_technologies.technology[0]}")
+            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 0da1c0859..d73dec4e1 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,21 +259,13 @@ 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"]],
         year=agent.forecast_year,
         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)
@@ -544,7 +555,9 @@ def lifetime_levelized_cost_of_energy(
 ):
     """Levelized cost of energy (LCOE) of technologies over their lifetime.
 
-    It follows the `simplified LCOE` given by NREL.
+    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.
 
     Arguments:
         agent: The agent of interest
@@ -669,7 +682,7 @@ def lifetime_levelized_cost_of_energy(
         + fixed_and_variable_costs
     ) / (denominator.sel(commodity=products).sum("commodity") * rates).sum("year")
 
-    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 dedea1808..a7bc5ba71 100644
--- a/src/muse/readers/csv.py
+++ b/src/muse/readers/csv.py
@@ -913,16 +913,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()
 
-        # 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
-            )
-            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
diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity/2020.csv b/tests/example_outputs/default_timeslice/Gas/Capacity/2020.csv
index b20216614..371cd8eab 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 2f6ef4468..2afc1e474 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 57b8cb7e0..3ebe19987 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 bb4dacd34..882acc455 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 aa3d4a785..9512c0de3 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 278e13882..33eaf0618 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 ee9f1881d..c90019967 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 0f73d68b8..a048f4b8f 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 2ed432d51..b289c102a 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 45e97e493..bc678ebba 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 431f68c9d..b346de209 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 9f6530279..cf76dc0a7 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