diff --git a/SampleComputationsOutput.txt b/SampleComputationsOutput.txt
index 5c04a8d..46a0c30 100644
--- a/SampleComputationsOutput.txt
+++ b/SampleComputationsOutput.txt
@@ -1,5 +1,5 @@
 Show HG TRV/HP model computations.
-Date/time: Tue Aug 01 18:04:02 BST 2023
+Date/time: Mon Sep 11 16:34:59 BST 2023
 
 Hardwired model, electricity demand normal / setback: 769W / 815W
 Parameterised model, all default parameters, electricity demand normal / setback: 769W / 815W
@@ -51,3 +51,170 @@ Glasgow (EGPF) 2018 hourly temperatures
 Percentage of hours that room setback raises heat pump demand: 56%
 Heat mean demand: with no setback 938W, with setback 832W; -11% change with setback
 Heat pump mean power: with no setback 327W, with setback 339W; 4% change with setback
+
+Bungalow (original) vs detached:
+Parameterised bungalow model, fixes applied for doors and CoP temperature, electricity demand normal / setback: 812W / 895W
+Parameterised detached model, fixes applied for doors and CoP temperature, electricity demand normal / setback: 1131W / 1348W
+
+7 towns/cites, 10Y hourly data (201x, 87648 hours), bungalow and detached, two room heating patterns:
+Belfast (weather station at EGAA):
+  Archetype bungalow
+    Layout ABAB
+      Scenario base model parameters: ModelParameters[doorsPerInternalWall=1.0, correctCoPForFlowVsMW=true, roomsAlternatingABAB=true, externalAirTemperatureC=-3.0]
+      Heat mean demand: with no setback 940W, with setback 830W; -12% change with setback
+      Heat pump mean power: with no setback 324W, with setback 334W; 3% change with setback
+      Percentage of hours that room setback raises heat pump demand: 56%
+    Layout AABB
+      Scenario base model parameters: ModelParameters[doorsPerInternalWall=1.0, correctCoPForFlowVsMW=true, roomsAlternatingABAB=false, externalAirTemperatureC=-3.0]
+      Heat mean demand: with no setback 940W, with setback 830W; -12% change with setback
+      Heat pump mean power: with no setback 324W, with setback 322W; -1% change with setback
+      Percentage of hours that room setback raises heat pump demand: 36%
+  Archetype detached
+    Layout ABAB
+      Scenario base model parameters: ModelParameters[doorsPerInternalWall=1.0, correctCoPForFlowVsMW=true, roomsAlternatingABAB=true, externalAirTemperatureC=-3.0]
+      Heat mean demand: with no setback 1442W, with setback 1273W; -12% change with setback
+      Heat pump mean power: with no setback 469W, with setback 523W; 12% change with setback
+      Percentage of hours that room setback raises heat pump demand: 77%
+    Layout AABB
+      Scenario base model parameters: ModelParameters[doorsPerInternalWall=1.0, correctCoPForFlowVsMW=true, roomsAlternatingABAB=false, externalAirTemperatureC=-3.0]
+      Heat mean demand: with no setback 1442W, with setback 1273W; -12% change with setback
+      Heat pump mean power: with no setback 469W, with setback 465W; -1% change with setback
+      Percentage of hours that room setback raises heat pump demand: 32%
+Manchester (weather station at EGCC):
+  Archetype bungalow
+    Layout ABAB
+      Scenario base model parameters: ModelParameters[doorsPerInternalWall=1.0, correctCoPForFlowVsMW=true, roomsAlternatingABAB=true, externalAirTemperatureC=-3.0]
+      Heat mean demand: with no setback 875W, with setback 772W; -12% change with setback
+      Heat pump mean power: with no setback 302W, with setback 311W; 3% change with setback
+      Percentage of hours that room setback raises heat pump demand: 52%
+    Layout AABB
+      Scenario base model parameters: ModelParameters[doorsPerInternalWall=1.0, correctCoPForFlowVsMW=true, roomsAlternatingABAB=false, externalAirTemperatureC=-3.0]
+      Heat mean demand: with no setback 875W, with setback 772W; -12% change with setback
+      Heat pump mean power: with no setback 302W, with setback 300W; -1% change with setback
+      Percentage of hours that room setback raises heat pump demand: 33%
+  Archetype detached
+    Layout ABAB
+      Scenario base model parameters: ModelParameters[doorsPerInternalWall=1.0, correctCoPForFlowVsMW=true, roomsAlternatingABAB=true, externalAirTemperatureC=-3.0]
+      Heat mean demand: with no setback 1344W, with setback 1186W; -12% change with setback
+      Heat pump mean power: with no setback 437W, with setback 487W; 12% change with setback
+      Percentage of hours that room setback raises heat pump demand: 72%
+    Layout AABB
+      Scenario base model parameters: ModelParameters[doorsPerInternalWall=1.0, correctCoPForFlowVsMW=true, roomsAlternatingABAB=false, externalAirTemperatureC=-3.0]
+      Heat mean demand: with no setback 1344W, with setback 1186W; -12% change with setback
+      Heat pump mean power: with no setback 437W, with setback 433W; -1% change with setback
+      Percentage of hours that room setback raises heat pump demand: 29%
+Cardiff (weather station at EGFF):
+  Archetype bungalow
+    Layout ABAB
+      Scenario base model parameters: ModelParameters[doorsPerInternalWall=1.0, correctCoPForFlowVsMW=true, roomsAlternatingABAB=true, externalAirTemperatureC=-3.0]
+      Heat mean demand: with no setback 800W, with setback 700W; -13% change with setback
+      Heat pump mean power: with no setback 271W, with setback 277W; 2% change with setback
+      Percentage of hours that room setback raises heat pump demand: 47%
+    Layout AABB
+      Scenario base model parameters: ModelParameters[doorsPerInternalWall=1.0, correctCoPForFlowVsMW=true, roomsAlternatingABAB=false, externalAirTemperatureC=-3.0]
+      Heat mean demand: with no setback 800W, with setback 700W; -13% change with setback
+      Heat pump mean power: with no setback 271W, with setback 267W; -2% change with setback
+      Percentage of hours that room setback raises heat pump demand: 26%
+  Archetype detached
+    Layout ABAB
+      Scenario base model parameters: ModelParameters[doorsPerInternalWall=1.0, correctCoPForFlowVsMW=true, roomsAlternatingABAB=true, externalAirTemperatureC=-3.0]
+      Heat mean demand: with no setback 1229W, with setback 1075W; -13% change with setback
+      Heat pump mean power: with no setback 394W, with setback 436W; 10% change with setback
+      Percentage of hours that room setback raises heat pump demand: 68%
+    Layout AABB
+      Scenario base model parameters: ModelParameters[doorsPerInternalWall=1.0, correctCoPForFlowVsMW=true, roomsAlternatingABAB=false, externalAirTemperatureC=-3.0]
+      Heat mean demand: with no setback 1229W, with setback 1075W; -13% change with setback
+      Heat pump mean power: with no setback 394W, with setback 388W; -2% change with setback
+      Percentage of hours that room setback raises heat pump demand: 22%
+London (weather station at EGLL):
+  Archetype bungalow
+    Layout ABAB
+      Scenario base model parameters: ModelParameters[doorsPerInternalWall=1.0, correctCoPForFlowVsMW=true, roomsAlternatingABAB=true, externalAirTemperatureC=-3.0]
+      Heat mean demand: with no setback 743W, with setback 652W; -12% change with setback
+      Heat pump mean power: with no setback 253W, with setback 260W; 2% change with setback
+      Percentage of hours that room setback raises heat pump demand: 43%
+    Layout AABB
+      Scenario base model parameters: ModelParameters[doorsPerInternalWall=1.0, correctCoPForFlowVsMW=true, roomsAlternatingABAB=false, externalAirTemperatureC=-3.0]
+      Heat mean demand: with no setback 743W, with setback 652W; -12% change with setback
+      Heat pump mean power: with no setback 253W, with setback 250W; -1% change with setback
+      Percentage of hours that room setback raises heat pump demand: 26%
+  Archetype detached
+    Layout ABAB
+      Scenario base model parameters: ModelParameters[doorsPerInternalWall=1.0, correctCoPForFlowVsMW=true, roomsAlternatingABAB=true, externalAirTemperatureC=-3.0]
+      Heat mean demand: with no setback 1140W, with setback 1000W; -12% change with setback
+      Heat pump mean power: with no setback 368W, with setback 407W; 11% change with setback
+      Percentage of hours that room setback raises heat pump demand: 62%
+    Layout AABB
+      Scenario base model parameters: ModelParameters[doorsPerInternalWall=1.0, correctCoPForFlowVsMW=true, roomsAlternatingABAB=false, externalAirTemperatureC=-3.0]
+      Heat mean demand: with no setback 1140W, with setback 1000W; -12% change with setback
+      Heat pump mean power: with no setback 368W, with setback 363W; -1% change with setback
+      Percentage of hours that room setback raises heat pump demand: 22%
+Newcastle (weather station at EGNT):
+  Archetype bungalow
+    Layout ABAB
+      Scenario base model parameters: ModelParameters[doorsPerInternalWall=1.0, correctCoPForFlowVsMW=true, roomsAlternatingABAB=true, externalAirTemperatureC=-3.0]
+      Heat mean demand: with no setback 954W, with setback 846W; -11% change with setback
+      Heat pump mean power: with no setback 331W, with setback 343W; 4% change with setback
+      Percentage of hours that room setback raises heat pump demand: 58%
+    Layout AABB
+      Scenario base model parameters: ModelParameters[doorsPerInternalWall=1.0, correctCoPForFlowVsMW=true, roomsAlternatingABAB=false, externalAirTemperatureC=-3.0]
+      Heat mean demand: with no setback 954W, with setback 846W; -11% change with setback
+      Heat pump mean power: with no setback 331W, with setback 331W; -0% change with setback
+      Percentage of hours that room setback raises heat pump demand: 39%
+  Archetype detached
+    Layout ABAB
+      Scenario base model parameters: ModelParameters[doorsPerInternalWall=1.0, correctCoPForFlowVsMW=true, roomsAlternatingABAB=true, externalAirTemperatureC=-3.0]
+      Heat mean demand: with no setback 1465W, with setback 1298W; -11% change with setback
+      Heat pump mean power: with no setback 479W, with setback 536W; 12% change with setback
+      Percentage of hours that room setback raises heat pump demand: 77%
+    Layout AABB
+      Scenario base model parameters: ModelParameters[doorsPerInternalWall=1.0, correctCoPForFlowVsMW=true, roomsAlternatingABAB=false, externalAirTemperatureC=-3.0]
+      Heat mean demand: with no setback 1465W, with setback 1298W; -11% change with setback
+      Heat pump mean power: with no setback 479W, with setback 477W; -0% change with setback
+      Percentage of hours that room setback raises heat pump demand: 35%
+Glasgow (weather station at EGPF):
+  Archetype bungalow
+    Layout ABAB
+      Scenario base model parameters: ModelParameters[doorsPerInternalWall=1.0, correctCoPForFlowVsMW=true, roomsAlternatingABAB=true, externalAirTemperatureC=-3.0]
+      Heat mean demand: with no setback 954W, with setback 845W; -11% change with setback
+      Heat pump mean power: with no setback 332W, with setback 343W; 4% change with setback
+      Percentage of hours that room setback raises heat pump demand: 56%
+    Layout AABB
+      Scenario base model parameters: ModelParameters[doorsPerInternalWall=1.0, correctCoPForFlowVsMW=true, roomsAlternatingABAB=false, externalAirTemperatureC=-3.0]
+      Heat mean demand: with no setback 954W, with setback 845W; -11% change with setback
+      Heat pump mean power: with no setback 332W, with setback 331W; -0% change with setback
+      Percentage of hours that room setback raises heat pump demand: 37%
+  Archetype detached
+    Layout ABAB
+      Scenario base model parameters: ModelParameters[doorsPerInternalWall=1.0, correctCoPForFlowVsMW=true, roomsAlternatingABAB=true, externalAirTemperatureC=-3.0]
+      Heat mean demand: with no setback 1465W, with setback 1297W; -11% change with setback
+      Heat pump mean power: with no setback 479W, with setback 536W; 12% change with setback
+      Percentage of hours that room setback raises heat pump demand: 77%
+    Layout AABB
+      Scenario base model parameters: ModelParameters[doorsPerInternalWall=1.0, correctCoPForFlowVsMW=true, roomsAlternatingABAB=false, externalAirTemperatureC=-3.0]
+      Heat mean demand: with no setback 1465W, with setback 1297W; -11% change with setback
+      Heat pump mean power: with no setback 479W, with setback 477W; -0% change with setback
+      Percentage of hours that room setback raises heat pump demand: 33%
+Edinburgh (weather station at EGPH):
+  Archetype bungalow
+    Layout ABAB
+      Scenario base model parameters: ModelParameters[doorsPerInternalWall=1.0, correctCoPForFlowVsMW=true, roomsAlternatingABAB=true, externalAirTemperatureC=-3.0]
+      Heat mean demand: with no setback 970W, with setback 859W; -11% change with setback
+      Heat pump mean power: with no setback 337W, with setback 349W; 4% change with setback
+      Percentage of hours that room setback raises heat pump demand: 58%
+    Layout AABB
+      Scenario base model parameters: ModelParameters[doorsPerInternalWall=1.0, correctCoPForFlowVsMW=true, roomsAlternatingABAB=false, externalAirTemperatureC=-3.0]
+      Heat mean demand: with no setback 970W, with setback 859W; -11% change with setback
+      Heat pump mean power: with no setback 337W, with setback 337W; -0% change with setback
+      Percentage of hours that room setback raises heat pump demand: 38%
+  Archetype detached
+    Layout ABAB
+      Scenario base model parameters: ModelParameters[doorsPerInternalWall=1.0, correctCoPForFlowVsMW=true, roomsAlternatingABAB=true, externalAirTemperatureC=-3.0]
+      Heat mean demand: with no setback 1488W, with setback 1319W; -11% change with setback
+      Heat pump mean power: with no setback 487W, with setback 546W; 12% change with setback
+      Percentage of hours that room setback raises heat pump demand: 78%
+    Layout AABB
+      Scenario base model parameters: ModelParameters[doorsPerInternalWall=1.0, correctCoPForFlowVsMW=true, roomsAlternatingABAB=false, externalAirTemperatureC=-3.0]
+      Heat mean demand: with no setback 1488W, with setback 1319W; -11% change with setback
+      Heat pump mean power: with no setback 487W, with setback 485W; -0% change with setback
+      Percentage of hours that room setback raises heat pump demand: 35%