diff --git a/Zero_Interface-Loader.alpx b/Zero_Interface-Loader.alpx
index d78122b..7bb7bf4 100644
--- a/Zero_Interface-Loader.alpx
+++ b/Zero_Interface-Loader.alpx
@@ -392,6 +392,20 @@
 				<Id>1762351349700</Id>
 				<Name><![CDATA[J_RemainingTotalsManager]]></Name>
 			</JavaClass>
+			<JavaClass>
+				<Id>1768318961854</Id>
+				<Name><![CDATA[PBL_DHWAndCooking_data]]></Name>
+				<Folder>1754045711603</Folder>
+			</JavaClass>
+			<JavaClass>
+				<Id>1768388160903</Id>
+				<Name><![CDATA[PBL_SpaceHeatingAndResidents_data]]></Name>
+				<Folder>1754045711603</Folder>
+			</JavaClass>
+			<JavaClass>
+				<Id>1768469188881</Id>
+				<Name><![CDATA[J_PBLUtil]]></Name>
+			</JavaClass>
 		</JavaClasses>
 		<RequiredLibraryReference>
 			<LibraryName>zero_engine</LibraryName>
diff --git a/_alp/Agents/AVGC_data/Code/Functions.java b/_alp/Agents/AVGC_data/Code/Functions.java
index 6f777c1..2de5780 100644
--- a/_alp/Agents/AVGC_data/Code/Functions.java
+++ b/_alp/Agents/AVGC_data/Code/Functions.java
@@ -1,85 +1,143 @@
 double f_setAVGC_data()
 {/*ALCODESTART::1726584205530*/
+//Perform sanity checks on the values
+f_sanityChecks();
+
+//Create AVGC_data class, assign the values and send to the engine
 J_AVGC_data dataAVGC = new J_AVGC_data();
 zero_Loader.energyModel.avgc_data = dataAVGC;
 
+////Averages
+//House
 dataAVGC.p_avgHouseGasConsumption_m3_yr = p_avgHouseGasConsumption_m3_yr;
+dataAVGC.p_maxAvgHouseGasConsumptionOffset_m3pa = p_maxAvgHouseGasConsumptionOffset_m3pa;
 dataAVGC.p_avgHouseElectricityConsumption_kWh_yr = p_avgHouseElectricityConsumption_kWh_yr;
-dataAVGC.p_avgEVMaxChargePowerVan_kW = p_avgEVMaxChargePowerVan_kW;
+dataAVGC.p_maxAvgHouseElectricityConsumptionOffset_kWhpa = p_maxAvgHouseElectricityConsumptionOffset_kWhpa;
 dataAVGC.p_avgHouseConnectionCapacity_kW = p_avgHouseConnectionCapacity_kW;
-dataAVGC.p_avgHouseHeatingMethod = p_avgHouseHeatingMethod;
 dataAVGC.p_avgNrOfCarsPerHouse = p_avgNrOfCarsPerHouse;
+dataAVGC.p_avgHouseHeatingMethod = p_avgHouseHeatingMethod;
 dataAVGC.p_ratioEVHousePersonalCars = p_shareOfElectricVehicleOwnership;
-dataAVGC.p_avgEVMaxChargePowerCar_kW = p_avgEVMaxChargePowerCar_kW;
-dataAVGC.p_avgEVMaxChargePowerTruck_kW = p_avgEVMaxChargePowerTruck_kW;
-dataAVGC.p_avgEVStorageCar_kWh = p_avgEVStorageCar_kWh;
-dataAVGC.p_avgEVStorageVan_kWh = p_avgEVStorageVan_kWh;
 dataAVGC.p_avgHousePVInstallationPower_kWp = p_avgHousePVInstallationPower_kWp;
-dataAVGC.p_avgEVStorageTruck_kWh = p_avgEVStorageTruck_kWh;
 dataAVGC.p_ratioHouseInstalledPV = p_ratioHouseInstalledPV;
-dataAVGC.p_gas_kWhpm3 = p_gas_kWhpm3;
-dataAVGC.p_diesel_kWhpl = p_diesel_kWhpl;
-dataAVGC.p_gasoline_kWhpl = p_gasoline_kWhpl;
-dataAVGC.p_waterHeatCapacity_JpkgK = p_waterHeatCapacity_JpkgK;
-dataAVGC.p_waterDensity_kgpm3 = p_waterDensity_kgpm3;
+dataAVGC.p_avgRatioHouseBatteryStorageCapacity_v_PVPower = p_avgRatioHouseBatteryStorageCapacity_v_PVPower;
+
+dataAVGC.p_avgSpaceHeatingTotalGasConsumptionShare_fr = p_avgSpaceHeatingTotalGasConsumptionShare_fr;
+dataAVGC.p_avgDHWTotalGasConsumptionShare_fr = p_avgDHWTotalGasConsumptionShare_fr;
+dataAVGC.p_avgCookingTotalGasConsumptionShare_fr = p_avgCookingTotalGasConsumptionShare_fr;
+
+//Utilities
 dataAVGC.p_avgUtilityHeatingMethod = p_avgUtilityHeatingMethod;
 dataAVGC.p_avgUtilityConnectionCapacity_kW = p_avgUtilityConnectionCapacity_kW;
 dataAVGC.p_avgUtilityPVPower_kWp = p_avgUtilityPVPower_kWp;
 dataAVGC.p_ratioElectricTrucks = p_ratioElectricTrucks;
 dataAVGC.p_avgCompanyHeatingMethod = p_avgCompanyHeatingMethod;
+dataAVGC.p_avgCompanyElectricityConsumption_kWhpm2 = p_avgCompanyElectricityConsumption_kWhpm2;
+dataAVGC.p_avgCompanyGasConsumption_m3pm2 = p_avgCompanyGasConsumption_m3pm2;
+dataAVGC.p_avgCompanyHeatConsumption_kWhpm2 = p_avgCompanyHeatConsumption_kWhpm2;
+
+//Vehicles
+dataAVGC.p_avgEVMaxChargePowerCar_kW = p_avgEVMaxChargePowerCar_kW;
+dataAVGC.p_avgEVMaxChargePowerVan_kW = p_avgEVMaxChargePowerVan_kW;
+dataAVGC.p_avgEVMaxChargePowerTruck_kW = p_avgEVMaxChargePowerTruck_kW;
+dataAVGC.p_avgEVStorageCar_kWh = p_avgEVStorageCar_kWh;
+dataAVGC.p_avgEVStorageVan_kWh = p_avgEVStorageVan_kWh;
+dataAVGC.p_avgEVStorageTruck_kWh = p_avgEVStorageTruck_kWh;
 dataAVGC.p_avgEVEnergyConsumptionCar_kWhpkm = p_avgEVEnergyConsumptionCar_kWhpkm;
 dataAVGC.p_avgEVEnergyConsumptionVan_kWhpkm = p_avgEVEnergyConsumptionVan_kWhpkm;
 dataAVGC.p_avgEVEnergyConsumptionTruck_kWhpkm = p_avgEVEnergyConsumptionTruck_kWhpkm;
-dataAVGC.p_hydrogenEnergyDensity_kWh_Nm3 = p_hydrogenEnergyDensity_kWh_Nm3;
 dataAVGC.p_avgDieselConsumptionCar_kmpl = p_avgDieselConsumptionCar_kmpl;
 dataAVGC.p_avgGasolineConsumptionCar_kmpl = p_avgGasolineConsumptionCar_kmpl;
-dataAVGC.p_hydrogenSpecificEnergy_kWh_kg = p_hydrogenSpecificEnergy_kWh_kg;
-dataAVGC.p_hydrogenDensity_kg_Nm3 = p_hydrogenDensity_kg_Nm3;
-dataAVGC.p_oxygenDensity_kg_Nm3 = p_oxygenDensity_kg_Nm3;
-dataAVGC.p_avgCOPHeatpump = p_avgCOPHeatpump;
-dataAVGC.p_avgEfficiencyHeatpump_fr = p_avgEfficiencyHeatpump_fr;
 dataAVGC.p_avgDieselConsumptionCar_kWhpkm = p_avgDieselConsumptionCar_kWhpkm;
-dataAVGC.p_oxygenProduction_kgO2pkgH2 = p_oxygenProduction_kgO2pkgH2;
 dataAVGC.p_avgGasolineConsumptionCar_kWhpkm = p_avgGasolineConsumptionCar_kWhpkm;
 dataAVGC.p_avgDieselConsumptionVan_kmpl = p_avgDieselConsumptionVan_kmpl;
 dataAVGC.p_avgDieselConsumptionVan_kWhpkm = p_avgDieselConsumptionVan_kWhpkm;
 dataAVGC.p_avgDieselConsumptionTruck_kmpl = p_avgDieselConsumptionTruck_kmpl;
 dataAVGC.p_avgDieselConsumptionTruck_kWhpkm = p_avgDieselConsumptionTruck_kWhpkm;
-dataAVGC.p_avgOutputTemperatureElectricHeatpump_degC = p_avgOutputTemperatureElectricHeatpump_degC;
-dataAVGC.p_avgOutputTemperatureHybridHeatpump_degC = p_avgOutputTemperatureHybridHeatpump_degC;
 dataAVGC.p_avgHydrogenConsumptionCar_kWhpkm = p_avgHydrogenConsumptionCar_kWhpkm;
-dataAVGC.p_avgEfficiencyGasBurner_fr = p_avgEfficiencyGasBurner_fr;
 dataAVGC.p_avgHydrogenConsumptionVan_kWhpkm = p_avgHydrogenConsumptionVan_kWhpkm;
 dataAVGC.p_avgHydrogenConsumptionTruck_kWhpkm = p_avgHydrogenConsumptionTruck_kWhpkm;
+
+dataAVGC.p_v1gProbability = p_v1gProbability;
+dataAVGC.p_v2gProbability = p_v2gProbability;
+dataAVGC.p_avgVehiclesPerCharger_Chargepoint = p_avgVehiclesPerCharger_Chargepoint;
+dataAVGC.p_avgVehiclesPerCharger_Centre = p_avgVehiclesPerCharger_Centre;
+
+dataAVGC.p_avgAnnualTravelDistancePrivateCar_km = p_avgAnnualTravelDistancePrivateCar_km;
+dataAVGC.p_avgAnnualTravelDistanceCompanyCar_km = p_avgAnnualTravelDistanceCompanyCar_km;
+dataAVGC.p_avgAnnualTravelDistanceVan_km = p_avgAnnualTravelDistanceVan_km;
+dataAVGC.p_avgAnnualTravelDistanceTruck_km = p_avgAnnualTravelDistanceTruck_km;
+dataAVGC.p_minAnnualTravelDistanceSurveyVehicle_km = p_minAnnualTravelDistanceSurveyVehicle_km;
+
+
+//Heating assets
+dataAVGC.p_avgCOPHeatpump = p_avgCOPHeatpump;
+dataAVGC.p_avgEfficiencyHeatpump_fr = p_avgEfficiencyHeatpump_fr;
+dataAVGC.p_avgOutputTemperatureElectricHeatpump_degC = p_avgOutputTemperatureElectricHeatpump_degC;
+dataAVGC.p_avgOutputTemperatureHybridHeatpump_degC = p_avgOutputTemperatureHybridHeatpump_degC;
+dataAVGC.p_minHeatpumpElectricCapacity_kW = p_minHeatpumpElectricCapacity_kW;
+
+dataAVGC.p_avgEfficiencyGasBurner_fr = p_avgEfficiencyGasBurner_fr;
 dataAVGC.p_avgOutputTemperatureGasBurner_degC = p_avgOutputTemperatureGasBurner_degC;
+dataAVGC.p_minGasBurnerOutputCapacity_kW = p_minGasBurnerOutputCapacity_kW;
+
 dataAVGC.p_avgEfficiencyHydrogenBurner_fr = p_avgEfficiencyHydrogenBurner_fr;
 dataAVGC.p_avgOutputTemperatureHydrogenBurner_degC = p_avgOutputTemperatureHydrogenBurner_degC;
-dataAVGC.p_minHeatpumpElectricCapacity_kW = p_minHeatpumpElectricCapacity_kW;
-dataAVGC.p_minGasBurnerOutputCapacity_kW = p_minGasBurnerOutputCapacity_kW;
 dataAVGC.p_minHydrogenBurnerOutputCapacity_kW = p_minHydrogenBurnerOutputCapacity_kW;
+
+dataAVGC.p_avgEfficiencyDistrictHeatingDeliverySet_fr = p_avgEfficiencyDistrictHeatingDeliverySet_fr;
+dataAVGC.p_avgOutputTemperatureDistrictHeatingDeliverySet_degC = p_avgOutputTemperatureDistrictHeatingDeliverySet_degC;
 dataAVGC.p_minDistrictHeatingDeliverySetOutputCapacity_kW = p_minDistrictHeatingDeliverySetOutputCapacity_kW;
-dataAVGC.p_avgPVPower_kWpm2= p_avgPVPower_kWpm2;
-dataAVGC.p_avgRatioRoofPotentialPV = p_avgRatioRoofPotentialPV;
-dataAVGC.p_avgRatioBatteryCapacity_v_Power = p_avgRatioBatteryCapacity_v_Power;
-dataAVGC.p_avgRatioHouseBatteryStorageCapacity_v_PVPower = p_avgRatioHouseBatteryStorageCapacity_v_PVPower;
-dataAVGC.p_avgSolarFieldPower_kWppha = p_avgSolarFieldPower_kWppha;
+
 dataAVGC.p_avgEfficiencyCHP_thermal_fr = p_avgEfficiencyCHP_thermal_fr;
 dataAVGC.p_avgEfficiencyCHP_electric_fr = p_avgEfficiencyCHP_thermal_fr;
 dataAVGC.p_avgOutputTemperatureCHP_degC = p_avgEfficiencyCHP_thermal_fr;
-dataAVGC.p_avgEfficiencyDistrictHeatingDeliverySet_fr = p_avgEfficiencyDistrictHeatingDeliverySet_fr;
-dataAVGC.p_avgOutputTemperatureDistrictHeatingDeliverySet_degC = p_avgOutputTemperatureDistrictHeatingDeliverySet_degC;
-dataAVGC.p_v1gProbability = p_v1gProbability;
-dataAVGC.p_v2gProbability = p_v2gProbability;
-dataAVGC.p_avgEVsPerPublicCharger = p_avgEVsPerPublicCharger;
+
 dataAVGC.p_avgPTPower_kWpm2 = p_avgPTPower_kWpm2;
 dataAVGC.p_avgPTPanelSize_m2 = p_avgPTPanelSize_m2;
+
 dataAVGC.p_avgMaxHeatBufferTemperature_degC = p_avgMaxHeatBufferTemperature_degC;
 dataAVGC.p_avgMinHeatBufferTemperature_degC = p_avgMinHeatBufferTemperature_degC;
 dataAVGC.p_avgHeatBufferWaterVolumePerPTSurface_m3pm2 = p_avgHeatBufferWaterVolumePerPTSurface_m3pm2;
 dataAVGC.p_avgHeatBufferWaterVolumePerHPPower_m3pkW = p_avgHeatBufferWaterVolumePerHPPower_m3pkW;
-dataAVGC.p_avgAnnualTravelDistancePrivateCar_km = p_avgAnnualTravelDistancePrivateCar_km;
-dataAVGC.p_avgAnnualTravelDistanceCompanyCar_km = p_avgAnnualTravelDistanceCompanyCar_km;
-dataAVGC.p_avgAnnualTravelDistanceVan_km = p_avgAnnualTravelDistanceVan_km;
-dataAVGC.p_avgAnnualTravelDistanceTruck_km = p_avgAnnualTravelDistanceTruck_km;
+
+
+//Electricity assets
+dataAVGC.p_avgPVPower_kWpm2= p_avgPVPower_kWpm2;
+dataAVGC.p_avgRatioRoofPotentialPV = p_avgRatioRoofPotentialPV;
+dataAVGC.p_avgRatioBatteryCapacity_v_Power = p_avgRatioBatteryCapacity_v_Power;
+dataAVGC.p_avgSolarFieldPower_kWppha = p_avgSolarFieldPower_kWppha;
+
+
+//Thermal model parameters
+dataAVGC.p_PBL_HeatingLossFactor_fr = p_PBL_HeatingLossFactor_fr;
+dataAVGC.map_insulationLabel_lossfactorPerFloorSurface_WpKm2 = map_insulationLabel_lossfactorPerFloorSurface_WpKm2;
+dataAVGC.p_solarAbsorptionFloorSurfaceScalingFactor_fr = p_solarAbsorptionFloorSurfaceScalingFactor_fr;
+dataAVGC.map_insulationLabel_cooldownPeriod_hr = map_insulationLabel_cooldownPeriod_hr;
+dataAVGC.p_heatCapacitySizingConstant_JpK = p_heatCapacitySizingConstant_JpK;
+dataAVGC.p_heatCapacitySizingSlope_JpKm2 = p_heatCapacitySizingSlope_JpKm2;
+dataAVGC.p_heatCapacitySizingFactor_fr = p_heatCapacitySizingFactor_fr;
+
+
+////Constants
+dataAVGC.p_gas_kWhpm3 = p_gas_kWhpm3;
+dataAVGC.p_diesel_kWhpl = p_diesel_kWhpl;
+dataAVGC.p_gasoline_kWhpl = p_gasoline_kWhpl;
+dataAVGC.p_waterHeatCapacity_JpkgK = p_waterHeatCapacity_JpkgK;
+dataAVGC.p_waterDensity_kgpm3 = p_waterDensity_kgpm3;
+dataAVGC.p_hydrogenEnergyDensity_kWh_Nm3 = p_hydrogenEnergyDensity_kWh_Nm3;
+dataAVGC.p_hydrogenSpecificEnergy_kWh_kg = p_hydrogenSpecificEnergy_kWh_kg;
+dataAVGC.p_hydrogenDensity_kg_Nm3 = p_hydrogenDensity_kg_Nm3;
+dataAVGC.p_oxygenDensity_kg_Nm3 = p_oxygenDensity_kg_Nm3;
+dataAVGC.p_oxygenProduction_kgO2pkgH2 = p_oxygenProduction_kgO2pkgH2;
+
+/*ALCODEEND*/}
+
+double f_sanityChecks()
+{/*ALCODESTART::1768486936015*/
+if(p_avgSpaceHeatingTotalGasConsumptionShare_fr +
+	p_avgCookingTotalGasConsumptionShare_fr +
+	p_avgDHWTotalGasConsumptionShare_fr != 1){
+throw new RuntimeException("Total average heating+dhw+cooking house gas consumption shares dont add up to 1");
+}
 /*ALCODEEND*/}
 
diff --git a/_alp/Agents/AVGC_data/Code/Functions.xml b/_alp/Agents/AVGC_data/Code/Functions.xml
index 315359a..d6e23e6 100644
--- a/_alp/Agents/AVGC_data/Code/Functions.xml
+++ b/_alp/Agents/AVGC_data/Code/Functions.xml
@@ -16,4 +16,21 @@
 		<ShowLabel>true</ShowLabel>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1768486936015</Id>
+		<Name><![CDATA[f_sanityChecks]]></Name>
+		<Description><![CDATA[Function where sanity checks can be implemented that will be performed when the data is send to the engine (start of model, after custom project parameters have been set).]]></Description>
+		<X>60</X>
+		<Y>70</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
 </Functions>
diff --git a/_alp/Agents/AVGC_data/Levels/Level.level.xml b/_alp/Agents/AVGC_data/Levels/Level.level.xml
index ce9c9b2..d0ce00b 100644
--- a/_alp/Agents/AVGC_data/Levels/Level.level.xml
+++ b/_alp/Agents/AVGC_data/Levels/Level.level.xml
@@ -3,7 +3,7 @@
 	<Rectangle>
 		<Id>1726584205536</Id>
 		<Name><![CDATA[rect_constants]]></Name>
-		<X>1020</X>
+		<X>1500</X>
 		<Y>0</Y>
 		<Label>
 			<X>10</X>
@@ -21,7 +21,7 @@
 		<LineColor>-16777216</LineColor>
 		<LineMaterial>null</LineMaterial>
 		<LineStyle>SOLID</LineStyle>
-		<Width>896.894</Width>
+		<Width>416.894</Width>
 		<Height>1400</Height>
 		<Rotation>0.0</Rotation>
 		<FillColor>-1</FillColor>
@@ -30,7 +30,7 @@
 	<Rectangle>
 		<Id>1726584205538</Id>
 		<Name><![CDATA[rect_avg]]></Name>
-		<X>0.737</X>
+		<X>0</X>
 		<Y>0</Y>
 		<Label>
 			<X>10</X>
@@ -48,7 +48,7 @@
 		<LineColor>-16777216</LineColor>
 		<LineMaterial>null</LineMaterial>
 		<LineStyle>SOLID</LineStyle>
-		<Width>1019.263</Width>
+		<Width>1500</Width>
 		<Height>1400</Height>
 		<Rotation>0.0</Rotation>
 		<FillColor>-1</FillColor>
@@ -58,7 +58,7 @@
 		<Id>1726584205540</Id>
 		<Name><![CDATA[txt_houses]]></Name>
 		<X>40</X>
-		<Y>80</Y>
+		<Y>120</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -83,7 +83,7 @@
 		<Id>1726584205542</Id>
 		<Name><![CDATA[txt_avgCompanies]]></Name>
 		<X>40</X>
-		<Y>280</Y>
+		<Y>480</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -107,8 +107,8 @@
 	<Text>
 		<Id>1726584205544</Id>
 		<Name><![CDATA[txt_avgEV]]></Name>
-		<X>560</X>
-		<Y>75</Y>
+		<X>1000</X>
+		<Y>115</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -132,7 +132,7 @@
 	<Text>
 		<Id>1726584205546</Id>
 		<Name><![CDATA[text3]]></Name>
-		<X>1440</X>
+		<X>1680</X>
 		<Y>40</Y>
 		<Label>
 			<X>0</X>
@@ -158,8 +158,8 @@
 	<Text>
 		<Id>1726584205548</Id>
 		<Name><![CDATA[text4]]></Name>
-		<X>1060</X>
-		<Y>200</Y>
+		<X>1540</X>
+		<Y>220</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -183,7 +183,7 @@
 	<Text>
 		<Id>1726584205550</Id>
 		<Name><![CDATA[text5]]></Name>
-		<X>480</X>
+		<X>750</X>
 		<Y>40</Y>
 		<Label>
 			<X>0</X>
@@ -209,8 +209,8 @@
 	<Rectangle>
 		<Id>1726584205552</Id>
 		<Name><![CDATA[rect_hydrogenC]]></Name>
-		<X>1560</X>
-		<Y>100</Y>
+		<X>1540</X>
+		<Y>420</Y>
 		<Label>
 			<X>10</X>
 			<Y>10</Y>
@@ -226,7 +226,7 @@
 		<LineColor>-16711681</LineColor>
 		<LineMaterial>null</LineMaterial>
 		<LineStyle>SOLID</LineStyle>
-		<Width>340</Width>
+		<Width>360</Width>
 		<Height>200</Height>
 		<Rotation>0.0</Rotation>
 		<FillColor>-1</FillColor>
@@ -235,8 +235,8 @@
 	<Text>
 		<Id>1726584205554</Id>
 		<Name><![CDATA[txt_hydrogenC]]></Name>
-		<X>1580</X>
-		<Y>120</Y>
+		<X>1560</X>
+		<Y>440</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -260,8 +260,8 @@
 	<Text>
 		<Id>1726584205556</Id>
 		<Name><![CDATA[txt_avgFossil]]></Name>
-		<X>560</X>
-		<Y>360</Y>
+		<X>1000</X>
+		<Y>400</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -285,8 +285,8 @@
 	<Text>
 		<Id>1726584205558</Id>
 		<Name><![CDATA[txt_Heatassets]]></Name>
-		<X>40</X>
-		<Y>470</Y>
+		<X>500</X>
+		<Y>115</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -310,8 +310,8 @@
 	<Text>
 		<Id>1726584205560</Id>
 		<Name><![CDATA[txt_avgPV]]></Name>
-		<X>40</X>
-		<Y>990</Y>
+		<X>510</X>
+		<Y>825</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -335,8 +335,8 @@
 	<Text>
 		<Id>1726584205562</Id>
 		<Name><![CDATA[txt_avgBat]]></Name>
-		<X>40</X>
-		<Y>1095</Y>
+		<X>510</X>
+		<Y>930</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -360,8 +360,8 @@
 	<Text>
 		<Id>1726584205564</Id>
 		<Name><![CDATA[txt_avgFCV]]></Name>
-		<X>560</X>
-		<Y>610</Y>
+		<X>1000</X>
+		<Y>650</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -385,8 +385,8 @@
 	<Text>
 		<Id>1726584205566</Id>
 		<Name><![CDATA[txt_heatpumps]]></Name>
-		<X>60</X>
-		<Y>490</Y>
+		<X>520</X>
+		<Y>135</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -410,8 +410,8 @@
 	<Text>
 		<Id>1726584205568</Id>
 		<Name><![CDATA[txt_gasburners]]></Name>
-		<X>60</X>
-		<Y>620</Y>
+		<X>520</X>
+		<Y>265</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -435,8 +435,8 @@
 	<Text>
 		<Id>1726584205570</Id>
 		<Name><![CDATA[txt_hydrogenburners]]></Name>
-		<X>60</X>
-		<Y>710</Y>
+		<X>520</X>
+		<Y>355</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -478,8 +478,8 @@
 		<LineColor>-65536</LineColor>
 		<LineMaterial>null</LineMaterial>
 		<LineStyle>SOLID</LineStyle>
-		<Width>170</Width>
-		<Height>60</Height>
+		<Width>260</Width>
+		<Height>80</Height>
 		<Rotation>0.0</Rotation>
 		<FillColor>-1</FillColor>
 		<FillMaterial>null</FillMaterial>
@@ -513,8 +513,8 @@
 	<Text>
 		<Id>1726584205576</Id>
 		<Name><![CDATA[txt_timeC]]></Name>
-		<X>1060</X>
-		<Y>120</Y>
+		<X>1540</X>
+		<Y>140</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -538,8 +538,8 @@
 	<Text>
 		<Id>1726743791200</Id>
 		<Name><![CDATA[text]]></Name>
-		<X>40</X>
-		<Y>1160</Y>
+		<X>1000</X>
+		<Y>940</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -552,7 +552,7 @@
 		<Z>0</Z>
 		<Rotation>0.0</Rotation>
 		<Color>-16777216</Color>
-		<Text><![CDATA[Chargingcentres]]></Text>
+		<Text><![CDATA[Chargingcentres and chargepoints]]></Text>
 		<Font>
 			<Name><![CDATA[SansSerif]]></Name>
 			<Size>12</Size>
@@ -563,8 +563,8 @@
 	<Text>
 		<Id>1728032240347</Id>
 		<Name><![CDATA[txt_avgTravelDistances]]></Name>
-		<X>560</X>
-		<Y>700</Y>
+		<X>1000</X>
+		<Y>740</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -588,8 +588,8 @@
 	<Text>
 		<Id>1745316061345</Id>
 		<Name><![CDATA[txt_CHP]]></Name>
-		<X>60</X>
-		<Y>800</Y>
+		<X>520</X>
+		<Y>445</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -613,8 +613,8 @@
 	<Text>
 		<Id>1747314897311</Id>
 		<Name><![CDATA[txt_districtHeatingDeliverySet]]></Name>
-		<X>60</X>
-		<Y>890</Y>
+		<X>520</X>
+		<Y>535</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -638,8 +638,8 @@
 	<Text>
 		<Id>1751906160194</Id>
 		<Name><![CDATA[txt_avgHeatBuffer]]></Name>
-		<X>560</X>
-		<Y>980</Y>
+		<X>520</X>
+		<Y>690</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -663,8 +663,8 @@
 	<Text>
 		<Id>1751906173848</Id>
 		<Name><![CDATA[txt_avgPT]]></Name>
-		<X>560</X>
-		<Y>900</Y>
+		<X>520</X>
+		<Y>620</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -686,10 +686,10 @@
 		<Alignment>LEFT</Alignment>
 	</Text>
 	<Text>
-		<Id>1759233222368</Id>
-		<Name><![CDATA[txt_timeConstants]]></Name>
-		<X>1060</X>
-		<Y>370</Y>
+		<Id>1768315329120</Id>
+		<Name><![CDATA[txt_thermalModelParameters]]></Name>
+		<X>510</X>
+		<Y>1000</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -702,7 +702,7 @@
 		<Z>0</Z>
 		<Rotation>0.0</Rotation>
 		<Color>-16777216</Color>
-		<Text><![CDATA[Time constants]]></Text>
+		<Text><![CDATA[Thermal model parameters]]></Text>
 		<Font>
 			<Name><![CDATA[SansSerif]]></Name>
 			<Size>12</Size>
diff --git a/_alp/Agents/AVGC_data/Variables.xml b/_alp/Agents/AVGC_data/Variables.xml
index 0c13915..f95db1a 100644
--- a/_alp/Agents/AVGC_data/Variables.xml
+++ b/_alp/Agents/AVGC_data/Variables.xml
@@ -4,8 +4,8 @@
 		<Id>1726584205532</Id>
 		<Name><![CDATA[hourOfYearPerMonth]]></Name>
 		<Description><![CDATA[Hour of year per month (not leap year) --> Houdt dit rekening met zomer/winter tijd?]]></Description>
-		<X>1070</X>
-		<Y>150</Y>
+		<X>1550</X>
+		<Y>170</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -29,7 +29,7 @@
 		<Description><![CDATA[https://www.enexis.nl/aansluitingen/welke-aansluiting-heb-ik-nodig
 3*25 A --> 3*25*230 = 17.25 kW]]></Description>
 		<X>50</X>
-		<Y>150</Y>
+		<Y>230</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -57,7 +57,7 @@
 		<Id>1726584205582</Id>
 		<Name><![CDATA[p_avgHouseHeatingMethod]]></Name>
 		<X>50</X>
-		<Y>168.976</Y>
+		<Y>248.976</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -89,7 +89,7 @@
 
 --> 17.25 is way to small -> 3x80 is taken : 55 kW]]></Description>
 		<X>50</X>
-		<Y>330</Y>
+		<Y>530</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -117,7 +117,7 @@
 		<Id>1726584205588</Id>
 		<Name><![CDATA[p_avgUtilityHeatingMethod]]></Name>
 		<X>50</X>
-		<Y>310</Y>
+		<Y>510</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -150,7 +150,7 @@
 --> Overwrite if numbers are available in the project selection agent
 ]]></Description>
 		<X>50</X>
-		<Y>128.976</Y>
+		<Y>188.976</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -183,7 +183,7 @@
 --> Overwrite if numbers are available in the project selection agent
 ]]></Description>
 		<X>50</X>
-		<Y>108.976</Y>
+		<Y>148.976</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -214,7 +214,7 @@
 
 https://www.rvo.nl/onderwerpen/elektrisch-vervoer/stand-van-zaken ]]></Description>
 		<X>50</X>
-		<Y>188.976</Y>
+		<Y>268.976</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -244,7 +244,7 @@ https://www.rvo.nl/onderwerpen/elektrisch-vervoer/stand-van-zaken ]]></Descripti
 		<Description><![CDATA[How many houses have installed PV in The Netherlands: 25% (end of 2022)
 https://solarmagazine.nl/nieuws-zonne-energie/i34591/de-harde-cijfers-drenthe-verstevigt-koppositie-38-procent-woningen-heeft-zonnepanelen]]></Description>
 		<X>50</X>
-		<Y>210</Y>
+		<Y>290</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -273,7 +273,7 @@ https://solarmagazine.nl/nieuws-zonne-energie/i34591/de-harde-cijfers-drenthe-ve
 		<Name><![CDATA[p_avgHousePVInstallationPower_kWp]]></Name>
 		<Description><![CDATA[volgens gegevens van het CBS (Centraal Bureau voor de Statistiek) en RVO (Rijksdienst voor Ondernemend Nederland), was het gemiddelde geïnstalleerde piekvermogen van residentiële zonnepanelen in Nederland in 2020 ongeveer 4 kilowatt piek (kWp) per huishouden. --> 4kWp]]></Description>
 		<X>50</X>
-		<Y>230</Y>
+		<Y>310</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -311,8 +311,8 @@ https://solarmagazine.nl/nieuws-zonne-energie/i34591/de-harde-cijfers-drenthe-ve
 80-100 kWh (grote autos)
 
 Minimaal: 116 kWh minimum nodig, anders soms negatieve SOC.]]></Description>
-		<X>570</X>
-		<Y>220</Y>
+		<X>1010</X>
+		<Y>260</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -340,8 +340,8 @@ Minimaal: 116 kWh minimum nodig, anders soms negatieve SOC.]]></Description>
 		<Id>1726584205609</Id>
 		<Name><![CDATA[p_avgEVMaxChargePowerCar_kW]]></Name>
 		<Description><![CDATA[Bron???]]></Description>
-		<X>570</X>
-		<Y>150</Y>
+		<X>1010</X>
+		<Y>190</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -369,8 +369,8 @@ Minimaal: 116 kWh minimum nodig, anders soms negatieve SOC.]]></Description>
 		<Id>1726584205612</Id>
 		<Name><![CDATA[p_avgEVStorageVan_kWh]]></Name>
 		<Description><![CDATA[????]]></Description>
-		<X>570</X>
-		<Y>240</Y>
+		<X>1010</X>
+		<Y>280</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -398,8 +398,8 @@ Minimaal: 116 kWh minimum nodig, anders soms negatieve SOC.]]></Description>
 		<Id>1726584205615</Id>
 		<Name><![CDATA[p_avgEVStorageTruck_kWh]]></Name>
 		<Description><![CDATA[??]]></Description>
-		<X>570</X>
-		<Y>260</Y>
+		<X>1010</X>
+		<Y>300</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -427,8 +427,8 @@ Minimaal: 116 kWh minimum nodig, anders soms negatieve SOC.]]></Description>
 		<Id>1726584205618</Id>
 		<Name><![CDATA[p_avgEVMaxChargePowerVan_kW]]></Name>
 		<Description><![CDATA[Bron???]]></Description>
-		<X>570</X>
-		<Y>170</Y>
+		<X>1010</X>
+		<Y>210</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -456,8 +456,8 @@ Minimaal: 116 kWh minimum nodig, anders soms negatieve SOC.]]></Description>
 		<Id>1726584205621</Id>
 		<Name><![CDATA[p_avgEVMaxChargePowerTruck_kW]]></Name>
 		<Description><![CDATA[Bron???]]></Description>
-		<X>570</X>
-		<Y>190</Y>
+		<X>1010</X>
+		<Y>230</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -491,8 +491,8 @@ https://www.vattenfall.nl/elektrische-auto/verbruik/
 --> Tesla model 3: 15.1 kWh per 100 km --> 0.151 kWh/km
 --> Kia niro: 17.1 kWh per 100 km --> 0.171 kWh/km
 --> taking 0.16 kWh/km as the average]]></Description>
-		<X>570</X>
-		<Y>290</Y>
+		<X>1010</X>
+		<Y>330</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -521,8 +521,8 @@ https://www.vattenfall.nl/elektrische-auto/verbruik/
 		<Name><![CDATA[p_avgEVEnergyConsumptionVan_kWhpkm]]></Name>
 		<Description><![CDATA[praktijkverbruik van 26,9 kWh per 100 kilometer:
 https://www.debedrijfswagenadviseurs.nl/praktijkverbruik-elektrische-bedrijfswagen/ ]]></Description>
-		<X>570</X>
-		<Y>310</Y>
+		<X>1010</X>
+		<Y>350</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -552,8 +552,8 @@ https://www.debedrijfswagenadviseurs.nl/praktijkverbruik-elektrische-bedrijfswag
 		<Description><![CDATA[https://www.elektrischevrachtwagen.nl/post/hoe-ver-kan-een-elektrische-vrachtwagen-rijden, https://topsectorlogistiek.nl/wp-content/uploads/2024/06/20240126_Stappenplan-ZE-vrachtwagens.pdf
 0.9 - 1.7 kWh/km
 --> pak gemiddelde: 1.3]]></Description>
-		<X>570</X>
-		<Y>330</Y>
+		<X>1010</X>
+		<Y>370</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -583,8 +583,8 @@ https://www.debedrijfswagenadviseurs.nl/praktijkverbruik-elektrische-bedrijfswag
 		<Description><![CDATA[- https://www.greenchoice.nl/stroom-en-gas/bosgecompenseerd-gas/hoeveel-is-1-kuub-gas/
 - https://econvice.nl/op-gas-of-elektra-verwarmen-wat-is-gunstig/
 - https://www.joostdevree.nl/shtmls/calorische_waarde.shtml]]></Description>
-		<X>1070</X>
-		<Y>230</Y>
+		<X>1550</X>
+		<Y>250</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -616,8 +616,8 @@ https://www.debedrijfswagenadviseurs.nl/praktijkverbruik-elektrische-bedrijfswag
 
 LHV = 3.00 kWh/Nm3
 HHV = 3.54 kWh/Nm3]]></Description>
-		<X>1590</X>
-		<Y>160</Y>
+		<X>1570</X>
+		<Y>480</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -645,8 +645,8 @@ HHV = 3.54 kWh/Nm3]]></Description>
 		<Id>1726584205639</Id>
 		<Name><![CDATA[p_hydrogenDensity_kg_Nm3]]></Name>
 		<Description><![CDATA[https://keengas.com/gases/hydrogen/]]></Description>
-		<X>1590</X>
-		<Y>210</Y>
+		<X>1570</X>
+		<Y>530</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -674,8 +674,8 @@ HHV = 3.54 kWh/Nm3]]></Description>
 		<Id>1726584205642</Id>
 		<Name><![CDATA[p_oxygenDensity_kg_Nm3]]></Name>
 		<Description><![CDATA[http://www.uigi.com/o2_conv.html]]></Description>
-		<X>1590</X>
-		<Y>230</Y>
+		<X>1570</X>
+		<Y>550</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -710,8 +710,8 @@ MM O = 16 g/mol
 1-0.126 = 0.874 g zuurstof per gram water conversie.
 
 --> 1/0.126 =7.9365 gram zuurstof productie per gram waterstof productie.]]></Description>
-		<X>1590</X>
-		<Y>260</Y>
+		<X>1570</X>
+		<Y>580</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -739,8 +739,8 @@ MM O = 16 g/mol
 		<Id>1726584205648</Id>
 		<Name><![CDATA[p_hydrogenSpecificEnergy_kWh_kg]]></Name>
 		<Description><![CDATA[https://www.cenex.co.uk/app/uploads/2021/05/Intro-to-hydrogen-1.pdf --> 33.6]]></Description>
-		<X>1590</X>
-		<Y>180</Y>
+		<X>1570</X>
+		<Y>500</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -768,8 +768,8 @@ MM O = 16 g/mol
 		<Id>1726584205651</Id>
 		<Name><![CDATA[p_diesel_kWhpl]]></Name>
 		<Description><![CDATA[https://www.joostdevree.nl/shtmls/calorische_waarde.shtml]]></Description>
-		<X>1070</X>
-		<Y>250</Y>
+		<X>1550</X>
+		<Y>270</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -797,8 +797,8 @@ MM O = 16 g/mol
 		<Id>1726584205654</Id>
 		<Name><![CDATA[p_avgDieselConsumptionCar_kmpl]]></Name>
 		<Description><![CDATA[https://www.unitedconsumers.com/blog/auto/zuinig-rijden.jsp]]></Description>
-		<X>570</X>
-		<Y>400</Y>
+		<X>1010</X>
+		<Y>440</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -826,8 +826,8 @@ MM O = 16 g/mol
 		<Id>1726584205657</Id>
 		<Name><![CDATA[p_avgGasolineConsumptionCar_kmpl]]></Name>
 		<Description><![CDATA[https://www.unitedconsumers.com/blog/auto/zuinig-rijden.jsp]]></Description>
-		<X>570</X>
-		<Y>420</Y>
+		<X>1010</X>
+		<Y>460</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -855,8 +855,8 @@ MM O = 16 g/mol
 		<Id>1726584205660</Id>
 		<Name><![CDATA[p_gasoline_kWhpl]]></Name>
 		<Description><![CDATA[https://www.joostdevree.nl/shtmls/calorische_waarde.shtml]]></Description>
-		<X>1070</X>
-		<Y>270</Y>
+		<X>1550</X>
+		<Y>290</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -883,8 +883,8 @@ MM O = 16 g/mol
 	<Variable Class="Parameter">
 		<Id>1726584205663</Id>
 		<Name><![CDATA[p_avgDieselConsumptionCar_kWhpkm]]></Name>
-		<X>570</X>
-		<Y>450</Y>
+		<X>1010</X>
+		<Y>490</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -911,8 +911,8 @@ MM O = 16 g/mol
 	<Variable Class="Parameter">
 		<Id>1726584205666</Id>
 		<Name><![CDATA[p_avgGasolineConsumptionCar_kWhpkm]]></Name>
-		<X>570</X>
-		<Y>470</Y>
+		<X>1010</X>
+		<Y>510</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -943,8 +943,8 @@ MM O = 16 g/mol
 
 11 liter per 100 km = 9.1 km per liter.
 ]]></Description>
-		<X>570</X>
-		<Y>510</Y>
+		<X>1010</X>
+		<Y>550</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -971,8 +971,8 @@ MM O = 16 g/mol
 	<Variable Class="Parameter">
 		<Id>1726584205672</Id>
 		<Name><![CDATA[p_avgDieselConsumptionVan_kWhpkm]]></Name>
-		<X>570</X>
-		<Y>530</Y>
+		<X>1010</X>
+		<Y>570</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1004,8 +1004,8 @@ MM O = 16 g/mol
 --> 25 - 30 - 40 liter per 100 km. = 4 - 3.33 - 2.5 km per l
 Heavely dependend on load, city/highway, etc.
 For now: Picking 3.33 km per l]]></Description>
-		<X>570</X>
-		<Y>560</Y>
+		<X>1010</X>
+		<Y>600</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1032,8 +1032,8 @@ For now: Picking 3.33 km per l]]></Description>
 	<Variable Class="Parameter">
 		<Id>1726584205678</Id>
 		<Name><![CDATA[p_avgDieselConsumptionTruck_kWhpkm]]></Name>
-		<X>570</X>
-		<Y>580</Y>
+		<X>1010</X>
+		<Y>620</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1063,8 +1063,8 @@ For now: Picking 3.33 km per l]]></Description>
 		<Description><![CDATA[https://www.vaillant.be/consumenten/ons-advies/blog/het-rendement-van-een-warmtepomp/
 
 Gemiddelde COP is 4.]]></Description>
-		<X>70</X>
-		<Y>520</Y>
+		<X>530</X>
+		<Y>165</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1093,7 +1093,7 @@ Gemiddelde COP is 4.]]></Description>
 		<Name><![CDATA[p_avgUtilityPVPower_kWp]]></Name>
 		<Description><![CDATA[FIND SOURCE!!! ????????]]></Description>
 		<X>50</X>
-		<Y>350</Y>
+		<Y>550</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1124,7 +1124,7 @@ Gemiddelde COP is 4.]]></Description>
 ???
 https://nos.nl/artikel/2483604-elektrische-vrachtwagens-blijven-achter-door-complexe-serie-aan-uitdagingen --> 'volgens cbs nog geen half procent.']]></Description>
 		<X>50</X>
-		<Y>370</Y>
+		<Y>570</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1153,7 +1153,7 @@ https://nos.nl/artikel/2483604-elektrische-vrachtwagens-blijven-achter-door-comp
 		<Name><![CDATA[p_avgCompanyHeatingMethod]]></Name>
 		<Description><![CDATA[Source?? --> Should definatly be still the case in 2024]]></Description>
 		<X>50</X>
-		<Y>390</Y>
+		<Y>590</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1183,8 +1183,8 @@ https://nos.nl/artikel/2483604-elektrische-vrachtwagens-blijven-achter-door-comp
 		<Description><![CDATA[https://hallostroom.nl/zonnepanelen/opbrengst/per-m2/ --> 177 W/m2
 https://www.zonneplan.nl/kenniscentrum/zonnepanelen/vermogen --> 212 W/m2
 https://www.zonnepanelennoord.nl/vermogen-zonnepanelen/ --> 215 W/m2]]></Description>
-		<X>50</X>
-		<Y>1020</Y>
+		<X>520</X>
+		<Y>855</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1213,8 +1213,8 @@ https://www.zonnepanelennoord.nl/vermogen-zonnepanelen/ --> 215 W/m2]]></Descrip
 		<Name><![CDATA[p_avgRatioBatteryCapacity_v_Power]]></Name>
 		<Description><![CDATA[Average ratio of battery capacity over battery power.
 --> If battery capacity (in kWh) is twice the battery power (in kW) --> ratio = 2.]]></Description>
-		<X>50</X>
-		<Y>1120</Y>
+		<X>520</X>
+		<Y>955</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1245,8 +1245,8 @@ https://www.zonnepanelennoord.nl/vermogen-zonnepanelen/ --> 215 W/m2]]></Descrip
 
 --> avg: 29 kWh per 100 km --> 0.29 kWh/km
 ]]></Description>
-		<X>570</X>
-		<Y>640</Y>
+		<X>1010</X>
+		<Y>680</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1276,8 +1276,8 @@ https://www.zonnepanelennoord.nl/vermogen-zonnepanelen/ --> 215 W/m2]]></Descrip
 		<Description><![CDATA[https://www.huiskes-kokkeler.nl/bedrijfswagens/volkswagen-bedrijfswagens/modellen/crafter-hymotion-concept
 --> 1.4 kg Waterstof per 100 km = 0.014 kg/km
 -->  0.014 * 33.6 (p_hydrogenSpecificEnergy_kWh_kg = 0.47 kWh/kg]]></Description>
-		<X>570</X>
-		<Y>660</Y>
+		<X>1010</X>
+		<Y>700</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1307,8 +1307,8 @@ https://www.zonnepanelennoord.nl/vermogen-zonnepanelen/ --> 215 W/m2]]></Descrip
 		<Description><![CDATA[https://transportenmilieu.nl/nieuwsarchief/item/hyundai-op-waterstof-voor-havi-zwitserland
 --> 6.6 kg Waterstof per 100 km = 0.066 kg/km
 --> 0.066 * 33.6 (p_hydrogenSpecificEnergy_kWh_kg = 2.22 kWh/kg]]></Description>
-		<X>570</X>
-		<Y>680</Y>
+		<X>1010</X>
+		<Y>720</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1336,8 +1336,8 @@ https://www.zonnepanelennoord.nl/vermogen-zonnepanelen/ --> 215 W/m2]]></Descrip
 		<Id>1726584205708</Id>
 		<Name><![CDATA[p_avgRatioRoofPotentialPV]]></Name>
 		<Description><![CDATA[value for the ratio of the avg Usable Roof Area For PV fr]]></Description>
-		<X>50</X>
-		<Y>1040</Y>
+		<X>520</X>
+		<Y>875</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1367,8 +1367,8 @@ https://www.zonnepanelennoord.nl/vermogen-zonnepanelen/ --> 215 W/m2]]></Descrip
 		<Description><![CDATA[Efficiency (eta_r) used to calculate the COP in the energy asset based on temperature differences. 
 
 '0.5' comes from old code, no source found for it yet.]]></Description>
-		<X>70</X>
-		<Y>540</Y>
+		<X>530</X>
+		<Y>185</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1399,8 +1399,8 @@ https://www.zonnepanelennoord.nl/vermogen-zonnepanelen/ --> 215 W/m2]]></Descrip
 https://warmtepomp-panel.nl/afgiftesysteem.html?utm_source=chatgpt.com -> 35 graden afgifte bij -10 graden.
 
 -> Voor nu gemiddeld 40 genomen.]]></Description>
-		<X>70</X>
-		<Y>580</Y>
+		<X>530</X>
+		<Y>225</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1429,8 +1429,8 @@ https://warmtepomp-panel.nl/afgiftesysteem.html?utm_source=chatgpt.com -> 35 gra
 		<Name><![CDATA[p_avgEfficiencyGasBurner_fr]]></Name>
 		<Description><![CDATA[Average heating efficiency of a gas burner.
 https://www.mdpi.com/1999-4893/18/7/416 -> 100-104 % efficiency, based on gas energy density of 8.8 kWh/m3 (lower heating value), we use higher heating value: 9.77 -> 8.8*1.04/9.77 = 0.94]]></Description>
-		<X>70</X>
-		<Y>650</Y>
+		<X>530</X>
+		<Y>295</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1460,8 +1460,8 @@ https://www.mdpi.com/1999-4893/18/7/416 -> 100-104 % efficiency, based on gas en
 		<Description><![CDATA[Average output temperature of a gas burner unit in degC.
 
 --> Source?]]></Description>
-		<X>70</X>
-		<Y>670</Y>
+		<X>530</X>
+		<Y>315</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1493,8 +1493,8 @@ https://www.mdpi.com/1999-4893/18/7/416 -> 100-104 % efficiency, based on gas en
 - https://h2sciencecoalition.com/blog/hydrogen-for-heating-a-comparison-with-heat-pumps-part-1/
 
 - https://www.csrf.ac.uk/blog/hydrogen-for-heating/]]></Description>
-		<X>70</X>
-		<Y>740</Y>
+		<X>530</X>
+		<Y>385</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1524,8 +1524,8 @@ https://www.mdpi.com/1999-4893/18/7/416 -> 100-104 % efficiency, based on gas en
 		<Description><![CDATA[Average output temperature of a hydrogen burner unit in degC.
 
 --> Source?]]></Description>
-		<X>70</X>
-		<Y>760</Y>
+		<X>530</X>
+		<Y>405</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1551,9 +1551,9 @@ https://www.mdpi.com/1999-4893/18/7/416 -> 100-104 % efficiency, based on gas en
 	</Variable>
 	<Variable Class="Parameter">
 		<Id>1726746753360</Id>
-		<Name><![CDATA[p_avgVehiclesPerChargePoint]]></Name>
-		<X>50</X>
-		<Y>1190</Y>
+		<Name><![CDATA[p_avgVehiclesPerCharger_Centre]]></Name>
+		<X>1010</X>
+		<Y>970</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1581,8 +1581,8 @@ https://www.mdpi.com/1999-4893/18/7/416 -> 100-104 % efficiency, based on gas en
 		<Id>1728032263201</Id>
 		<Name><![CDATA[p_avgAnnualTravelDistanceVan_km]]></Name>
 		<Description><![CDATA[https://www.cbs.nl/nl-nl/visualisaties/verkeer-en-vervoer/verkeer/verkeersprestaties-bestelautos -> 4 jaar oude bestlbussen gemiddeld 22.2 duizend km in een jaar.]]></Description>
-		<X>570</X>
-		<Y>790</Y>
+		<X>1010</X>
+		<Y>830</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1610,8 +1610,8 @@ https://www.mdpi.com/1999-4893/18/7/416 -> 100-104 % efficiency, based on gas en
 		<Id>1728032304301</Id>
 		<Name><![CDATA[p_avgAnnualTravelDistanceCompanyCar_km]]></Name>
 		<Description><![CDATA[https://www.cbs.nl/nl-nl/visualisaties/verkeer-en-vervoer/verkeer/verkeersprestaties-personenautos]]></Description>
-		<X>570</X>
-		<Y>770</Y>
+		<X>1010</X>
+		<Y>810</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1639,8 +1639,8 @@ https://www.mdpi.com/1999-4893/18/7/416 -> 100-104 % efficiency, based on gas en
 		<Id>1728032305440</Id>
 		<Name><![CDATA[p_avgAnnualTravelDistanceTruck_km]]></Name>
 		<Description><![CDATA[https://www.cbs.nl/nl-nl/cijfers/detail/84651NED]]></Description>
-		<X>570</X>
-		<Y>810</Y>
+		<X>1010</X>
+		<Y>850</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1669,8 +1669,8 @@ https://www.mdpi.com/1999-4893/18/7/416 -> 100-104 % efficiency, based on gas en
 		<Name><![CDATA[p_avgFullLoadHoursPV_hr]]></Name>
 		<Description><![CDATA[Parameter used to estimate the total solar production in a year in a function like:
 p_avgFullLoadHoursPV_hr * kWp_of_PV_panels = XXX kWh pv production in a year.]]></Description>
-		<X>50</X>
-		<Y>1060</Y>
+		<X>520</X>
+		<Y>895</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1701,7 +1701,7 @@ p_avgFullLoadHoursPV_hr * kWp_of_PV_panels = XXX kWh pv production in a year.]]>
 
 --> 188 kWh/m2 for offices in NL]]></Description>
 		<X>50</X>
-		<Y>410</Y>
+		<Y>610</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1736,7 +1736,7 @@ to 18 m3 p m2 for label G
 
 --> take 7 for now.]]></Description>
 		<X>50</X>
-		<Y>430</Y>
+		<Y>630</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1767,7 +1767,7 @@ to 18 m3 p m2 for label G
 
 --> estimated benchmark 100 kWh/m2]]></Description>
 		<X>50</X>
-		<Y>450</Y>
+		<Y>650</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1795,8 +1795,8 @@ to 18 m3 p m2 for label G
 		<Id>1733155392379</Id>
 		<Name><![CDATA[p_avgSolarFieldPower_kWppha]]></Name>
 		<Description><![CDATA[1000]]></Description>
-		<X>50</X>
-		<Y>1080</Y>
+		<X>520</X>
+		<Y>915</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1825,8 +1825,8 @@ to 18 m3 p m2 for label G
 		<Name><![CDATA[p_avgEfficiencyCHP_thermal_fr]]></Name>
 		<Description><![CDATA[50% -> blijkt uit aangeleverde data door "kas als energiebron". (https://www.kasalsenergiebron.nl/)
 Ook te vinden hier: https://www.kasalsenergiebron.nl/content/nieuws/2023/E22001_Rapport_WKK_Barometer_2023.pdf]]></Description>
-		<X>70</X>
-		<Y>830</Y>
+		<X>530</X>
+		<Y>475</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1855,8 +1855,8 @@ Ook te vinden hier: https://www.kasalsenergiebron.nl/content/nieuws/2023/E22001_
 		<Name><![CDATA[p_avgEfficiencyCHP_electric_fr]]></Name>
 		<Description><![CDATA[42% -> blijkt uit aangeleverde data door "kas als energiebron". (https://www.kasalsenergiebron.nl/)
 Ook te vinden hier: https://www.kasalsenergiebron.nl/content/nieuws/2023/E22001_Rapport_WKK_Barometer_2023.pdf]]></Description>
-		<X>70</X>
-		<Y>850</Y>
+		<X>530</X>
+		<Y>495</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1886,8 +1886,8 @@ Ook te vinden hier: https://www.kasalsenergiebron.nl/content/nieuws/2023/E22001_
 		<Description><![CDATA[Average output temperature of a hydrogen burner unit in degC.
 
 --> Source?]]></Description>
-		<X>70</X>
-		<Y>870</Y>
+		<X>530</X>
+		<Y>515</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1918,8 +1918,8 @@ Ook te vinden hier: https://www.kasalsenergiebron.nl/content/nieuws/2023/E22001_
 Set as 0.8 to account for the losses of the heatgrid, as they are not yet part of our model.
 https://www.grundfos.com/nl/learn/research-and-insights/pipe-heat-loss
 https://www.klimaat030.nl/warmteverlies-van-stadsverwarming-gigantisch/]]></Description>
-		<X>70</X>
-		<Y>920</Y>
+		<X>530</X>
+		<Y>565</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1949,8 +1949,8 @@ https://www.klimaat030.nl/warmteverlies-van-stadsverwarming-gigantisch/]]></Desc
 		<Description><![CDATA[Average output temperature of a districtheating delivery set in degC.
 
 70 -> https://www.nplw.nl/warmtenet/warmtetechnieken/middentemperatuur-warmtenet]]></Description>
-		<X>70</X>
-		<Y>940</Y>
+		<X>530</X>
+		<Y>585</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1978,8 +1978,8 @@ https://www.klimaat030.nl/warmteverlies-van-stadsverwarming-gigantisch/]]></Desc
 		<Id>1749653366667</Id>
 		<Name><![CDATA[p_v2gProbability]]></Name>
 		<Description><![CDATA[SOURCE!?!?!?!]]></Description>
-		<X>570</X>
-		<Y>125</Y>
+		<X>1010</X>
+		<Y>165</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2007,8 +2007,8 @@ https://www.klimaat030.nl/warmteverlies-van-stadsverwarming-gigantisch/]]></Desc
 		<Id>1750246849611</Id>
 		<Name><![CDATA[p_v1gProbability]]></Name>
 		<Description><![CDATA[SOURCE!?!?!?!]]></Description>
-		<X>570</X>
-		<Y>105</Y>
+		<X>1010</X>
+		<Y>145</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2034,10 +2034,10 @@ https://www.klimaat030.nl/warmteverlies-van-stadsverwarming-gigantisch/]]></Desc
 	</Variable>
 	<Variable Class="Parameter">
 		<Id>1750341289733</Id>
-		<Name><![CDATA[p_avgEVsPerPublicCharger]]></Name>
+		<Name><![CDATA[p_avgVehiclesPerCharger_Chargepoint]]></Name>
 		<Description><![CDATA[TODO: Determine this value]]></Description>
-		<X>570</X>
-		<Y>860</Y>
+		<X>1010</X>
+		<Y>990</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2064,8 +2064,8 @@ https://www.klimaat030.nl/warmteverlies-van-stadsverwarming-gigantisch/]]></Desc
 	<Variable Class="Parameter">
 		<Id>1751893521012</Id>
 		<Name><![CDATA[p_avgPTPower_kWpm2]]></Name>
-		<X>570</X>
-		<Y>930</Y>
+		<X>530</X>
+		<Y>650</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2093,8 +2093,8 @@ https://www.klimaat030.nl/warmteverlies-van-stadsverwarming-gigantisch/]]></Desc
 		<Id>1751893540583</Id>
 		<Name><![CDATA[p_avgHeatBufferWaterVolumePerHPPower_m3pkW]]></Name>
 		<Description><![CDATA[https://www.kachelplaats.nl/buffervaten-cv-houtkachels/ -> 25 liter per kW warmtepomp vermogen = 0.025 m3/kW]]></Description>
-		<X>570</X>
-		<Y>1080</Y>
+		<X>530</X>
+		<Y>790</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2122,8 +2122,8 @@ https://www.klimaat030.nl/warmteverlies-van-stadsverwarming-gigantisch/]]></Desc
 		<Id>1751893810778</Id>
 		<Name><![CDATA[p_avgHeatBufferWaterVolumePerPTSurface_m3pm2]]></Name>
 		<Description><![CDATA[https://www.kachelplaats.nl/buffervaten-cv-houtkachels/ -> 50 liter per m2 zonnecollector = 0.050 m3/m2]]></Description>
-		<X>570</X>
-		<Y>1060</Y>
+		<X>530</X>
+		<Y>770</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2156,8 +2156,8 @@ https://www.klimaat030.nl/warmteverlies-van-stadsverwarming-gigantisch/]]></Desc
 
 Voor nu gekozen voor 4185.
 ]]></Description>
-		<X>1070</X>
-		<Y>290</Y>
+		<X>1550</X>
+		<Y>310</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2185,8 +2185,8 @@ Voor nu gekozen voor 4185.
 		<Id>1751905820546</Id>
 		<Name><![CDATA[p_waterDensity_kgpm3]]></Name>
 		<Description><![CDATA[https://www.sigmaaldrich.com/NL/en/substance/densitystandard998kgm318027732185 --> 998 kg/m3]]></Description>
-		<X>1070</X>
-		<Y>310</Y>
+		<X>1550</X>
+		<Y>330</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2214,8 +2214,8 @@ Voor nu gekozen voor 4185.
 		<Id>1751906112800</Id>
 		<Name><![CDATA[p_avgMaxHeatBufferTemperature_degC]]></Name>
 		<Description><![CDATA[???]]></Description>
-		<X>570</X>
-		<Y>1010</Y>
+		<X>530</X>
+		<Y>720</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2242,8 +2242,8 @@ Voor nu gekozen voor 4185.
 	<Variable Class="Parameter">
 		<Id>1751906126857</Id>
 		<Name><![CDATA[p_avgMinHeatBufferTemperature_degC]]></Name>
-		<X>570</X>
-		<Y>1030</Y>
+		<X>530</X>
+		<Y>740</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2271,8 +2271,8 @@ Voor nu gekozen voor 4185.
 		<Id>1753950741783</Id>
 		<Name><![CDATA[p_avgPTPanelSize_m2]]></Name>
 		<Description><![CDATA[https://www.econo.nl/m24hpcpc-400-h2-heatpipe-zonnecollector-prisma-pro-24-cpc -> +- 4 m2]]></Description>
-		<X>570</X>
-		<Y>950</Y>
+		<X>530</X>
+		<Y>670</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2300,8 +2300,8 @@ Voor nu gekozen voor 4185.
 		<Id>1754309475986</Id>
 		<Name><![CDATA[p_avgRatioHouseBatteryStorageCapacity_v_PVPower]]></Name>
 		<Description><![CDATA[https://www.essent.nl/thuisbatterij/capaciteit-thuisbatterij : Essent: "Over het algemeen kun je ervan uitgaan dat een thuisbatterij zo'n 1 à 1,5 kWh capaciteit nodig heeft per kWp zonnepanelen vermogen. " ]]></Description>
-		<X>50</X>
-		<Y>1140</Y>
+		<X>520</X>
+		<Y>975</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2330,7 +2330,7 @@ Voor nu gekozen voor 4185.
 		<Name><![CDATA[p_avgNrOfCarsPerHouse]]></Name>
 		<Description><![CDATA[https://opendata.cbs.nl/#/CBS/nl/dataset/85039NED/table?searchKeywords=motorvoertuigen -> 1.1]]></Description>
 		<X>50</X>
-		<Y>250</Y>
+		<Y>330</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2359,8 +2359,8 @@ Voor nu gekozen voor 4185.
 		<Id>1755873729807</Id>
 		<Name><![CDATA[p_avgAnnualTravelDistancePrivateCar_km]]></Name>
 		<Description><![CDATA[https://www.cbs.nl/nl-nl/visualisaties/verkeer-en-vervoer/verkeer/verkeersprestaties-personenautos]]></Description>
-		<X>570</X>
-		<Y>730</Y>
+		<X>1010</X>
+		<Y>770</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2388,8 +2388,8 @@ Voor nu gekozen voor 4185.
 		<Id>1755874747343</Id>
 		<Name><![CDATA[p_avgAnnualTravelDistanceSecondVSFirstCar_fr]]></Name>
 		<Description><![CDATA[Scaling factor used to scale down the average annual travel distance of the additional cars for households that have multiple cars. SOURCE!???]]></Description>
-		<X>570</X>
-		<Y>750</Y>
+		<X>1010</X>
+		<Y>790</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2417,8 +2417,8 @@ Voor nu gekozen voor 4185.
 		<Id>1759233211509</Id>
 		<Name><![CDATA[map_yearlySummerWinterTimeStartHour]]></Name>
 		<Description><![CDATA[Map that contains data, with key per year, and value a pair where pair.getFirst() == summertimeStartHour and pair.getSecond() == winterTimeStartHour.]]></Description>
-		<X>1070</X>
-		<Y>400</Y>
+		<X>1550</X>
+		<Y>200</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2454,8 +2454,8 @@ https://www.bluesolid.nl/warmtepomp-monoblock-9-kw-1ph.html -> Thermisch vermoge
 https://www.dewarmte.nl/all-electric-warmtepomp/ -> thermisch vermogen van 2-8 kW. 
 
 -> (4+5+2)/3 -> Gemiddeld ongeveer 3.6 thermisch-> 3.6/3  = 1.2 elektrisch]]></Description>
-		<X>70</X>
-		<Y>600</Y>
+		<X>530</X>
+		<Y>245</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2483,8 +2483,8 @@ https://www.dewarmte.nl/all-electric-warmtepomp/ -> thermisch vermogen van 2-8 k
 		<Id>1760435475991</Id>
 		<Name><![CDATA[p_minGasBurnerOutputCapacity_kW]]></Name>
 		<Description><![CDATA[https://www.warmteservice.nl/Verwarming/CV-ketel/HR-Combiketel/c/163 -> Minimum ranged van 4 - 7.8 -> gekozen voor 6 ]]></Description>
-		<X>70</X>
-		<Y>690</Y>
+		<X>530</X>
+		<Y>335</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2512,8 +2512,8 @@ https://www.dewarmte.nl/all-electric-warmtepomp/ -> thermisch vermogen van 2-8 k
 		<Id>1760435486680</Id>
 		<Name><![CDATA[p_minHydrogenBurnerOutputCapacity_kW]]></Name>
 		<Description><![CDATA[Zelfde gekozen als gasbrander.]]></Description>
-		<X>70</X>
-		<Y>780</Y>
+		<X>530</X>
+		<Y>425</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2541,8 +2541,8 @@ https://www.dewarmte.nl/all-electric-warmtepomp/ -> thermisch vermogen van 2-8 k
 		<Id>1760435497667</Id>
 		<Name><![CDATA[p_minDistrictHeatingDeliverySetOutputCapacity_kW]]></Name>
 		<Description><![CDATA[25 kw is a default set: https://www.acm.nl/nl/energie/warmte-en-koude/warmtetarieven/tarieven-warmte-en-koude]]></Description>
-		<X>70</X>
-		<Y>960</Y>
+		<X>530</X>
+		<Y>605</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2569,12 +2569,12 @@ https://www.dewarmte.nl/all-electric-warmtepomp/ -> thermisch vermogen van 2-8 k
 	<Variable Class="Parameter">
 		<Id>1763396237774</Id>
 		<Name><![CDATA[p_avgOutputTemperatureHybridHeatpump_degC]]></Name>
-		<Description><![CDATA[https://www.milieucentraal.nl/energie-besparen/duurzaam-verwarmen-en-koelen/volledige-warmtepomp/?utm_source=chatgpt.com - max 45-55
-https://warmtepomp-panel.nl/afgiftesysteem.html?utm_source=chatgpt.com -> 35 graden afgifte bij -10 graden.
+		<Description><![CDATA[https://www.milieucentraal.nl/energie-besparen/duurzaam-verwarmen-en-koelen/volledige-warmtepomp/? -> max 45-55
+https://warmtepomp-panel.nl/afgiftesysteem.html? -> 35 graden afgifte bij -10 graden.
 
--> Voor nu gemiddeld 40 genomen.]]></Description>
-		<X>70</X>
-		<Y>560</Y>
+-> Voor nu gemiddeld 45 genomen.]]></Description>
+		<X>530</X>
+		<Y>205</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2587,7 +2587,7 @@ https://warmtepomp-panel.nl/afgiftesysteem.html?utm_source=chatgpt.com -> 35 gra
 			<UnitType>NONE</UnitType>
 			<SdArray>false</SdArray>
 			<DefaultValue Class="CodeValue">
-				<Code><![CDATA[40]]></Code>
+				<Code><![CDATA[45]]></Code>
 			</DefaultValue>
 			<ParameterEditor>
 				<Id>1763396237772</Id>
@@ -2598,4 +2598,394 @@ https://warmtepomp-panel.nl/afgiftesysteem.html?utm_source=chatgpt.com -> 35 gra
 			</ParameterEditor>
 		</Properties>
 	</Variable>
+	<Variable Class="Parameter">
+		<Id>1768313557052</Id>
+		<Name><![CDATA[p_minAnnualTravelDistanceSurveyVehicle_km]]></Name>
+		<X>1010</X>
+		<Y>880</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
+			<Type><![CDATA[double]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<DefaultValue Class="CodeValue">
+				<Code><![CDATA[1000]]></Code>
+			</DefaultValue>
+			<ParameterEditor>
+				<Id>1768313557050</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
+	<Variable Class="Parameter">
+		<Id>1768313716401</Id>
+		<Name><![CDATA[p_PBL_HeatingLossFactor_fr]]></Name>
+		<Description><![CDATA[Manually calibrated value tested on 3 neighborhoods to get the total nbh yearly total to match with the expected outcome.]]></Description>
+		<X>520</X>
+		<Y>1030</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
+			<Type><![CDATA[double]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<DefaultValue Class="CodeValue">
+				<Code><![CDATA[67.0]]></Code>
+			</DefaultValue>
+			<ParameterEditor>
+				<Id>1768313716399</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
+	<Variable Class="Parameter">
+		<Id>1768314112512</Id>
+		<Name><![CDATA[map_insulationLabel_lossfactorPerFloorSurface_WpKm2]]></Name>
+		<X>520</X>
+		<Y>1050</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
+			<Type><![CDATA[Map<OL_GridConnectionInsulationLabel, Double>]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<DefaultValue Class="CodeValue">
+				<Code><![CDATA[Map.of(
+OL_GridConnectionInsulationLabel.A, 0.35, 
+OL_GridConnectionInsulationLabel.B, 0.45,
+OL_GridConnectionInsulationLabel.C, 0.65,
+OL_GridConnectionInsulationLabel.D, 0.85, 
+OL_GridConnectionInsulationLabel.E, 1.05,
+OL_GridConnectionInsulationLabel.F, 1.25,
+OL_GridConnectionInsulationLabel.G, 1.45
+)
+]]></Code>
+			</DefaultValue>
+			<ParameterEditor>
+				<Id>1768314112510</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
+	<Variable Class="Parameter">
+		<Id>1768314894157</Id>
+		<Name><![CDATA[p_solarAbsorptionFloorSurfaceScalingFactor_fr]]></Name>
+		<X>520</X>
+		<Y>1070</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
+			<Type><![CDATA[double]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<DefaultValue Class="CodeValue">
+				<Code><![CDATA[0.01]]></Code>
+			</DefaultValue>
+			<ParameterEditor>
+				<Id>1768314894155</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
+	<Variable Class="Parameter">
+		<Id>1768486639507</Id>
+		<Name><![CDATA[p_avgSpaceHeatingTotalGasConsumptionShare_fr]]></Name>
+		<X>50</X>
+		<Y>360</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
+			<Type><![CDATA[double]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<DefaultValue Class="CodeValue">
+				<Code><![CDATA[0.85]]></Code>
+			</DefaultValue>
+			<ParameterEditor>
+				<Id>1768486639505</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
+	<Variable Class="Parameter">
+		<Id>1768486762811</Id>
+		<Name><![CDATA[p_avgCookingTotalGasConsumptionShare_fr]]></Name>
+		<X>50</X>
+		<Y>400</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
+			<Type><![CDATA[double]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<DefaultValue Class="CodeValue">
+				<Code><![CDATA[0.05]]></Code>
+			</DefaultValue>
+			<ParameterEditor>
+				<Id>1768486762809</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
+	<Variable Class="Parameter">
+		<Id>1768486764436</Id>
+		<Name><![CDATA[p_avgDHWTotalGasConsumptionShare_fr]]></Name>
+		<X>50</X>
+		<Y>380</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
+			<Type><![CDATA[double]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<DefaultValue Class="CodeValue">
+				<Code><![CDATA[0.1]]></Code>
+			</DefaultValue>
+			<ParameterEditor>
+				<Id>1768486764434</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
+	<Variable Class="Parameter">
+		<Id>1768497744964</Id>
+		<Name><![CDATA[p_heatCapacitySizingConstant_JpK]]></Name>
+		<X>520</X>
+		<Y>1120</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
+			<Type><![CDATA[double]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<DefaultValue Class="CodeValue">
+				<Code><![CDATA[0]]></Code>
+			</DefaultValue>
+			<ParameterEditor>
+				<Id>1768497744962</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
+	<Variable Class="Parameter">
+		<Id>1768497744970</Id>
+		<Name><![CDATA[p_heatCapacitySizingSlope_JpKm2]]></Name>
+		<X>520</X>
+		<Y>1140</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
+			<Type><![CDATA[double]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<DefaultValue Class="CodeValue">
+				<Code><![CDATA[50000
+]]></Code>
+			</DefaultValue>
+			<ParameterEditor>
+				<Id>1768497744968</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
+	<Variable Class="Parameter">
+		<Id>1768497744974</Id>
+		<Name><![CDATA[p_heatCapacitySizingFactor_fr]]></Name>
+		<X>520</X>
+		<Y>1160</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
+			<Type><![CDATA[double]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<DefaultValue Class="CodeValue">
+				<Code><![CDATA[1]]></Code>
+			</DefaultValue>
+			<ParameterEditor>
+				<Id>1768497744972</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
+	<Variable Class="Parameter">
+		<Id>1768497935675</Id>
+		<Name><![CDATA[p_maxAvgHouseElectricityConsumptionOffset_kWhpa]]></Name>
+		<X>60</X>
+		<Y>209</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
+			<Type><![CDATA[double]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<DefaultValue Class="CodeValue">
+				<Code><![CDATA[1000]]></Code>
+			</DefaultValue>
+			<ParameterEditor>
+				<Id>1768497935673</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
+	<Variable Class="Parameter">
+		<Id>1768498151397</Id>
+		<Name><![CDATA[p_maxAvgHouseGasConsumptionOffset_m3pa]]></Name>
+		<X>60</X>
+		<Y>169</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
+			<Type><![CDATA[double]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<DefaultValue Class="CodeValue">
+				<Code><![CDATA[500]]></Code>
+			</DefaultValue>
+			<ParameterEditor>
+				<Id>1768498151395</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
+	<Variable Class="Parameter">
+		<Id>1768499901666</Id>
+		<Name><![CDATA[map_insulationLabel_cooldownPeriod_hr]]></Name>
+		<Description><![CDATA[Map that contains average values for the cooldown period in hours per insulation label.
+The cooldown period is defined as the duration of time before a building  is cooled down to the outside temperature (when there is no internal heat source).
+
+FIND SOURCE AND CORRECT THE NUMBERS BEFORE USE!]]></Description>
+		<X>520</X>
+		<Y>1100</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
+			<Type><![CDATA[Map<OL_GridConnectionInsulationLabel, Double>]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<DefaultValue Class="CodeValue">
+				<Code><![CDATA[/*
+Map.of(
+OL_GridConnectionInsulationLabel.A, 48.0, 
+OL_GridConnectionInsulationLabel.B, 24.0,
+OL_GridConnectionInsulationLabel.C, 16.0,
+OL_GridConnectionInsulationLabel.D, 10.0, 
+OL_GridConnectionInsulationLabel.E, 6.0,
+OL_GridConnectionInsulationLabel.F, 4.0,
+OL_GridConnectionInsulationLabel.G, 2.0
+)
+*/
+]]></Code>
+			</DefaultValue>
+			<ParameterEditor>
+				<Id>1768499901664</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
 </Variables>
diff --git a/_alp/Agents/Zero_Interface/Code/Functions.java b/_alp/Agents/Zero_Interface/Code/Functions.java
index 21422d0..ab430e3 100644
--- a/_alp/Agents/Zero_Interface/Code/Functions.java
+++ b/_alp/Agents/Zero_Interface/Code/Functions.java
@@ -2,45 +2,45 @@
 {/*ALCODESTART::1696837759924*/
 if (b.gisRegion != null){
 
-	OL_GridConnectionIsolationLabel buildingLowestEnergyLabel = OL_GridConnectionIsolationLabel.NONE;
+	OL_GridConnectionInsulationLabel buildingLowestEnergyLabel = OL_GridConnectionInsulationLabel.NONE;
 	
 	//Find the lowest energy label in the building
 	for(GridConnection GC : b.c_containedGridConnections){
-		switch(GC.p_energyLabel){
+		switch(GC.p_insulationLabel){
 			case A:
-				if(buildingLowestEnergyLabel == OL_GridConnectionIsolationLabel.NONE){
-					buildingLowestEnergyLabel = OL_GridConnectionIsolationLabel.A;
+				if(buildingLowestEnergyLabel == OL_GridConnectionInsulationLabel.NONE){
+					buildingLowestEnergyLabel = OL_GridConnectionInsulationLabel.A;
 				}
 			break;
 			case B:
-				if(buildingLowestEnergyLabel == OL_GridConnectionIsolationLabel.NONE || buildingLowestEnergyLabel == OL_GridConnectionIsolationLabel.A){
-					buildingLowestEnergyLabel = OL_GridConnectionIsolationLabel.B;
+				if(buildingLowestEnergyLabel == OL_GridConnectionInsulationLabel.NONE || buildingLowestEnergyLabel == OL_GridConnectionInsulationLabel.A){
+					buildingLowestEnergyLabel = OL_GridConnectionInsulationLabel.B;
 				}
 			break;
 			case C:
-				if(buildingLowestEnergyLabel == OL_GridConnectionIsolationLabel.NONE || buildingLowestEnergyLabel == OL_GridConnectionIsolationLabel.B
-				   || buildingLowestEnergyLabel == OL_GridConnectionIsolationLabel.C){
-					buildingLowestEnergyLabel = OL_GridConnectionIsolationLabel.C;
+				if(buildingLowestEnergyLabel == OL_GridConnectionInsulationLabel.NONE || buildingLowestEnergyLabel == OL_GridConnectionInsulationLabel.B
+				   || buildingLowestEnergyLabel == OL_GridConnectionInsulationLabel.C){
+					buildingLowestEnergyLabel = OL_GridConnectionInsulationLabel.C;
 				}
 			break;
 			case D:
-				if(buildingLowestEnergyLabel != OL_GridConnectionIsolationLabel.E || buildingLowestEnergyLabel != OL_GridConnectionIsolationLabel.F
-				   || buildingLowestEnergyLabel != OL_GridConnectionIsolationLabel.G){
-					buildingLowestEnergyLabel = OL_GridConnectionIsolationLabel.D;
+				if(buildingLowestEnergyLabel != OL_GridConnectionInsulationLabel.E || buildingLowestEnergyLabel != OL_GridConnectionInsulationLabel.F
+				   || buildingLowestEnergyLabel != OL_GridConnectionInsulationLabel.G){
+					buildingLowestEnergyLabel = OL_GridConnectionInsulationLabel.D;
 				}
 			break;
 			case E:
-				if(buildingLowestEnergyLabel != OL_GridConnectionIsolationLabel.F || buildingLowestEnergyLabel != OL_GridConnectionIsolationLabel.G){
-					buildingLowestEnergyLabel = OL_GridConnectionIsolationLabel.E;
+				if(buildingLowestEnergyLabel != OL_GridConnectionInsulationLabel.F || buildingLowestEnergyLabel != OL_GridConnectionInsulationLabel.G){
+					buildingLowestEnergyLabel = OL_GridConnectionInsulationLabel.E;
 				}
 			break;
 			case F:
-				if(buildingLowestEnergyLabel != OL_GridConnectionIsolationLabel.G){
-					buildingLowestEnergyLabel = OL_GridConnectionIsolationLabel.F;
+				if(buildingLowestEnergyLabel != OL_GridConnectionInsulationLabel.G){
+					buildingLowestEnergyLabel = OL_GridConnectionInsulationLabel.F;
 				}
 			break;
 			case G:
-				buildingLowestEnergyLabel = OL_GridConnectionIsolationLabel.G;
+				buildingLowestEnergyLabel = OL_GridConnectionInsulationLabel.G;
 			break;								
 		}
 	}
@@ -3065,25 +3065,27 @@ ShapeRadioButtonGroup f_getScenarioButtons()
 
 double f_setCompaniesScenario(LinkedHashMap scenarioMap)
 {/*ALCODESTART::1761060882101*/
-//Solution for now
-int companyUIScenarioRBIndex = 0;
-if(scenarioMap == c_scenarioMap_Current){
-	companyUIScenarioRBIndex = 0;
-}
-else if(scenarioMap == c_scenarioMap_Future){
-	companyUIScenarioRBIndex = 1;
-}
-else{
-	throw new RuntimeException("Tried to call the setCompaniesScenario function with a non existing companyUI scenario");
-}
-
-//Set companyUI to correct radio button setting
-uI_Company.b_runningMainInterfaceScenarioSettings = true;
-for (GCUtility  GC : energyModel.UtilityConnections){
-	uI_Company.f_setCompanyUI(GC);
-	uI_Company.getRb_scenariosPrivateUI().setValue(companyUIScenarioRBIndex, true);
+if(!energyModel.UtilityConnections.isEmpty()){
+	//Solution for now
+	int companyUIScenarioRBIndex = 0;
+	if(scenarioMap == c_scenarioMap_Current){
+		companyUIScenarioRBIndex = 0;
+	}
+	else if(scenarioMap == c_scenarioMap_Future){
+		companyUIScenarioRBIndex = 1;
+	}
+	else{
+		throw new RuntimeException("Tried to call the setCompaniesScenario function with a non existing companyUI scenario");
+	}
+	
+	//Set companyUI to correct radio button setting
+	uI_Company.b_runningMainInterfaceScenarioSettings = true;
+	for (GCUtility  GC : energyModel.UtilityConnections){
+		uI_Company.f_setCompanyUI(GC);
+		uI_Company.getRb_scenariosPrivateUI().setValue(companyUIScenarioRBIndex, true);
+	}
+	uI_Company.b_runningMainInterfaceScenarioSettings = false;
 }
-uI_Company.b_runningMainInterfaceScenarioSettings = false;
 /*ALCODEEND*/}
 
 double f_initializeScenarioRadioButton()
@@ -3182,8 +3184,9 @@ else if(project_data.project_type() == OL_ProjectType.RESIDENTIAL){
 
 double f_setScenario_Future()
 {/*ALCODESTART::1761119479231*/
-f_setCompaniesScenario(c_scenarioMap_Future);
-
+if(c_scenarioMap_Future != null){
+	f_setCompaniesScenario(c_scenarioMap_Future);
+}
 //Set specifc assets active/non-active
 f_projectSpecificScenarioSettings("Future");
 
@@ -3193,8 +3196,10 @@ else if(project_data.project_type() == OL_ProjectType.RESIDENTIAL){
 
 double f_setScenario_Current()
 {/*ALCODESTART::1761119479233*/
-f_setCompaniesScenario(c_scenarioMap_Current);
-
+//if(project_data.project_type() == OL_ProjectType.BUSINESSPARK && c_scenarioMap_Current != null){
+if(c_scenarioMap_Current != null){
+	f_setCompaniesScenario(c_scenarioMap_Current);
+}
 //Reset sliders for households
 if(project_data.project_type() == OL_ProjectType.RESIDENTIAL && p_residentialScenario_Current != null){
 	f_setResidentialScenario_Current();
diff --git a/_alp/Agents/Zero_Loader/AOC.Zero_Loader.xml b/_alp/Agents/Zero_Loader/AOC.Zero_Loader.xml
index a87eb76..3ce88b2 100644
--- a/_alp/Agents/Zero_Loader/AOC.Zero_Loader.xml
+++ b/_alp/Agents/Zero_Loader/AOC.Zero_Loader.xml
@@ -148,8 +148,8 @@ import java.util.UUID;]]></Import>
 		<TextFile>
 			<Id>1756980503493</Id>
 			<Name><![CDATA[inputCSVcookingActivities]]></Name>
-			<X>-369</X>
-			<Y>759</Y>
+			<X>-389</X>
+			<Y>784</Y>
 			<Label>
 				<X>10</X>
 				<Y>0</Y>
@@ -170,8 +170,8 @@ import java.util.UUID;]]></Import>
 		<TextFile>
 			<Id>1756980506290</Id>
 			<Name><![CDATA[inputCSVhouseholdTrips]]></Name>
-			<X>-369</X>
-			<Y>799</Y>
+			<X>-389</X>
+			<Y>824</Y>
 			<Label>
 				<X>10</X>
 				<Y>0</Y>
@@ -192,8 +192,8 @@ import java.util.UUID;]]></Import>
 		<TextFile>
 			<Id>1756980507645</Id>
 			<Name><![CDATA[inputCSVtruckTrips]]></Name>
-			<X>-369</X>
-			<Y>779</Y>
+			<X>-389</X>
+			<Y>804</Y>
 			<Label>
 				<X>10</X>
 				<Y>0</Y>
@@ -288,7 +288,7 @@ import java.util.UUID;]]></Import>
 			<PresentationFlag>true</PresentationFlag>
 			<ShowLabel>false</ShowLabel>
 			<Title/>
-			<Width>1920</Width>
+			<Width>2200</Width>
 			<Height>980</Height>
 		</Area>
 	</Areas>
diff --git a/_alp/Agents/Zero_Loader/Code/Functions.java b/_alp/Agents/Zero_Loader/Code/Functions.java
index db54061..1d55b65 100644
--- a/_alp/Agents/Zero_Loader/Code/Functions.java
+++ b/_alp/Agents/Zero_Loader/Code/Functions.java
@@ -236,13 +236,6 @@ else if(RegionCoords.startsWith("LineString")){
 
 double f_importExcelTablesToDB()
 {/*ALCODESTART::1726584205779*/
-//inputHouseholdTrips.readFile();
-//inputCookingActivities.readFile();
-//inputTruckTrips.readFile();
-
-//inputCSVcookingActivities.readFile();
-//inputCSVcookingActivities.
-
 if(settings.reloadDatabase()){
 	
 	//Get the database names that are selected for reloading
@@ -1392,7 +1385,7 @@ J_EAEV f_addElectricVehicle(GridConnection parentGC,OL_EnergyAssetType vehicle_t
 //Create the EV vehicle energy asset with the set parameters + links
 J_EAEV electricVehicle = new J_EAEV(parentGC, capacityElectricity_kW, storageCapacity_kWh, stateOfCharge_fr, timestep_h, energyConsumption_kWhpkm, vehicleScaling, vehicle_type, null);	
 
-if (!isDefaultVehicle && annualTravelDistance_km > 1000){
+if (!isDefaultVehicle && annualTravelDistance_km > avgc_data.p_minAnnualTravelDistanceSurveyVehicle_km){
 		electricVehicle.tripTracker.setAnnualDistance_km(annualTravelDistance_km);
 }
 else if (vehicle_type == OL_EnergyAssetType.ELECTRIC_VAN){
@@ -1427,7 +1420,7 @@ J_EAPetroleumFuelVehicle f_addPetroleumFuelVehicle(GridConnection parentGC,OL_En
 J_EAPetroleumFuelVehicle petroleumFuelVehicle = new J_EAPetroleumFuelVehicle(parentGC, energyConsumption_kWhpkm, energyModel.p_timeStep_h, vehicleScaling, vehicle_type, null);
 
 //Set annual travel distance
-if (!isDefaultVehicle && annualTravelDistance_km > 1000){
+if (!isDefaultVehicle && annualTravelDistance_km > avgc_data.p_minAnnualTravelDistanceSurveyVehicle_km){
 		petroleumFuelVehicle.tripTracker.setAnnualDistance_km(annualTravelDistance_km);
 }
 else if (vehicle_type == OL_EnergyAssetType.PETROLEUM_FUEL_VAN){
@@ -1653,7 +1646,7 @@ else if (vehicle_type == OL_EnergyAssetType.PETROLEUM_FUEL_VAN){
 J_EAHydrogenVehicle hydrogenVehicle = new J_EAHydrogenVehicle(parentGC, energyConsumption_kWhpkm, energyModel.p_timeStep_h, vehicleScaling, vehicle_type, null);
 
 //Set annual travel distance
-if (!isDefaultVehicle && annualTravelDistance_km > 1000){
+if (!isDefaultVehicle && annualTravelDistance_km > avgc_data.p_minAnnualTravelDistanceSurveyVehicle_km){
 		hydrogenVehicle.tripTracker.setAnnualDistance_km(annualTravelDistance_km);
 }
 else if (vehicle_type == OL_EnergyAssetType.HYDROGEN_VAN){
@@ -1767,7 +1760,7 @@ String f_createChargerPolygon(double lat,double lon)
 			new J_EAChargingSession(chargingStation, chargerProfile, 1);
 		}
 		else{
-			for(int k = 0; k < chargingStation.p_nbOfChargers*avgc_data.p_avgVehiclesPerChargePoint; k++ ){
+			for(int k = 0; k < chargingStation.p_nbOfChargers*avgc_data.p_avgVehiclesPerCharger_Centre; k++ ){
 				f_addElectricVehicle(chargingStation, chargingStation.p_chargingVehicleType, true, 0, chargingStation.p_maxChargingPower_kW);
 			}
 		}
@@ -1818,7 +1811,7 @@ String f_createChargerPolygon(double lat,double lon)
 			new J_EAChargingSession(chargingStation, chargerProfile, 1);
 		}
 		else{
-			for(int k = 0; k < avgc_data.p_avgVehiclesPerChargePoint; k++ ){
+			for(int k = 0; k < avgc_data.p_avgVehiclesPerCharger_Chargepoint; k++ ){
 				f_addElectricVehicle(chargingStation, chargingStation.p_chargingVehicleType, true, 0, chargingStation.p_maxChargingPower_kW);
 			}
 		}
@@ -2047,20 +2040,19 @@ String f_createChargerPolygon(double lat,double lon)
 
 /*
 genericProfiles_data = null;
-c_GridNode_data.clear();
-c_SurveyCompanyBuilding_data.clear();
-c_GenericCompanyBuilding_data.clear();
-c_HouseBuilding_data.clear();
+c_gridNode_data.clear();
+c_companyBuilding_data.clear();
+c_houseBuilding_data.clear();
 c_remainingBuilding_data.clear();
-c_Solarfarm_data.clear();
-c_Windfarm_data.clear();
-c_Electrolyser_data.clear();
-c_Battery_data.clear();
-c_Chargingstation_data.clear();
-c_Neighbourhood_data.clear();
-c_Parcel_data.clear();
-c_Cable_data_LV.clear();
-c_Cable_data_MV.clear();
+c_solarfarm_data.clear();
+c_windfarm_data.clear();
+c_electrolyser_data.clear();
+c_battery_data.clear();
+c_chargingstation_data.clear();
+c_neighbourhood_data.clear();
+c_parkingSpace_data.clear();
+c_parcel_data.clear();
+c_cable_data.clear();
 */
 
 /*ALCODEEND*/}
@@ -3308,90 +3300,80 @@ List<J_ChargingSessionData>  f_getChargerProfile()
 return chargerProfile;
 /*ALCODEEND*/}
 
-double f_addCookingAsset(GCHouse gc,OL_EnergyAssetType CookingType,double yearlyCookingDemand_kWh)
+double f_addCookingAsset(GCHouse GC,OL_EnergyAssetType CookingType,double yearlyCookingDemand_kWh)
 {/*ALCODESTART::1749726189312*/
-switch(CookingType){
+if(yearlyCookingDemand_kWh <= 0){
+	throw new RuntimeException("Trying to create a cooking asset, without specifying the yearly energy consumption");
+}
 
+switch(CookingType){
 	case ELECTRIC_HOB:
-		new J_EAConsumption(gc, OL_EnergyAssetType.ELECTRIC_HOB, "default_house_cooking_demand_fr", yearlyCookingDemand_kWh, OL_EnergyCarriers.ELECTRICITY, energyModel.p_timeStep_h, null);
-		gc.p_cookingMethod = OL_HouseholdCookingMethod.ELECTRIC;
+		new J_EAConsumption(GC, OL_EnergyAssetType.ELECTRIC_HOB, "default_house_cooking_demand_fr", yearlyCookingDemand_kWh, OL_EnergyCarriers.ELECTRICITY, energyModel.p_timeStep_h, null);
+		GC.p_cookingMethod = OL_HouseholdCookingMethod.ELECTRIC;
 		break;
 		
 	case GAS_PIT:
-		new J_EAConsumption(gc, OL_EnergyAssetType.GAS_PIT, "default_house_cooking_demand_fr", yearlyCookingDemand_kWh, OL_EnergyCarriers.METHANE, energyModel.p_timeStep_h, null);
-		gc.p_cookingMethod = OL_HouseholdCookingMethod.GAS;
+		new J_EAConsumption(GC, OL_EnergyAssetType.GAS_PIT, "default_house_cooking_demand_fr", yearlyCookingDemand_kWh, OL_EnergyCarriers.METHANE, energyModel.p_timeStep_h, null);
+		GC.p_cookingMethod = OL_HouseholdCookingMethod.GAS;
 		break;
 }
 /*ALCODEEND*/}
 
-double f_addHotWaterDemand(GCHouse houseGC,double surface_m2)
+double f_addHotWaterDemand(GridConnection GC,double yearlyHWD_kWh)
 {/*ALCODESTART::1749726279652*/
-int aantalBewoners;
-if( surface_m2 > 150){
-	aantalBewoners = uniform_discr(2,6);
-}
-else if (surface_m2 > 50){
-	aantalBewoners = uniform_discr(1,4);
-}
-else {
-	aantalBewoners = uniform_discr(1,2);
+if(yearlyHWD_kWh <= 0){
+	throw new RuntimeException("Trying to create a DHW asset, without specifying the yearly energy consumption");
 }
- 
-double yearlyHWD_kWh = aantalBewoners * 600;  //12 * surface_m2 * 3 ; Tamelijk willekeurige formule om HWD te schalen tussen 600 - 2400 kWh bij 50m2 tot 200m2, voor een quickfix
-
-J_EAConsumption hotwaterDemand = new J_EAConsumption( houseGC, OL_EnergyAssetType.HOT_WATER_CONSUMPTION, "default_house_hot_water_demand_fr", yearlyHWD_kWh, OL_EnergyCarriers.HEAT, energyModel.p_timeStep_h, null);
 
-if( surface_m2 > 200){
-	//traceln("House created with " + surface_m2 + "m2 surace area, will have large hot water demand");
-}
-if (surface_m2 < 25){
-	//traceln("House created with " + surface_m2 + "m2 surace area, will have low hot water demand");
-}
+J_EAConsumption hotwaterDemand = new J_EAConsumption( GC, OL_EnergyAssetType.HOT_WATER_CONSUMPTION, "default_house_hot_water_demand_fr", yearlyHWD_kWh, OL_EnergyCarriers.HEAT, energyModel.p_timeStep_h, null);
 /*ALCODEEND*/}
 
-double f_addBuildingHeatModel(GridConnection parentGC,double floorArea_m2)
+double f_addBuildingHeatModel(GridConnection parentGC,double floorArea_m2,Double heatDemand_kwhpa,J_HeatingPreferences heatingPreferences)
 {/*ALCODESTART::1749727623536*/
 double maxPowerHeat_kW = 1000; 				//Dit is hoeveel vermogen het huis kan afgeven/opnemen, mag willekeurige waarden hebben. Wordt alleen gebruikt in rekenstap van ratio of capacity
-double lossfactor_WpK; 						//Dit is wat bepaalt hoeveel warmte het huis verliest/opneemt per tijdstap per delta_T
-double initialTemp = uniform_discr(15,22); 	//starttemperatuur
+double lossFactor_WpK; 						//Dit is wat bepaalt hoeveel warmte het huis verliest/opneemt per tijdstap per delta_T
+double initialTemp_degC = heatingPreferences.getCurrentPreferedTemperatureSetpoint_degC(0);
+double buildingCooldownPeriod_hr;
 double heatCapacity_JpK; 					//hoeveel lucht zit er in je huis dat je moet verwarmen?
 double solarAbsorptionFactor_m2; 	//hoeveel m2 effectieve dak en muur oppervlakte er is dat opwarmt door zonneinstraling
 
-switch (parentGC.p_energyLabel){
-	case A:
-		lossfactor_WpK = 0.35 * floorArea_m2;
-	break;
-	case B:
-		lossfactor_WpK = 0.45 * floorArea_m2;
-	break;
-	case C:
-		lossfactor_WpK = 0.65 * floorArea_m2;
-	break;
-	case D:
-		lossfactor_WpK = 0.85 * floorArea_m2;
-	break;
-	case E:
-		lossfactor_WpK = 1.05 * floorArea_m2;
-	break;
-	case F:
-		lossfactor_WpK = 1.25 * floorArea_m2;
-	break;
-	case G:
-		lossfactor_WpK = 1.45 * floorArea_m2;
-	break;
-	case NONE:
-	case UNKNOWN:
-	default:
-		lossfactor_WpK = uniform (0.85, 1.2) * floorArea_m2;
+//Determine the heat loss factor based on yearly energy energy consumption for heating or energyLabel
+if(heatDemand_kwhpa != null && heatDemand_kwhpa > 0){
+	lossFactor_WpK = heatDemand_kwhpa / avgc_data.p_PBL_HeatingLossFactor_fr;
+}
+else{
+	switch (parentGC.p_insulationLabel){
+		case NONE:
+		case UNKNOWN:
+			lossFactor_WpK = uniform (avgc_data.map_insulationLabel_lossfactorPerFloorSurface_WpKm2.get(OL_GridConnectionInsulationLabel.D), avgc_data.map_insulationLabel_lossfactorPerFloorSurface_WpKm2.get(OL_GridConnectionInsulationLabel.G)) * floorArea_m2;
+			break;
+		default:
+			lossFactor_WpK = avgc_data.map_insulationLabel_lossfactorPerFloorSurface_WpKm2.get(parentGC.p_insulationLabel);
+	}
 }
 
-lossfactor_WpK = roundToDecimal(lossfactor_WpK,2);
-solarAbsorptionFactor_m2 = floorArea_m2 * 0.01; //solar irradiance [W/m2]
- 
-heatCapacity_JpK = floorArea_m2 * 50000;
+//Determine the solar absortion factor_m2 based on floor surface.
+solarAbsorptionFactor_m2 = floorArea_m2 * avgc_data.p_solarAbsorptionFloorSurfaceScalingFactor_fr; //solar irradiance [W/m2]
+
+//Determine the heat capacity of the building based on a cooldown period
+/*
+switch (parentGC.p_insulationLabel){
+		case NONE:
+		case UNKNOWN:
+			buildingCooldownPeriod_hr = uniform (avgc_data.map_insulationLabel_cooldownPeriod_hr.get(OL_GridConnectionInsulationLabel.D), avgc_data.map_insulationLabel_cooldownPeriod_hr.get(OL_GridConnectionInsulationLabel.G));
+			break;
+		default:
+			buildingCooldownPeriod_hr = avgc_data.map_insulationLabel_cooldownPeriod_hr.get(parentGC.p_insulationLabel);
+}
+heatCapacity_JpK = buildingCooldownPeriod_hr * lossFactor_WpK * 3600;
+*/
+
+//Determine the heat capacity of the building based on the floor surface and some factors
+heatCapacity_JpK = (avgc_data.p_heatCapacitySizingSlope_JpKm2 * floorArea_m2 + avgc_data.p_heatCapacitySizingConstant_JpK) * avgc_data.p_heatCapacitySizingFactor_fr;
+
+//Create the thermal building asset
+parentGC.p_BuildingThermalAsset = new J_EABuilding( parentGC, maxPowerHeat_kW, lossFactor_WpK, energyModel.p_timeStep_h, initialTemp_degC, heatCapacity_JpK, solarAbsorptionFactor_m2 );
 
-parentGC.p_BuildingThermalAsset = new J_EABuilding( parentGC, maxPowerHeat_kW, lossfactor_WpK, energyModel.p_timeStep_h, initialTemp, heatCapacity_JpK, solarAbsorptionFactor_m2 );
-energyModel.c_ambientDependentAssets.add( parentGC.p_BuildingThermalAsset );
 
 //FOR NOW DEFAULT NO INTERIOR/EXTERIOR HEAT BUFFERS -> NOT NECESSARY
 /*
@@ -3460,37 +3442,53 @@ List<Building_data> f_getBuildingsInSubScope(List<Building_data> initialBuilding
 	GCH.p_purposeBAG = houseBuildingData.purpose();
 	
 	//pand gegevens
-	GCH.p_bouwjaar = houseBuildingData.build_year();
+	GCH.p_buildYear = houseBuildingData.build_year();
 	GCH.p_eigenOprit = houseBuildingData.has_private_parking() != null ? houseBuildingData.has_private_parking() : false;
 	
-	//Nageisoleerd
-	if (houseBuildingData.energy_label() != null) {
-		GCH.p_energyLabel = houseBuildingData.energy_label();
+	//PBL heating
+	if(houseBuildingData.pbl_data_available()){
+		GCH.p_PBLParameters = new J_PBLParameters(houseBuildingData.building_type(), 
+												  houseBuildingData.ownership_type(),  
+												  houseBuildingData.insulation_label(), 
+												  houseBuildingData.local_factor(), 
+												  houseBuildingData.regional_climate_correction_factor());
 	}
+	
+	
+	//Energylabel and InsulationLabel
+	if (houseBuildingData.energy_label() != null) {
+	    GCH.p_energyLabel = houseBuildingData.energy_label();
+	    GCH.p_insulationLabel = houseBuildingData.insulation_label() != null ? houseBuildingData.insulation_label() : OL_GridConnectionInsulationLabel.valueOf(GCH.p_energyLabel.toString());
+	} 
+	else if (houseBuildingData.insulation_label() != null) {
+	    GCH.p_insulationLabel = houseBuildingData.insulation_label();
+	    GCH.p_energyLabel = OL_GridConnectionEnergyLabel.valueOf(GCH.p_insulationLabel.toString());
+	} 
 	else {
-		if (GCH.p_bouwjaar < 1980) {
-			GCH.p_energyLabel = OL_GridConnectionIsolationLabel.D;
-		}
-		else if (GCH.p_bouwjaar < 2000) {
-			GCH.p_energyLabel = OL_GridConnectionIsolationLabel.C;
-		}
-		else if (GCH.p_bouwjaar < 2015) {
-			GCH.p_energyLabel = OL_GridConnectionIsolationLabel.B;
-		}
-		else {
-			GCH.p_energyLabel = OL_GridConnectionIsolationLabel.A;
-		}
+	    GCH.p_energyLabel = f_estimateEnergyLabel(GCH.p_buildYear);
+	    GCH.p_insulationLabel = OL_GridConnectionInsulationLabel.valueOf(GCH.p_energyLabel.toString());
 	}
-	//aansluiting gegevens
-	GCH.v_liveConnectionMetaData.physicalCapacity_kW = avgc_data.p_avgHouseConnectionCapacity_kW;
-	GCH.v_liveConnectionMetaData.contractedDeliveryCapacity_kW = avgc_data.p_avgHouseConnectionCapacity_kW;
-	GCH.v_liveConnectionMetaData.contractedFeedinCapacity_kW = avgc_data.p_avgHouseConnectionCapacity_kW;
 	
-	GCH.v_liveConnectionMetaData.physicalCapacityKnown = false;
-	GCH.v_liveConnectionMetaData.contractedDeliveryCapacityKnown = false;
-	GCH.v_liveConnectionMetaData.contractedFeedinCapacityKnown = false;
+	//Connection data
+	if(houseBuildingData.contracted_capacity_kw() != null && houseBuildingData.contracted_capacity_kw() > 0){
+		GCH.v_liveConnectionMetaData.physicalCapacity_kW = houseBuildingData.contracted_capacity_kw();
+		GCH.v_liveConnectionMetaData.contractedDeliveryCapacity_kW = houseBuildingData.contracted_capacity_kw();
+		GCH.v_liveConnectionMetaData.contractedFeedinCapacity_kW = houseBuildingData.contracted_capacity_kw();
+		GCH.v_liveConnectionMetaData.physicalCapacityKnown = true;
+		GCH.v_liveConnectionMetaData.contractedDeliveryCapacityKnown = true;
+		GCH.v_liveConnectionMetaData.contractedFeedinCapacityKnown = true;
+	}
+	else{
+		GCH.v_liveConnectionMetaData.physicalCapacity_kW = avgc_data.p_avgHouseConnectionCapacity_kW;
+		GCH.v_liveConnectionMetaData.contractedDeliveryCapacity_kW = avgc_data.p_avgHouseConnectionCapacity_kW;
+		GCH.v_liveConnectionMetaData.contractedFeedinCapacity_kW = avgc_data.p_avgHouseConnectionCapacity_kW;
+		GCH.v_liveConnectionMetaData.physicalCapacityKnown = false;
+		GCH.v_liveConnectionMetaData.contractedDeliveryCapacityKnown = false;
+		GCH.v_liveConnectionMetaData.contractedFeedinCapacityKnown = false;
+	}
+
 	
-	// Address data
+	//Address data
 	GCH.p_address = new J_Address(houseBuildingData.streetname(), 
 							      houseBuildingData.house_number(), 
 							      houseBuildingData.house_letter(), 
@@ -3498,7 +3496,7 @@ else if (GCH.p_bouwjaar < 2015) {
 							      houseBuildingData.postalcode(), 
 							      houseBuildingData.city());
 
-	//locatie
+	//Location
 	GCH.p_longitude = houseBuildingData.longitude();
 	GCH.p_latitude = houseBuildingData.latitude();
 	GCH.setLatLon(GCH.p_latitude, GCH.p_longitude);
@@ -3532,19 +3530,14 @@ else if (GCH.p_bouwjaar < 2015) {
 	//Floor surface of GC
 	GCH.p_floorSurfaceArea_m2 = houseBuildingData.address_floor_surface_m2();
 	
-	//Get energy totals
-	double yearlyElectricityConsumption_kWh = houseBuildingData.electricity_consumption_kwhpa() != null ? houseBuildingData.electricity_consumption_kwhpa() :  avgc_data.p_avgHouseElectricityConsumption_kWh_yr;//Double.valueOf(uniform_discr(1200, 3800));
-	double yearlyGasConsumption_m3 = houseBuildingData.gas_consumption_m3pa() != null ? houseBuildingData.gas_consumption_m3pa() :  avgc_data.p_avgHouseGasConsumption_m3_yr;//Double.valueOf(uniform_discr(600, 2000);
-
-	
-	//GCH.p_initialPVpanels = houseBuildingData.pv_default();
+	//Set PV information
 	GCH.v_liveAssetsMetaData.initialPV_kW = houseBuildingData.pv_installed_kwp() != null ? houseBuildingData.pv_installed_kwp() : 0;
 	GCH.v_liveAssetsMetaData.PVPotential_kW = GCH.v_liveAssetsMetaData.initialPV_kW > 0 ? GCH.v_liveAssetsMetaData.initialPV_kW : houseBuildingData.pv_potential_kwp(); // To prevent sliders from changing outcomes
 
-	// TODO: Above we load in data of gas use, but the houses always have a thermal model??
-	f_addEnergyAssetsToHouses(GCH, yearlyElectricityConsumption_kWh );	
+	//Create and add EnergyAssets
+	f_addEnergyAssetsToHouses(GCH, houseBuildingData.electricity_consumption_kwhpa(), houseBuildingData.gas_consumption_m3pa());	
 	
-	i ++;
+	i++;
 }
 
 //Backup for when pv_potential kWp is null, needs to be after all houses have been made, so rooftop surface is distributed correctly
@@ -3557,32 +3550,22 @@ else if (GCH.p_bouwjaar < 2015) {
 
 /*ALCODEEND*/}
 
-double f_addEnergyAssetsToHouses(GCHouse house,double jaarlijksElectriciteitsVerbruik)
+double f_addEnergyAssetsToHouses(GCHouse house,Double electricityDemand_kwhpa,Double gasDemand_m3pa)
 {/*ALCODESTART::1749728889986*/
 //Add generic electricity demand profile 
 GridNode gn = findFirst(energyModel.pop_gridNodes, x -> x.p_gridNodeID.equals( house.p_parentNodeElectricID));
+
 if ( ! gn.p_hasProfileData ){
-	f_addElectricityDemandProfile(house, jaarlijksElectriciteitsVerbruik, null, false, "default_house_electricity_demand_fr");
+	if(electricityDemand_kwhpa == null){
+		electricityDemand_kwhpa = uniform(avgc_data.p_avgHouseElectricityConsumption_kWh_yr - avgc_data.p_maxAvgHouseElectricityConsumptionOffset_kWhpa, 
+										  avgc_data.p_avgHouseElectricityConsumption_kWh_yr + avgc_data.p_maxAvgHouseElectricityConsumptionOffset_kWhpa);
+	}
+	f_addElectricityDemandProfile(house, electricityDemand_kwhpa, null, false, "default_house_electricity_demand_fr");
 }
 
-//Add building heat model and asset
-f_addBuildingHeatModel(house, house.p_floorSurfaceArea_m2);
-
-//Determine required heating capacity for the heating asset	
-double maximalTemperatureDifference_K = 30.0; // Approximation
-double maxHeatOutputPower_kW = house.p_BuildingThermalAsset.getLossFactor_WpK() * maximalTemperatureDifference_K / 1000;
-
-
-//Add heat demand profile
-OL_GridConnectionHeatingType heatingType = avgc_data.p_avgHouseHeatingMethod;
-f_addHeatAsset(house, heatingType, maxHeatOutputPower_kW);
-house.f_addHeatManagement(heatingType, false);
-house.f_setHeatingPreferences(f_getHouseHeatingPreferences());
 
-//Add hot water and cooking demand
-f_addHotWaterDemand(house, house.p_floorSurfaceArea_m2);
-double yearlyCookingDemand_kWh = uniform_discr(200,600);
-f_addCookingAsset(house, OL_EnergyAssetType.GAS_PIT, yearlyCookingDemand_kWh);
+//Add Heating assets: Spaceheating, DHW and cooking
+f_addHeatAssetsToHouses(house, gasDemand_m3pa);
 
 
 //Add pv
@@ -4903,3 +4886,180 @@ OL_GISObjectType f_getNBHGISObjectType(GIS_Object NBH,String NBHCode,OL_GISObjec
 }
 /*ALCODEEND*/}
 
+double f_getSpaceHeatingDemand_PBL_kWh(double floorSurfaceArea_m2,PBL_SpaceHeatingAndResidents_data spaceHeatingObjectPBL,double localFactor,double regionalClimateCorrectionFactor)
+{/*ALCODESTART::1768308906995*/
+//Get the slope and constant from the PBL data
+double slope_m3pm2pa = spaceHeatingObjectPBL.slope_space_heating_gas_m3pm2a();
+double constant_m3pa = spaceHeatingObjectPBL.constant_space_heating_gas_m3pa();
+
+//Determine the space heating gas demand based on the floor surface
+double functionalSpaceHeatingDemand_m3pa = floorSurfaceArea_m2 * slope_m3pm2pa + constant_m3pa;
+
+//Convert to kwh and multiply by the local and climate factors
+double functionalSpaceHeatingDemand_kWh = functionalSpaceHeatingDemand_m3pa * avgc_data.p_gas_kWhpm3 * localFactor * regionalClimateCorrectionFactor ;
+return functionalSpaceHeatingDemand_kWh;
+/*ALCODEEND*/}
+
+PBL_SpaceHeatingAndResidents_data f_getPBLObject_spaceHeatingAndResidents(OL_PBL_BuildingType buildingType,int buildYear,OL_PBL_OwnershipType ownershipType,OL_GridConnectionInsulationLabel insulationLabel)
+{/*ALCODESTART::1768319865034*/
+int constructionPeriod = J_PBLUtil.getConstructionPeriodOption_spaceHeatingAndResidents(buildYear);
+int regressionPopulation = J_PBLUtil.getPBLRegressionPopulation(insulationLabel, buildingType);
+
+PBL_SpaceHeatingAndResidents_data PBLObject_spaceHeatingAndResidents = findFirst(c_lookupTablePBL_spaceHeatingAndResidents, pbl -> pbl.building_type() == buildingType &&
+																							   pbl.construction_period() == constructionPeriod &&
+																							   pbl.ownership_type() == ownershipType &&
+																							   pbl.insulation_label() == insulationLabel &&
+																							   pbl.regression_population() == regressionPopulation
+																							   );
+
+// Check for no matching pbl object found
+if (PBLObject_spaceHeatingAndResidents == null) {
+    System.out.println("Error: no matching pbl object found for spaceheating with conditions:");
+    System.out.println(" buildingType = " + buildingType);
+    System.out.println(" constructionPeriod = " + constructionPeriod);
+    System.out.println(" ownershipType = " + ownershipType);
+    System.out.println(" insulationLabel = " + insulationLabel);
+    System.out.println(" regressionPopulation = " + regressionPopulation);
+    throw new RuntimeException("No matching PBL object found!");
+}
+
+return PBLObject_spaceHeatingAndResidents;
+/*ALCODEEND*/}
+
+PBL_DHWAndCooking_data f_getPBLObject_DHWAndCooking(int buildYear,double floorSurfaceArea_m2,int householdSize)
+{/*ALCODESTART::1768319890191*/
+int constructionPeriod = J_PBLUtil.getConstructionPeriodOption_DHWAndCooking(buildYear);
+int surfaceCode = J_PBLUtil.getTNOFloorSurfaceCode(floorSurfaceArea_m2);
+
+PBL_DHWAndCooking_data PBLObject_DHWAndCooking = findFirst(c_lookupTablePBL_DHWAndCooking, pbl -> pbl.construction_period() == constructionPeriod &&
+																								  pbl.surface_code() == surfaceCode &&
+																								  pbl.household_size() == householdSize);
+																								  
+// Check for no matches
+if (PBLObject_DHWAndCooking == null) {
+    System.out.println("Error: no matching PBL object found for PBL DHW and Cooking demand with conditions:");
+    System.out.println("  constructionPeriod = " + constructionPeriod);
+    System.out.println("  floorSurfaceArea_m2 = " + floorSurfaceArea_m2);
+    System.out.println("  surfaceCode = " + surfaceCode);
+    System.out.println("  householdSize = " + householdSize);
+    throw new RuntimeException("No matching PBL object found!"); // Misschien wat een te harde error? 
+    													  // Hij kan altijd nog terug vallen op de backup toch?
+}
+
+return PBLObject_DHWAndCooking;
+/*ALCODEEND*/}
+
+OL_GridConnectionEnergyLabel f_estimateEnergyLabel(int constructionYear)
+{/*ALCODESTART::1768385335525*/
+if (constructionYear < 1980) {
+	return OL_GridConnectionEnergyLabel.D;
+}
+else if (constructionYear < 1996) {
+	return OL_GridConnectionEnergyLabel.C;
+}
+else if (constructionYear < 2008) {
+	return OL_GridConnectionEnergyLabel.B;
+}
+else {
+	return OL_GridConnectionEnergyLabel.A;
+}
+/*ALCODEEND*/}
+
+int f_getNumberOfResidents_PBL(PBL_SpaceHeatingAndResidents_data spaceHeatingObjectPBL,double floorSurfaceArea_m2)
+{/*ALCODESTART::1768387542917*/
+// Determine the number of residents
+int numberOfResidents = roundToInt(floorSurfaceArea_m2 * spaceHeatingObjectPBL.slope_residents() + spaceHeatingObjectPBL.constant_residents());
+if(numberOfResidents < 1){
+	numberOfResidents = 1;
+}
+else if(numberOfResidents > 5){	
+	traceln("House found with more than 5 residents -> number of residents is capped to 5! Number of residents found: " + numberOfResidents + ", floorSurfaceArea_m2: " + floorSurfaceArea_m2);
+	numberOfResidents = 5;
+}
+return numberOfResidents;
+/*ALCODEEND*/}
+
+double f_addHeatAssetsToHouses(GCHouse house,Double gasDemand_m3pa)
+{/*ALCODESTART::1768486498278*/
+//Add building heat model and asset
+double annualNaturalGasConsumption_kwhpa;
+if(gasDemand_m3pa != null) {
+	annualNaturalGasConsumption_kwhpa = gasDemand_m3pa * avgc_data.p_gas_kWhpm3;
+}
+else{
+	annualNaturalGasConsumption_kwhpa =  uniform(avgc_data.p_avgHouseGasConsumption_m3_yr - avgc_data.p_maxAvgHouseGasConsumptionOffset_m3pa, 
+										         avgc_data.p_avgHouseGasConsumption_m3_yr + avgc_data.p_maxAvgHouseGasConsumptionOffset_m3pa)
+	 											 * avgc_data.p_gas_kWhpm3;
+}
+
+
+double spaceHeatingDemand_kwhpa;
+double hotWaterDemand_kWhpa;
+double cookingDemand_kWhpa;
+if(house.p_PBLParameters != null){
+	PBL_SpaceHeatingAndResidents_data spaceHeatingDataObject = f_getPBLObject_spaceHeatingAndResidents(house.p_PBLParameters.getBuildingType(), house.p_buildYear, house.p_PBLParameters.getOwnershipType(), house.p_insulationLabel);
+	spaceHeatingDemand_kwhpa = f_getSpaceHeatingDemand_PBL_kWh(house.p_floorSurfaceArea_m2, spaceHeatingDataObject, house.p_PBLParameters.getLocalFactor(), house.p_PBLParameters.getRegionalClimateCorrectionFactor());
+	
+	int numberOfResidents = f_getNumberOfResidents_PBL(spaceHeatingDataObject, house.p_floorSurfaceArea_m2);
+	
+	PBL_DHWAndCooking_data DHWAndCookingDataObject = f_getPBLObject_DHWAndCooking(house.p_buildYear, house.p_floorSurfaceArea_m2, numberOfResidents);
+	hotWaterDemand_kWhpa = DHWAndCookingDataObject.dhw_gas_demand_m3pa() * avgc_data.p_gas_kWhpm3;
+	cookingDemand_kWhpa = DHWAndCookingDataObject.cooking_gas_demand_m3pa() * avgc_data.p_gas_kWhpm3;
+}
+else{
+	spaceHeatingDemand_kwhpa = annualNaturalGasConsumption_kwhpa * avgc_data.p_avgSpaceHeatingTotalGasConsumptionShare_fr;
+	hotWaterDemand_kWhpa = annualNaturalGasConsumption_kwhpa * avgc_data.p_avgDHWTotalGasConsumptionShare_fr;
+	cookingDemand_kWhpa = annualNaturalGasConsumption_kwhpa * avgc_data.p_avgCookingTotalGasConsumptionShare_fr;
+	
+	//hotWaterDemand_kWhpa = f_estimateHouseDHWDemand_kWh(house.p_floorSurfaceArea_m2);
+	//cookingDemand_kWhpa = f_estimateHouseCookingDemand_kWh();
+}
+
+//Get the house heating preferences
+J_HeatingPreferences heatingPreferences = f_getHouseHeatingPreferences();
+
+f_addBuildingHeatModel(house, house.p_floorSurfaceArea_m2, spaceHeatingDemand_kwhpa, heatingPreferences);
+
+//Determine required heating capacity for the heating asset	
+double maximalTemperatureDifference_K = 30.0; // Approximation
+double maxHeatOutputPower_kW = house.p_BuildingThermalAsset.getLossFactor_WpK() * maximalTemperatureDifference_K / 1000;
+
+//Add heating asset
+OL_GridConnectionHeatingType heatingType = avgc_data.p_avgHouseHeatingMethod;
+f_addHeatAsset(house, heatingType, maxHeatOutputPower_kW);
+
+//Add heating management and set the heating preferences
+house.f_addHeatManagement(heatingType, false);
+house.f_setHeatingPreferences(heatingPreferences);
+
+//Add hot water and cooking demand
+f_addHotWaterDemand(house, hotWaterDemand_kWhpa);
+f_addCookingAsset(house, OL_EnergyAssetType.GAS_PIT, cookingDemand_kWhpa);
+
+/*ALCODEEND*/}
+
+double f_estimateHouseDHWDemand_kWh(double floorSurface_m2)
+{/*ALCODESTART::1768570811946*/
+int numberOfResidents;
+if( floorSurface_m2 > 150){
+	numberOfResidents = uniform_discr(2,6);
+}
+else if (floorSurface_m2 > 50){
+	numberOfResidents = uniform_discr(1,4);
+}
+else {
+	numberOfResidents = uniform_discr(1,2);
+}
+
+double yearlyHWD_kWh = 1000 + numberOfResidents * 150; //SOURCE!? Put in AVGC!!
+return yearlyHWD_kWh;
+
+/*ALCODEEND*/}
+
+double f_estimateHouseCookingDemand_kWh()
+{/*ALCODESTART::1768571246858*/
+double yearlyCookingDemand_kWh = uniform_discr(70,130); //SOURCE? -> Put in AVGC!
+return yearlyCookingDemand_kWh;
+
+/*ALCODEEND*/}
+
diff --git a/_alp/Agents/Zero_Loader/Code/Functions.xml b/_alp/Agents/Zero_Loader/Code/Functions.xml
index 0e895ec..334d80a 100644
--- a/_alp/Agents/Zero_Loader/Code/Functions.xml
+++ b/_alp/Agents/Zero_Loader/Code/Functions.xml
@@ -6,8 +6,8 @@
 		<Id>1726584205769</Id>
 		<Name><![CDATA[f_createGISRegions]]></Name>
 		<Description><![CDATA[Creates the outline of the simulated area]]></Description>
-		<X>1546.739</X>
-		<Y>539</Y>
+		<X>1786.739</X>
+		<Y>569</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -76,8 +76,8 @@
 		<ReturnType>double[]</ReturnType>
 		<Id>1726584205777</Id>
 		<Name><![CDATA[f_createGISObjectTokens]]></Name>
-		<X>1565.241</X>
-		<Y>680</Y>
+		<X>1805.241</X>
+		<Y>710</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -104,7 +104,7 @@
 
 @author: Ate
 @since: 14-12-23]]></Description>
-		<X>-390</X>
+		<X>-410</X>
 		<Y>90</Y>
 		<Label>
 			<X>10</X>
@@ -122,7 +122,7 @@
 		<Name><![CDATA[f_createSolarParks]]></Name>
 		<Description><![CDATA[Function used to generate solar parks: grid connections and park owner (connection owner actor)]]></Description>
 		<X>430.001</X>
-		<Y>790.001</Y>
+		<Y>750.001</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -139,7 +139,7 @@
 		<Name><![CDATA[f_createBatteries]]></Name>
 		<Description><![CDATA[Function used to create (neighborhood) battery grid connection and actor]]></Description>
 		<X>430.001</X>
-		<Y>930</Y>
+		<Y>890</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -156,7 +156,7 @@
 		<Name><![CDATA[f_createElectrolysers]]></Name>
 		<Description><![CDATA[Function used to create electrolyser grid connections and actors]]></Description>
 		<X>430</X>
-		<Y>910</Y>
+		<Y>870</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -173,7 +173,7 @@
 		<Name><![CDATA[f_createWindFarms]]></Name>
 		<Description><![CDATA[Function used to create all windfarm grid connections, actors, EAs and GISObjects]]></Description>
 		<X>430.001</X>
-		<Y>810</Y>
+		<Y>770</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -227,7 +227,7 @@
 		<Name><![CDATA[f_createGenericCompanies]]></Name>
 		<Description><![CDATA[Creating the companies (using a single GC) + owned buildings, that have not filled in the survey. If created, they will be simulated using average values, scaled with the totals (CBS data) of the area.]]></Description>
 		<X>430</X>
-		<Y>533</Y>
+		<Y>553</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -243,8 +243,8 @@
 		<Id>1726584205801</Id>
 		<Name><![CDATA[f_createGISBuilding]]></Name>
 		<Description><![CDATA[Creates the GIS object(s) building(s) for the companies and houses]]></Description>
-		<X>1547.621</X>
-		<Y>600</Y>
+		<X>1787.621</X>
+		<Y>630</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -267,8 +267,8 @@
 		<ReturnType>double</ReturnType>
 		<Id>1726584205803</Id>
 		<Name><![CDATA[f_addElectricityDemandProfile]]></Name>
-		<X>900</X>
-		<Y>110</Y>
+		<X>1320</X>
+		<Y>100</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -304,8 +304,8 @@
 		<Id>1726584205807</Id>
 		<Name><![CDATA[f_createGISParcels]]></Name>
 		<Description><![CDATA[Creates "empty" parcels on the gismap, these parcels do not contain buildings or gridconnections. Currently no need for the function to return the GIS_Object.]]></Description>
-		<X>1547.621</X>
-		<Y>620</Y>
+		<X>1787.621</X>
+		<Y>650</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -320,8 +320,8 @@
 		<ReturnType>double</ReturnType>
 		<Id>1726584205809</Id>
 		<Name><![CDATA[f_addEnergyProduction]]></Name>
-		<X>900</X>
-		<Y>200</Y>
+		<X>1320</X>
+		<Y>190</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -353,8 +353,8 @@
 		<Id>1726584205811</Id>
 		<Name><![CDATA[f_createGISObject]]></Name>
 		<Description><![CDATA[Creates the GIS object for the area EA (windfarms, solarparks, electrolysers, batteries, etc.)]]></Description>
-		<X>1547.621</X>
-		<Y>580</Y>
+		<X>1787.621</X>
+		<Y>610</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -462,8 +462,8 @@
 		<ReturnType>J_EAEV</ReturnType>
 		<Id>1726584205827</Id>
 		<Name><![CDATA[f_addElectricVehicle]]></Name>
-		<X>900</X>
-		<Y>740</Y>
+		<X>1320</X>
+		<Y>620</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -498,8 +498,8 @@
 		<ReturnType>J_EAPetroleumFuelVehicle</ReturnType>
 		<Id>1726584205829</Id>
 		<Name><![CDATA[f_addPetroleumFuelVehicle]]></Name>
-		<X>900</X>
-		<Y>760</Y>
+		<X>1320</X>
+		<Y>640</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -530,8 +530,8 @@
 		<ReturnType>double</ReturnType>
 		<Id>1726584205831</Id>
 		<Name><![CDATA[f_addStorage]]></Name>
-		<X>900</X>
-		<Y>680</Y>
+		<X>1320</X>
+		<Y>560</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -564,7 +564,7 @@
 		<Name><![CDATA[f_iEAGenericCompanies]]></Name>
 		<Description><![CDATA[Initialisation of the Energy assets using average values for companies that have not filled in the survey (yet) combined with totals (floor surface, electricity/yr, gas/yr and trucks)  of the simulated area.]]></Description>
 		<X>450</X>
-		<Y>553</Y>
+		<Y>573</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -587,8 +587,8 @@
 		<ReturnType>double</ReturnType>
 		<Id>1726584205835</Id>
 		<Name><![CDATA[f_createRemainingBuildings]]></Name>
-		<X>1546.739</X>
-		<Y>639</Y>
+		<X>1786.739</X>
+		<Y>669</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -603,8 +603,8 @@
 		<ReturnType>double</ReturnType>
 		<Id>1726584205837</Id>
 		<Name><![CDATA[f_addTransportHydrogen]]></Name>
-		<X>900</X>
-		<Y>780</Y>
+		<X>1320</X>
+		<Y>660</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -635,8 +635,8 @@
 		<ReturnType>double</ReturnType>
 		<Id>1726584205845</Id>
 		<Name><![CDATA[f_addChargingDemandProfile]]></Name>
-		<X>900</X>
-		<Y>720</Y>
+		<X>1320</X>
+		<Y>600</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -659,8 +659,8 @@
 		<ReturnType>String</ReturnType>
 		<Id>1726584205847</Id>
 		<Name><![CDATA[f_createChargerPolygon]]></Name>
-		<X>1565</X>
-		<Y>700</Y>
+		<X>1805</X>
+		<Y>730</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -684,7 +684,7 @@
 		<Id>1726584205849</Id>
 		<Name><![CDATA[f_createChargingStations]]></Name>
 		<X>431</X>
-		<Y>831</Y>
+		<Y>791</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -715,8 +715,8 @@
 		<ReturnType>double</ReturnType>
 		<Id>1726584205859</Id>
 		<Name><![CDATA[f_createGISCables]]></Name>
-		<X>1547.621</X>
-		<Y>660</Y>
+		<X>1787.621</X>
+		<Y>690</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -733,8 +733,8 @@
 		<Name><![CDATA[f_createPreprocessedElectricityProfile_PV]]></Name>
 		<Description><![CDATA[Principe:
 verbruik = levering + productie - teruglevering]]></Description>
-		<X>920</X>
-		<Y>130</Y>
+		<X>1340</X>
+		<Y>120</Y>
 		<Label>
 			<X>9</X>
 			<Y>-1</Y>
@@ -789,7 +789,7 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<ReturnType>double</ReturnType>
 		<Id>1726584205867</Id>
 		<Name><![CDATA[f_readDatabase]]></Name>
-		<X>-390</X>
+		<X>-410</X>
 		<Y>190</Y>
 		<Label>
 			<X>10</X>
@@ -805,8 +805,8 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<ReturnType>double</ReturnType>
 		<Id>1726584205869</Id>
 		<Name><![CDATA[f_clearDataRecords]]></Name>
-		<X>-390</X>
-		<Y>710</Y>
+		<X>-410</X>
+		<Y>730</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -822,7 +822,7 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<Id>1726584205871</Id>
 		<Name><![CDATA[f_createSurveyCompanies_Excel]]></Name>
 		<X>430</X>
-		<Y>508</Y>
+		<Y>528</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -869,7 +869,7 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<ReturnType>double</ReturnType>
 		<Id>1727792666396</Id>
 		<Name><![CDATA[f_overwriteSpecificDatabaseValues]]></Name>
-		<X>-390</X>
+		<X>-410</X>
 		<Y>140</Y>
 		<Label>
 			<X>10</X>
@@ -885,8 +885,8 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<ReturnType>double[]</ReturnType>
 		<Id>1728035809860</Id>
 		<Name><![CDATA[f_convertFloatArrayToDoubleArray]]></Name>
-		<X>1550</X>
-		<Y>880</Y>
+		<X>1790</X>
+		<Y>910</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -905,8 +905,8 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<ReturnType>double</ReturnType>
 		<Id>1728039545686</Id>
 		<Name><![CDATA[f_getPreprocessedElectricityConsumptionTotal]]></Name>
-		<X>920</X>
-		<Y>150</Y>
+		<X>1340</X>
+		<Y>140</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -941,8 +941,8 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<ReturnType>double</ReturnType>
 		<Id>1732112209863</Id>
 		<Name><![CDATA[f_createCustomPVAsset]]></Name>
-		<X>900</X>
-		<Y>220</Y>
+		<X>1320</X>
+		<Y>210</Y>
 		<Label>
 			<X>9</X>
 			<Y>-1</Y>
@@ -1017,8 +1017,8 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<ReturnType>double</ReturnType>
 		<Id>1737712184349</Id>
 		<Name><![CDATA[f_createPetroleumFuelTractors]]></Name>
-		<X>900</X>
-		<Y>800</Y>
+		<X>1320</X>
+		<Y>680</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1065,8 +1065,8 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<ReturnType>double[]</ReturnType>
 		<Id>1738572338816</Id>
 		<Name><![CDATA[f_timeSeriesToQuarterHourlyDoubleArray]]></Name>
-		<X>1550</X>
-		<Y>910</Y>
+		<X>1790</X>
+		<Y>940</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1085,8 +1085,8 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<ReturnType>double</ReturnType>
 		<Id>1742915722586</Id>
 		<Name><![CDATA[f_connectGCToExistingBuilding]]></Name>
-		<X>1550</X>
-		<Y>790</Y>
+		<X>1790</X>
+		<Y>810</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1113,8 +1113,8 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<ReturnType>double</ReturnType>
 		<Id>1745336570663</Id>
 		<Name><![CDATA[f_addHeatAsset]]></Name>
-		<X>900</X>
-		<Y>500</Y>
+		<X>1320</X>
+		<Y>430</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1316,7 +1316,7 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<Id>1749648772203</Id>
 		<Name><![CDATA[f_createChargingSession]]></Name>
 		<X>490</X>
-		<Y>890</Y>
+		<Y>850</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1336,7 +1336,7 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<Id>1749649169603</Id>
 		<Name><![CDATA[f_createNewChargerProfile]]></Name>
 		<X>470</X>
-		<Y>870</Y>
+		<Y>830</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1356,7 +1356,7 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<Id>1749649390125</Id>
 		<Name><![CDATA[f_getChargerProfile]]></Name>
 		<X>450</X>
-		<Y>850</Y>
+		<Y>810</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1371,8 +1371,8 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<ReturnType>double</ReturnType>
 		<Id>1749726189312</Id>
 		<Name><![CDATA[f_addCookingAsset]]></Name>
-		<X>900</X>
-		<Y>620</Y>
+		<X>1320</X>
+		<Y>500</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1381,7 +1381,7 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<PresentationFlag>true</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
 		<Parameter>
-			<Name><![CDATA[gc]]></Name>
+			<Name><![CDATA[GC]]></Name>
 			<Type><![CDATA[GCHouse]]></Type>
 		</Parameter>
 		<Parameter>
@@ -1399,8 +1399,8 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<ReturnType>double</ReturnType>
 		<Id>1749726279652</Id>
 		<Name><![CDATA[f_addHotWaterDemand]]></Name>
-		<X>900</X>
-		<Y>640</Y>
+		<X>1320</X>
+		<Y>520</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1409,11 +1409,11 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<PresentationFlag>true</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
 		<Parameter>
-			<Name><![CDATA[houseGC]]></Name>
-			<Type><![CDATA[GCHouse]]></Type>
+			<Name><![CDATA[GC]]></Name>
+			<Type><![CDATA[GridConnection]]></Type>
 		</Parameter>
 		<Parameter>
-			<Name><![CDATA[surface_m2]]></Name>
+			<Name><![CDATA[yearlyHWD_kWh]]></Name>
 			<Type><![CDATA[double]]></Type>
 		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
@@ -1423,8 +1423,8 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<ReturnType>double</ReturnType>
 		<Id>1749727623536</Id>
 		<Name><![CDATA[f_addBuildingHeatModel]]></Name>
-		<X>900</X>
-		<Y>270</Y>
+		<X>1320</X>
+		<Y>400</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1440,6 +1440,14 @@ verbruik = levering + productie - teruglevering]]></Description>
 			<Name><![CDATA[floorArea_m2]]></Name>
 			<Type><![CDATA[double]]></Type>
 		</Parameter>
+		<Parameter>
+			<Name><![CDATA[heatDemand_kwhpa]]></Name>
+			<Type><![CDATA[Double]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[heatingPreferences]]></Name>
+			<Type><![CDATA[J_HeatingPreferences]]></Type>
+		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
 	<Function AccessType="protected" StaticFunction="false">
@@ -1468,8 +1476,8 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<Id>1749728889984</Id>
 		<Name><![CDATA[f_createHouses]]></Name>
 		<Description><![CDATA[Creates the houses using a single GC, and their building. After creation, they will be simulated using average values.]]></Description>
-		<X>420</X>
-		<Y>640</Y>
+		<X>850</X>
+		<Y>100</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1485,8 +1493,8 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<Id>1749728889986</Id>
 		<Name><![CDATA[f_addEnergyAssetsToHouses]]></Name>
 		<Description><![CDATA[Initialisation of the Energy assets using average values for houses]]></Description>
-		<X>440</X>
-		<Y>680</Y>
+		<X>870</X>
+		<Y>170</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1499,8 +1507,12 @@ verbruik = levering + productie - teruglevering]]></Description>
 			<Type><![CDATA[GCHouse]]></Type>
 		</Parameter>
 		<Parameter>
-			<Name><![CDATA[jaarlijksElectriciteitsVerbruik]]></Name>
-			<Type><![CDATA[double]]></Type>
+			<Name><![CDATA[electricityDemand_kwhpa]]></Name>
+			<Type><![CDATA[Double]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[gasDemand_m3pa]]></Name>
+			<Type><![CDATA[Double]]></Type>
 		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
@@ -1509,8 +1521,8 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<ReturnType>J_HeatingPreferences</ReturnType>
 		<Id>1749728889988</Id>
 		<Name><![CDATA[f_getHouseHeatingPreferences]]></Name>
-		<X>460</X>
-		<Y>700</Y>
+		<X>890</X>
+		<Y>290</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1526,7 +1538,7 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<Id>1749729268458</Id>
 		<Name><![CDATA[f_createParkingSpots]]></Name>
 		<X>430</X>
-		<Y>950</Y>
+		<Y>910</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1687,7 +1699,7 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<Name><![CDATA[f_createEngineProfile1]]></Name>
 		<Description><![CDATA[Functie van gillis voor inladen weer data!]]></Description>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>2419</X>
+		<X>2859</X>
 		<Y>450</Y>
 		<Label>
 			<X>10</X>
@@ -1721,7 +1733,7 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<Name><![CDATA[f_setEngineInputDataAfterDeserialisation]]></Name>
 		<Description><![CDATA[Functie van gillis voor inladen weer data!]]></Description>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>2433</X>
+		<X>2873</X>
 		<Y>260</Y>
 		<Label>
 			<X>10</X>
@@ -1838,7 +1850,7 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<Id>1753449467888</Id>
 		<Name><![CDATA[f_reconstructGridConnections]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>2433.333</X>
+		<X>2873.333</X>
 		<Y>302</Y>
 		<Label>
 			<X>10</X>
@@ -1858,8 +1870,8 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<ReturnType>double</ReturnType>
 		<Id>1753883660006</Id>
 		<Name><![CDATA[f_createHeatProfileFromAnnualGasTotal]]></Name>
-		<X>900</X>
-		<Y>365</Y>
+		<X>1320</X>
+		<Y>295</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1890,8 +1902,8 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<ReturnType>double</ReturnType>
 		<Id>1753883738731</Id>
 		<Name><![CDATA[f_createGasProfileFromAnnualGasTotal]]></Name>
-		<X>900</X>
-		<Y>320</Y>
+		<X>1320</X>
+		<Y>250</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1915,7 +1927,7 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<Id>1753449467890</Id>
 		<Name><![CDATA[f_reconstructEnergyModel]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>2433.333</X>
+		<X>2873.333</X>
 		<Y>282</Y>
 		<Label>
 			<X>10</X>
@@ -2016,7 +2028,7 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<Id>1753449467892</Id>
 		<Name><![CDATA[f_reconstructAgent]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>2445</X>
+		<X>2885</X>
 		<Y>379</Y>
 		<Label>
 			<X>10</X>
@@ -2044,8 +2056,8 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<ReturnType>double</ReturnType>
 		<Id>1753951013582</Id>
 		<Name><![CDATA[f_getGasToHeatEfficiency]]></Name>
-		<X>920</X>
-		<Y>385</Y>
+		<X>1340</X>
+		<Y>315</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2084,8 +2096,8 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<ReturnType>double</ReturnType>
 		<Id>1753955686832</Id>
 		<Name><![CDATA[f_createGasProfileFromEstimates]]></Name>
-		<X>900</X>
-		<Y>340</Y>
+		<X>1320</X>
+		<Y>270</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2104,8 +2116,8 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<ReturnType>double</ReturnType>
 		<Id>1753961830063</Id>
 		<Name><![CDATA[f_createHeatProfileFromEstimates]]></Name>
-		<X>900</X>
-		<Y>430</Y>
+		<X>1320</X>
+		<Y>360</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2149,7 +2161,7 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<Id>1753449467894</Id>
 		<Name><![CDATA[f_reconstructGridConnections1]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>2420</X>
+		<X>2860</X>
 		<Y>480</Y>
 		<Label>
 			<X>10</X>
@@ -2170,7 +2182,7 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<Id>1753451091785</Id>
 		<Name><![CDATA[f_addMixins_old]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>2740</X>
+		<X>3180</X>
 		<Y>70</Y>
 		<Label>
 			<X>10</X>
@@ -2186,8 +2198,8 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<ReturnType>double</ReturnType>
 		<Id>1753964605708</Id>
 		<Name><![CDATA[f_createHeatProfileFromAnnualHeatTotal]]></Name>
-		<X>900</X>
-		<Y>410</Y>
+		<X>1320</X>
+		<Y>340</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2275,7 +2287,7 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<Id>1753712630322</Id>
 		<Name><![CDATA[f_reconstructActors]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>2433</X>
+		<X>2873</X>
 		<Y>322</Y>
 		<Label>
 			<X>10</X>
@@ -2295,8 +2307,8 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<ReturnType>double</ReturnType>
 		<Id>1754050106254</Id>
 		<Name><![CDATA[f_addCustomHeatAsset]]></Name>
-		<X>920</X>
-		<Y>520</Y>
+		<X>1340</X>
+		<Y>450</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2320,7 +2332,7 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<Id>1753712697685</Id>
 		<Name><![CDATA[f_reconstructGIS_Objects]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>2433</X>
+		<X>2873</X>
 		<Y>362</Y>
 		<Label>
 			<X>10</X>
@@ -2345,7 +2357,7 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<Id>1753712761420</Id>
 		<Name><![CDATA[f_reconstructGridNodes]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>2433</X>
+		<X>2873</X>
 		<Y>342</Y>
 		<Label>
 			<X>10</X>
@@ -2369,8 +2381,8 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<ReturnType>double</ReturnType>
 		<Id>1755866291695</Id>
 		<Name><![CDATA[f_addCarsToHouses]]></Name>
-		<X>460</X>
-		<Y>720</Y>
+		<X>880</X>
+		<Y>310</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2389,8 +2401,8 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<ReturnType>double</ReturnType>
 		<Id>1755876470177</Id>
 		<Name><![CDATA[f_calculateProbabilitiesForAdditionalCar]]></Name>
-		<X>440</X>
-		<Y>660</Y>
+		<X>870</X>
+		<Y>120</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2426,7 +2438,7 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<Id>1756735137677</Id>
 		<Name><![CDATA[f_reconstructOrderedCollections]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>2430</X>
+		<X>2870</X>
 		<Y>400</Y>
 		<Label>
 			<X>10</X>
@@ -2463,7 +2475,7 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<Id>1759128970777</Id>
 		<Name><![CDATA[f_addMixins]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>2450</X>
+		<X>2890</X>
 		<Y>70</Y>
 		<Label>
 			<X>10</X>
@@ -2480,7 +2492,7 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<Id>1759133710571</Id>
 		<Name><![CDATA[f_loadScenario]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>2430</X>
+		<X>2870</X>
 		<Y>230</Y>
 		<Label>
 			<X>10</X>
@@ -2501,7 +2513,7 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<Id>1762185034341</Id>
 		<Name><![CDATA[f_getUserUUID]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>2630</X>
+		<X>3070</X>
 		<Y>70</Y>
 		<Label>
 			<X>10</X>
@@ -2545,8 +2557,8 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<ReturnType>boolean</ReturnType>
 		<Id>1763648128875</Id>
 		<Name><![CDATA[f_isLocatedInActiveNBH]]></Name>
-		<X>1550</X>
-		<Y>440</Y>
+		<X>1790</X>
+		<Y>470</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2569,8 +2581,8 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<ReturnType>double</ReturnType>
 		<Id>1763648249772</Id>
 		<Name><![CDATA[f_removeObjectsNotInActiveNBH]]></Name>
-		<X>1550</X>
-		<Y>460</Y>
+		<X>1790</X>
+		<Y>490</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2585,8 +2597,8 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<ReturnType>OL_GISObjectType</ReturnType>
 		<Id>1763648931889</Id>
 		<Name><![CDATA[f_getNBHGISObjectType]]></Name>
-		<X>1570</X>
-		<Y>560</Y>
+		<X>1810</X>
+		<Y>590</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2608,4 +2620,202 @@ verbruik = levering + productie - teruglevering]]></Description>
 		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
+	<Function AccessType="public" StaticFunction="false">
+		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1768308906995</Id>
+		<Name><![CDATA[f_getSpaceHeatingDemand_PBL_kWh]]></Name>
+		<X>890</X>
+		<Y>230</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[floorSurfaceArea_m2]]></Name>
+			<Type><![CDATA[double]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[spaceHeatingObjectPBL]]></Name>
+			<Type><![CDATA[PBL_SpaceHeatingAndResidents_data]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[localFactor]]></Name>
+			<Type><![CDATA[double]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[regionalClimateCorrectionFactor]]></Name>
+			<Type><![CDATA[double]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="public" StaticFunction="false">
+		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
+		<ReturnType>PBL_SpaceHeatingAndResidents_data</ReturnType>
+		<Id>1768319865034</Id>
+		<Name><![CDATA[f_getPBLObject_spaceHeatingAndResidents]]></Name>
+		<X>890</X>
+		<Y>210</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[buildingType]]></Name>
+			<Type><![CDATA[OL_PBL_BuildingType]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[buildYear]]></Name>
+			<Type><![CDATA[int]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[ownershipType]]></Name>
+			<Type><![CDATA[OL_PBL_OwnershipType]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[insulationLabel]]></Name>
+			<Type><![CDATA[OL_GridConnectionInsulationLabel]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="public" StaticFunction="false">
+		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
+		<ReturnType>PBL_DHWAndCooking_data</ReturnType>
+		<Id>1768319890191</Id>
+		<Name><![CDATA[f_getPBLObject_DHWAndCooking]]></Name>
+		<X>890</X>
+		<Y>270</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[buildYear]]></Name>
+			<Type><![CDATA[int]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[floorSurfaceArea_m2]]></Name>
+			<Type><![CDATA[double]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[householdSize]]></Name>
+			<Type><![CDATA[int]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
+		<ReturnType>OL_GridConnectionEnergyLabel</ReturnType>
+		<Id>1768385335525</Id>
+		<Name><![CDATA[f_estimateEnergyLabel]]></Name>
+		<X>870</X>
+		<Y>140</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[constructionYear]]></Name>
+			<Type><![CDATA[int]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="public" StaticFunction="false">
+		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
+		<ReturnType>int</ReturnType>
+		<Id>1768387542917</Id>
+		<Name><![CDATA[f_getNumberOfResidents_PBL]]></Name>
+		<X>890</X>
+		<Y>250</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[spaceHeatingObjectPBL]]></Name>
+			<Type><![CDATA[PBL_SpaceHeatingAndResidents_data]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[floorSurfaceArea_m2]]></Name>
+			<Type><![CDATA[double]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1768486498278</Id>
+		<Name><![CDATA[f_addHeatAssetsToHouses]]></Name>
+		<X>880</X>
+		<Y>190</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[house]]></Name>
+			<Type><![CDATA[GCHouse]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[gasDemand_m3pa]]></Name>
+			<Type><![CDATA[Double]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1768570811946</Id>
+		<Name><![CDATA[f_estimateHouseDHWDemand_kWh]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>890</X>
+		<Y>430</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[floorSurface_m2]]></Name>
+			<Type><![CDATA[double]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1768571246858</Id>
+		<Name><![CDATA[f_estimateHouseCookingDemand_kWh]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>890</X>
+		<Y>450</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
 </Functions>
diff --git a/_alp/Agents/Zero_Loader/EmbeddedObjects.xml b/_alp/Agents/Zero_Loader/EmbeddedObjects.xml
index e58d26f..b7e71bf 100644
--- a/_alp/Agents/Zero_Loader/EmbeddedObjects.xml
+++ b/_alp/Agents/Zero_Loader/EmbeddedObjects.xml
@@ -121,8 +121,8 @@
 	<EmbeddedObject>
 		<Id>1726584829907</Id>
 		<Name><![CDATA[avgc_data]]></Name>
-		<X>-370</X>
-		<Y>830</Y>
+		<X>-390</X>
+		<Y>850</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -293,7 +293,7 @@
 				<Name><![CDATA[p_avgOutputTemperatureHydrogenBurner_degC]]></Name>
 			</Parameter>
 			<Parameter>
-				<Name><![CDATA[p_avgVehiclesPerChargePoint]]></Name>
+				<Name><![CDATA[p_avgVehiclesPerCharger_Centre]]></Name>
 			</Parameter>
 			<Parameter>
 				<Name><![CDATA[p_avgAnnualTravelDistanceVan_km]]></Name>
@@ -341,7 +341,7 @@
 				<Name><![CDATA[p_v1gProbability]]></Name>
 			</Parameter>
 			<Parameter>
-				<Name><![CDATA[p_avgEVsPerPublicCharger]]></Name>
+				<Name><![CDATA[p_avgVehiclesPerCharger_Chargepoint]]></Name>
 			</Parameter>
 			<Parameter>
 				<Name><![CDATA[p_avgPTPower_kWpm2]]></Name>
@@ -397,6 +397,45 @@
 			<Parameter>
 				<Name><![CDATA[p_avgOutputTemperatureHybridHeatpump_degC]]></Name>
 			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_minAnnualTravelDistanceSurveyVehicle_km]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_PBL_HeatingLossFactor_fr]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[map_insulationLabel_lossfactorPerFloorSurface_WpKm2]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_solarAbsorptionFloorSurfaceScalingFactor_fr]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_avgSpaceHeatingTotalGasConsumptionShare_fr]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_avgCookingTotalGasConsumptionShare_fr]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_avgDHWTotalGasConsumptionShare_fr]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_heatCapacitySizingConstant_JpK]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_heatCapacitySizingSlope_JpKm2]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_heatCapacitySizingFactor_fr]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_maxAvgHouseElectricityConsumptionOffset_kWhpa]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_maxAvgHouseGasConsumptionOffset_m3pa]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[map_insulationLabel_cooldownPeriod_hr]]></Name>
+			</Parameter>
 		</Parameters>
 		<ReplicationFlag>false</ReplicationFlag>
 		<Replication Class="CodeValue">
diff --git a/_alp/Agents/Zero_Loader/Levels/Level.level.xml b/_alp/Agents/Zero_Loader/Levels/Level.level.xml
index 9004d5a..05d7ef0 100644
--- a/_alp/Agents/Zero_Loader/Levels/Level.level.xml
+++ b/_alp/Agents/Zero_Loader/Levels/Level.level.xml
@@ -21,7 +21,7 @@
 		<LineColor>-16744448</LineColor>
 		<LineMaterial>null</LineMaterial>
 		<LineStyle>SOLID</LineStyle>
-		<Width>1920</Width>
+		<Width>2200</Width>
 		<Height>980</Height>
 		<Rotation>0.0</Rotation>
 		<FillColor>-1</FillColor>
@@ -30,8 +30,8 @@
 	<Rectangle>
 		<Id>1726584205907</Id>
 		<Name><![CDATA[rect_projectDataTracking]]></Name>
-		<X>1520</X>
-		<Y>20</Y>
+		<X>1760</X>
+		<Y>50</Y>
 		<Label>
 			<X>10</X>
 			<Y>10</Y>
@@ -47,7 +47,7 @@
 		<LineColor>-65536</LineColor>
 		<LineMaterial>null</LineMaterial>
 		<LineStyle>SOLID</LineStyle>
-		<Width>380</Width>
+		<Width>420</Width>
 		<Height>360</Height>
 		<Rotation>0.0</Rotation>
 		<FillColor>-1</FillColor>
@@ -160,8 +160,8 @@
 	<Text>
 		<Id>1726584205921</Id>
 		<Name><![CDATA[txt_projectDataTracking]]></Name>
-		<X>1540</X>
-		<Y>40</Y>
+		<X>1780</X>
+		<Y>60</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -366,8 +366,8 @@
 	<Text>
 		<Id>1726584205937</Id>
 		<Name><![CDATA[t_inputFiles]]></Name>
-		<X>-380</X>
-		<Y>720</Y>
+		<X>-400</X>
+		<Y>750</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -391,7 +391,7 @@
 	<Text>
 		<Id>1726584205939</Id>
 		<Name><![CDATA[t_inputFileFunctions]]></Name>
-		<X>-400</X>
+		<X>-420</X>
 		<Y>60</Y>
 		<Label>
 			<X>0</X>
@@ -416,7 +416,7 @@
 	<Text>
 		<Id>1726584205941</Id>
 		<Name><![CDATA[txt_dataCollectionFill]]></Name>
-		<X>-400</X>
+		<X>-420</X>
 		<Y>160</Y>
 		<Label>
 			<X>0</X>
@@ -493,7 +493,7 @@
 		<Id>1726584205947</Id>
 		<Name><![CDATA[rect_createEnergyGC]]></Name>
 		<X>400</X>
-		<Y>740</Y>
+		<Y>700</Y>
 		<Label>
 			<X>10</X>
 			<Y>10</Y>
@@ -510,7 +510,7 @@
 		<LineMaterial>null</LineMaterial>
 		<LineStyle>SOLID</LineStyle>
 		<Width>400</Width>
-		<Height>230</Height>
+		<Height>270</Height>
 		<Rotation>0.0</Rotation>
 		<FillColor>-1</FillColor>
 		<FillMaterial>null</FillMaterial>
@@ -519,7 +519,7 @@
 		<Id>1726584205949</Id>
 		<Name><![CDATA[txt_createEnergyGC]]></Name>
 		<X>410</X>
-		<Y>750</Y>
+		<Y>710</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -544,8 +544,8 @@
 	<Group>
 		<Id>1726584205951</Id>
 		<Name><![CDATA[gr_consumerGC_residential]]></Name>
-		<X>570</X>
-		<Y>610</Y>
+		<X>1000</X>
+		<Y>70</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -578,8 +578,8 @@
 				<LineColor>-16777216</LineColor>
 				<LineMaterial>null</LineMaterial>
 				<LineStyle>SOLID</LineStyle>
-				<Width>400</Width>
-				<Height>140</Height>
+				<Width>420</Width>
+				<Height>520</Height>
 				<Rotation>0.0</Rotation>
 				<FillColor>-1</FillColor>
 				<FillMaterial>null</FillMaterial>
@@ -649,7 +649,7 @@
 				<LineMaterial>null</LineMaterial>
 				<LineStyle>SOLID</LineStyle>
 				<Width>400</Width>
-				<Height>520</Height>
+				<Height>570</Height>
 				<Rotation>0.0</Rotation>
 				<FillColor>-1</FillColor>
 				<FillMaterial>null</FillMaterial>
@@ -684,8 +684,8 @@
 	<Group>
 		<Id>1726584205963</Id>
 		<Name><![CDATA[gr_addEAFunctions]]></Name>
-		<X>1040</X>
-		<Y>200</Y>
+		<X>1460</X>
+		<Y>190</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -719,7 +719,7 @@
 				<LineMaterial>null</LineMaterial>
 				<LineStyle>SOLID</LineStyle>
 				<Width>450</Width>
-				<Height>780</Height>
+				<Height>690</Height>
 				<Rotation>0.0</Rotation>
 				<FillColor>-1</FillColor>
 				<FillMaterial>null</FillMaterial>
@@ -754,8 +754,8 @@
 	<Group>
 		<Id>1726584205969</Id>
 		<Name><![CDATA[gr_createGISObjects]]></Name>
-		<X>1700</X>
-		<Y>610</Y>
+		<X>1940</X>
+		<Y>640</Y>
 		<Label>
 			<X>9.938</X>
 			<Y>0</Y>
@@ -788,7 +788,7 @@
 				<LineColor>-16777216</LineColor>
 				<LineMaterial>null</LineMaterial>
 				<LineStyle>SOLID</LineStyle>
-				<Width>380</Width>
+				<Width>420</Width>
 				<Height>230</Height>
 				<Rotation>0.0</Rotation>
 				<FillColor>-1</FillColor>
@@ -824,7 +824,7 @@
 	<Text>
 		<Id>1727792637339</Id>
 		<Name><![CDATA[txt_overwriteDatabaseValues]]></Name>
-		<X>-400</X>
+		<X>-420</X>
 		<Y>110</Y>
 		<Label>
 			<X>0</X>
@@ -849,8 +849,8 @@
 	<Rectangle>
 		<Id>1730217549237</Id>
 		<Name><![CDATA[rect_supportFunctions]]></Name>
-		<X>1520</X>
-		<Y>830</Y>
+		<X>1760</X>
+		<Y>860</Y>
 		<Label>
 			<X>10</X>
 			<Y>10</Y>
@@ -866,8 +866,8 @@
 		<LineColor>-16777216</LineColor>
 		<LineMaterial>null</LineMaterial>
 		<LineStyle>SOLID</LineStyle>
-		<Width>380</Width>
-		<Height>140</Height>
+		<Width>420</Width>
+		<Height>100</Height>
 		<Rotation>0.0</Rotation>
 		<FillColor>-1</FillColor>
 		<FillMaterial>null</FillMaterial>
@@ -875,8 +875,8 @@
 	<Text>
 		<Id>1730217578770</Id>
 		<Name><![CDATA[txt_supportFunctions]]></Name>
-		<X>1540</X>
-		<Y>840</Y>
+		<X>1780</X>
+		<Y>870</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -900,8 +900,8 @@
 	<Rectangle>
 		<Id>1742919550888</Id>
 		<Name><![CDATA[rect_connectToFunctions]]></Name>
-		<X>1520</X>
-		<Y>730</Y>
+		<X>1760</X>
+		<Y>760</Y>
 		<Label>
 			<X>10</X>
 			<Y>10</Y>
@@ -917,8 +917,8 @@
 		<LineColor>-16777216</LineColor>
 		<LineMaterial>null</LineMaterial>
 		<LineStyle>SOLID</LineStyle>
-		<Width>380</Width>
-		<Height>80</Height>
+		<Width>420</Width>
+		<Height>90</Height>
 		<Rotation>0.0</Rotation>
 		<FillColor>-1</FillColor>
 		<FillMaterial>null</FillMaterial>
@@ -926,8 +926,8 @@
 	<Text>
 		<Id>1742919565761</Id>
 		<Name><![CDATA[txt_connectToFunctions]]></Name>
-		<X>1540</X>
-		<Y>750</Y>
+		<X>1780</X>
+		<Y>770</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -951,8 +951,8 @@
 	<Text>
 		<Id>1744808981703</Id>
 		<Name><![CDATA[txt_DebuggingDataCollections]]></Name>
-		<X>-400</X>
-		<Y>870</Y>
+		<X>-420</X>
+		<Y>880</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -1079,7 +1079,7 @@
 		<Id>1753349205420</Id>
 		<Name><![CDATA[rect_defaultStartup1]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>2360</X>
+		<X>2800</X>
 		<Y>0</Y>
 		<Label>
 			<X>10</X>
@@ -1106,7 +1106,7 @@
 		<Id>1753349205422</Id>
 		<Name><![CDATA[txt_loaderStartupDeserialisation]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>2380</X>
+		<X>2820</X>
 		<Y>9</Y>
 		<Label>
 			<X>0</X>
@@ -1133,7 +1133,7 @@
 		<Id>1753449467882</Id>
 		<Name><![CDATA[deserialize2]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>2413.333</X>
+		<X>2853.333</X>
 		<Y>172</Y>
 		<Label>
 			<X>0</X>
@@ -1263,7 +1263,7 @@ try {
 		<Id>1753449467884</Id>
 		<Name><![CDATA[serialize1]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>2416.333</X>
+		<X>2856.333</X>
 		<Y>99</Y>
 		<Label>
 			<X>0</X>
diff --git a/_alp/Agents/Zero_Loader/Variables.xml b/_alp/Agents/Zero_Loader/Variables.xml
index 0d27d21..35db0e7 100644
--- a/_alp/Agents/Zero_Loader/Variables.xml
+++ b/_alp/Agents/Zero_Loader/Variables.xml
@@ -3,8 +3,8 @@
 	<Variable Class="PlainVariable">
 		<Id>1726584205883</Id>
 		<Name><![CDATA[v_timeOfModelStart_ms]]></Name>
-		<X>1560</X>
-		<Y>140</Y>
+		<X>1800</X>
+		<Y>170</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -22,8 +22,8 @@
 	<Variable Class="PlainVariable">
 		<Id>1726584205885</Id>
 		<Name><![CDATA[v_modelStartUpDuration_s]]></Name>
-		<X>1560</X>
-		<Y>160</Y>
+		<X>1800</X>
+		<Y>190</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -44,8 +44,8 @@
 	<Variable Class="PlainVariable">
 		<Id>1726584205887</Id>
 		<Name><![CDATA[v_simStartYear]]></Name>
-		<X>1560</X>
-		<Y>70</Y>
+		<X>1800</X>
+		<Y>100</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -66,8 +66,8 @@
 	<Variable Class="PlainVariable">
 		<Id>1733235094633</Id>
 		<Name><![CDATA[v_numberOfSurveyCompanies]]></Name>
-		<X>1560</X>
-		<Y>240</Y>
+		<X>1800</X>
+		<Y>270</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -86,8 +86,8 @@
 		<Id>1733389557748</Id>
 		<Name><![CDATA[v_simStartHour_h]]></Name>
 		<Description><![CDATA[The hour 0 is defined as january 1st, 00:00h in the year energyModel.p_year]]></Description>
-		<X>1560</X>
-		<Y>90</Y>
+		<X>1800</X>
+		<Y>120</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -108,8 +108,8 @@
 	<Variable Class="PlainVariable">
 		<Id>1733390702422</Id>
 		<Name><![CDATA[v_simDuration_h]]></Name>
-		<X>1560</X>
-		<Y>110</Y>
+		<X>1800</X>
+		<Y>140</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -130,7 +130,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1737972861302</Id>
 		<Name><![CDATA[map_buildingData_Vallum]]></Name>
-		<X>-370</X>
+		<X>-390</X>
 		<Y>395</Y>
 		<Label>
 			<X>10</X>
@@ -150,7 +150,7 @@
 		<Id>1753450969530</Id>
 		<Name><![CDATA[v_objectMapper]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>2450</X>
+		<X>2890</X>
 		<Y>49</Y>
 		<Label>
 			<X>10</X>
@@ -169,8 +169,8 @@
 	<Variable Class="PlainVariable">
 		<Id>1755876520422</Id>
 		<Name><![CDATA[v_probabilityForAdditionalCar_privateParking]]></Name>
-		<X>1560</X>
-		<Y>190</Y>
+		<X>1800</X>
+		<Y>220</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -188,8 +188,8 @@
 	<Variable Class="PlainVariable">
 		<Id>1755876547633</Id>
 		<Name><![CDATA[v_probabilityForAdditionalCar_publicParking]]></Name>
-		<X>1560</X>
-		<Y>210</Y>
+		<X>1800</X>
+		<Y>240</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -232,7 +232,7 @@
 	<Variable Class="Parameter">
 		<Id>1726584206070</Id>
 		<Name><![CDATA[defaultProfiles_data]]></Name>
-		<X>-370</X>
+		<X>-390</X>
 		<Y>280</Y>
 		<Label>
 			<X>10</X>
@@ -258,7 +258,7 @@
 		<Id>1726584206073</Id>
 		<Name><![CDATA[project_data]]></Name>
 		<Description><![CDATA[Should be filled with the Project_data record created in the startup of the project model]]></Description>
-		<X>-370</X>
+		<X>-390</X>
 		<Y>230</Y>
 		<Label>
 			<X>10</X>
@@ -284,7 +284,7 @@
 		<Id>1726584206076</Id>
 		<Name><![CDATA[settings]]></Name>
 		<Description><![CDATA[Should be filled with the settings record created in the startup of the project model]]></Description>
-		<X>-370</X>
+		<X>-390</X>
 		<Y>250</Y>
 		<Label>
 			<X>10</X>
@@ -309,7 +309,7 @@
 	<Variable Class="Parameter">
 		<Id>1726584206079</Id>
 		<Name><![CDATA[user]]></Name>
-		<X>-370</X>
+		<X>-390</X>
 		<Y>210</Y>
 		<Label>
 			<X>10</X>
@@ -335,7 +335,7 @@
 		<Id>1762184918471</Id>
 		<Name><![CDATA[p_userIdToken]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>2630</X>
+		<X>3070</X>
 		<Y>50</Y>
 		<Label>
 			<X>10</X>
@@ -360,8 +360,8 @@
 	<Variable Class="Parameter">
 		<Id>1761907535651</Id>
 		<Name><![CDATA[p_remainingTotals]]></Name>
-		<X>1560</X>
-		<Y>290</Y>
+		<X>1800</X>
+		<Y>320</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -388,8 +388,8 @@
 	<Variable Class="CollectionVariable">
 		<Id>1726584205737</Id>
 		<Name><![CDATA[c_gridNodeIDsInScope]]></Name>
-		<X>1560</X>
-		<Y>320</Y>
+		<X>1800</X>
+		<Y>350</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -406,7 +406,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1726584205739</Id>
 		<Name><![CDATA[c_companyBuilding_data]]></Name>
-		<X>-370</X>
+		<X>-390</X>
 		<Y>415</Y>
 		<Label>
 			<X>10</X>
@@ -424,7 +424,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1726584205741</Id>
 		<Name><![CDATA[c_gridNode_data]]></Name>
-		<X>-370</X>
+		<X>-390</X>
 		<Y>360</Y>
 		<Label>
 			<X>10</X>
@@ -442,8 +442,8 @@
 	<Variable Class="CollectionVariable">
 		<Id>1726584205743</Id>
 		<Name><![CDATA[c_surveyCompanyBuilding_data]]></Name>
-		<X>-380</X>
-		<Y>910</Y>
+		<X>-400</X>
+		<Y>920</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -460,7 +460,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1726584205745</Id>
 		<Name><![CDATA[c_houseBuilding_data]]></Name>
-		<X>-370</X>
+		<X>-390</X>
 		<Y>435</Y>
 		<Label>
 			<X>10</X>
@@ -478,7 +478,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1726584205747</Id>
 		<Name><![CDATA[c_solarfarm_data]]></Name>
-		<X>-370</X>
+		<X>-390</X>
 		<Y>482</Y>
 		<Label>
 			<X>10</X>
@@ -496,7 +496,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1726584205749</Id>
 		<Name><![CDATA[c_windfarm_data]]></Name>
-		<X>-370</X>
+		<X>-390</X>
 		<Y>502</Y>
 		<Label>
 			<X>10</X>
@@ -514,7 +514,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1726584205751</Id>
 		<Name><![CDATA[c_electrolyser_data]]></Name>
-		<X>-370</X>
+		<X>-390</X>
 		<Y>521</Y>
 		<Label>
 			<X>10</X>
@@ -532,7 +532,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1726584205753</Id>
 		<Name><![CDATA[c_battery_data]]></Name>
-		<X>-370</X>
+		<X>-390</X>
 		<Y>540</Y>
 		<Label>
 			<X>10</X>
@@ -550,7 +550,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1726584205755</Id>
 		<Name><![CDATA[c_cable_data]]></Name>
-		<X>-370</X>
+		<X>-390</X>
 		<Y>650</Y>
 		<Label>
 			<X>10</X>
@@ -568,7 +568,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1726584205757</Id>
 		<Name><![CDATA[c_neighbourhood_data]]></Name>
-		<X>-370</X>
+		<X>-390</X>
 		<Y>590</Y>
 		<Label>
 			<X>10</X>
@@ -586,7 +586,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1726584205759</Id>
 		<Name><![CDATA[c_remainingBuilding_data]]></Name>
-		<X>-370</X>
+		<X>-390</X>
 		<Y>455</Y>
 		<Label>
 			<X>10</X>
@@ -604,7 +604,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1726584205763</Id>
 		<Name><![CDATA[c_chargingstation_data]]></Name>
-		<X>-370</X>
+		<X>-390</X>
 		<Y>560</Y>
 		<Label>
 			<X>10</X>
@@ -622,7 +622,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1726584205765</Id>
 		<Name><![CDATA[c_parcel_data]]></Name>
-		<X>-370</X>
+		<X>-390</X>
 		<Y>630</Y>
 		<Label>
 			<X>10</X>
@@ -640,8 +640,8 @@
 	<Variable Class="CollectionVariable">
 		<Id>1737744140895</Id>
 		<Name><![CDATA[c_vallumBuilding_data]]></Name>
-		<X>-380</X>
-		<Y>930</Y>
+		<X>-400</X>
+		<Y>940</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -658,7 +658,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1748944117397</Id>
 		<Name><![CDATA[c_customProfiles_data]]></Name>
-		<X>-370</X>
+		<X>-390</X>
 		<Y>300</Y>
 		<Label>
 			<X>10</X>
@@ -676,8 +676,8 @@
 	<Variable Class="CollectionVariable">
 		<Id>1749631164240</Id>
 		<Name><![CDATA[c_gridNodeIDsWithProfiles]]></Name>
-		<X>1560</X>
-		<Y>350</Y>
+		<X>1800</X>
+		<Y>380</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -694,7 +694,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1749649688266</Id>
 		<Name><![CDATA[c_chargerProfiles_data]]></Name>
-		<X>-370</X>
+		<X>-390</X>
 		<Y>320</Y>
 		<Label>
 			<X>10</X>
@@ -712,7 +712,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1749738339329</Id>
 		<Name><![CDATA[c_parkingSpace_data]]></Name>
-		<X>-370</X>
+		<X>-390</X>
 		<Y>610</Y>
 		<Label>
 			<X>10</X>
@@ -731,7 +731,7 @@
 		<Id>1759135072429</Id>
 		<Name><![CDATA[c_GISregions]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>2450</X>
+		<X>2890</X>
 		<Y>149</Y>
 		<Label>
 			<X>10</X>
@@ -749,8 +749,8 @@
 	<Variable Class="CollectionVariable">
 		<Id>1763648784984</Id>
 		<Name><![CDATA[c_activeNBH]]></Name>
-		<X>1540</X>
-		<Y>420</Y>
+		<X>1780</X>
+		<Y>450</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -764,4 +764,40 @@
 			<ValueElementClass>GISRegion</ValueElementClass>
 		</Properties>
 	</Variable>
+	<Variable Class="CollectionVariable">
+		<Id>1768319045952</Id>
+		<Name><![CDATA[c_lookupTablePBL_spaceHeatingAndResidents]]></Name>
+		<X>-390</X>
+		<Y>680</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" AccessType="public" StaticVariable="false">
+			<CollectionClass>ArrayList</CollectionClass>
+			<ElementClass>PBL_SpaceHeatingAndResidents_data</ElementClass>
+			<ValueElementClass>String</ValueElementClass>
+		</Properties>
+	</Variable>
+	<Variable Class="CollectionVariable">
+		<Id>1768319047453</Id>
+		<Name><![CDATA[c_lookupTablePBL_DHWAndCooking]]></Name>
+		<X>-390</X>
+		<Y>700</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" AccessType="public" StaticVariable="false">
+			<CollectionClass>ArrayList</CollectionClass>
+			<ElementClass>PBL_DHWAndCooking_data</ElementClass>
+			<ValueElementClass>String</ValueElementClass>
+		</Properties>
+	</Variable>
 </Variables>
diff --git a/_alp/Agents/tabHeating/Code/Functions.java b/_alp/Agents/tabHeating/Code/Functions.java
index c5bbeee..24256f4 100644
--- a/_alp/Agents/tabHeating/Code/Functions.java
+++ b/_alp/Agents/tabHeating/Code/Functions.java
@@ -442,12 +442,12 @@ else if (house.p_BuildingThermalAsset != null){
 
 double f_householdInsulation(List<GCHouse> housesGCList,double houses_pct)
 {/*ALCODESTART::1752227724432*/
-int nbHouses = count(housesGCList, x -> x.p_energyLabel != OL_GridConnectionIsolationLabel.A);
-int nbHousesWithImprovedInsulation = count(housesGCList, x -> x.p_BuildingThermalAsset.getLossScalingFactor_fr() < 1 && x.p_energyLabel != OL_GridConnectionIsolationLabel.A);
+int nbHouses = count(housesGCList, x -> x.p_insulationLabel != OL_GridConnectionInsulationLabel.A);
+int nbHousesWithImprovedInsulation = count(housesGCList, x -> x.p_BuildingThermalAsset.getLossScalingFactor_fr() < 1 && x.p_insulationLabel != OL_GridConnectionInsulationLabel.A);
 int targetNbHousesWithImprovedInsulation = roundToInt(houses_pct / 100.0 * nbHouses);
 
 while (nbHousesWithImprovedInsulation < targetNbHousesWithImprovedInsulation) {
-	GCHouse house = findFirst(housesGCList, x -> x.p_BuildingThermalAsset.getLossScalingFactor_fr() >= 1 && x.p_energyLabel != OL_GridConnectionIsolationLabel.A);
+	GCHouse house = findFirst(housesGCList, x -> x.p_BuildingThermalAsset.getLossScalingFactor_fr() >= 1 && x.p_insulationLabel != OL_GridConnectionInsulationLabel.A);
 	if (house != null) {
 		house.p_BuildingThermalAsset.setLossScalingFactor_fr( 0.7 );
 		nbHousesWithImprovedInsulation++;
@@ -457,7 +457,7 @@ else if (house.p_BuildingThermalAsset != null){
 	}
 }
 while (nbHousesWithImprovedInsulation > targetNbHousesWithImprovedInsulation) {
-	GCHouse house = findFirst(housesGCList, x -> x.p_BuildingThermalAsset.getLossScalingFactor_fr() < 1 && x.p_energyLabel != OL_GridConnectionIsolationLabel.A);
+	GCHouse house = findFirst(housesGCList, x -> x.p_BuildingThermalAsset.getLossScalingFactor_fr() < 1 && x.p_insulationLabel != OL_GridConnectionInsulationLabel.A);
 	if (house != null) {
 		house.p_BuildingThermalAsset.setLossScalingFactor_fr( 1 );
 		nbHousesWithImprovedInsulation--;
@@ -911,8 +911,8 @@ else if(gr_heatingSliders_residential.isVisible()){
 
 
 //Houses with better isolation
-int nbHousesThatCanGetImprovedIsolation = count(houseGridConnections, x -> x.p_energyLabel != OL_GridConnectionIsolationLabel.A);
-int nbHousesWithImprovedInsulation = count(houseGridConnections, x -> x.p_BuildingThermalAsset.getLossScalingFactor_fr() < 1 && x.p_energyLabel != OL_GridConnectionIsolationLabel.A);
+int nbHousesThatCanGetImprovedIsolation = count(houseGridConnections, x -> x.p_insulationLabel != OL_GridConnectionInsulationLabel.A);
+int nbHousesWithImprovedInsulation = count(houseGridConnections, x -> x.p_BuildingThermalAsset.getLossScalingFactor_fr() < 1 && x.p_insulationLabel != OL_GridConnectionInsulationLabel.A);
 double pctOfHousesWithImprovedInsulation = 100.0 * ((double)nbHousesWithImprovedInsulation)/nbHousesThatCanGetImprovedIsolation;
 sl_householdHeatDemandReductionResidentialArea_pct.setValue(roundToInt(pctOfHousesWithImprovedInsulation), false);
 
diff --git a/_alp/Agents/tabHeating/Code/Functions.xml b/_alp/Agents/tabHeating/Code/Functions.xml
index 625376d..2ca18ee 100644
--- a/_alp/Agents/tabHeating/Code/Functions.xml
+++ b/_alp/Agents/tabHeating/Code/Functions.xml
@@ -138,7 +138,7 @@
 		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
-	<Function AccessType="default" StaticFunction="false">
+	<Function AccessType="public" StaticFunction="false">
 		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
 		<ReturnType>double</ReturnType>
 		<Id>1749116448649</Id>
@@ -477,7 +477,7 @@
 		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
-	<Function AccessType="protected" StaticFunction="false">
+	<Function AccessType="public" StaticFunction="false">
 		<ReturnModificator>VOID</ReturnModificator>
 		<ReturnType>double</ReturnType>
 		<Id>1760368810352</Id>
diff --git a/_alp/Classes/Class.Building_data.java b/_alp/Classes/Class.Building_data.java
index 9d97ce8..75b0df5 100644
--- a/_alp/Classes/Class.Building_data.java
+++ b/_alp/Classes/Class.Building_data.java
@@ -27,10 +27,18 @@ public class Building_data {
 	Double gas_consumption_m3pa;
 	Double pv_installed_kwp;
 	Double pv_potential_kwp;
-	OL_GridConnectionIsolationLabel energy_label;
+	OL_GridConnectionEnergyLabel energy_label;
 	Boolean has_private_parking;
 	String gridnode_id;
 	Double latitude;
 	Double longitude;
 	String polygon;
+	
+	//PBL data
+	boolean pbl_data_available;
+	OL_PBL_BuildingType building_type;		
+	OL_PBL_OwnershipType ownership_type;
+	OL_GridConnectionInsulationLabel insulation_label;
+	Double local_factor;
+	Double regional_climate_correction_factor;
 }
\ No newline at end of file
diff --git a/_alp/Classes/Class.J_PBLUtil.java b/_alp/Classes/Class.J_PBLUtil.java
new file mode 100644
index 0000000..3e8f97f
--- /dev/null
+++ b/_alp/Classes/Class.J_PBLUtil.java
@@ -0,0 +1,95 @@
+/**
+ * J_PBLUtil
+ */	
+public class J_PBLUtil {
+	
+	//Convert input int or string into OL_PBL_BuildingType option
+	public static OL_PBL_BuildingType getPBLBuildingTypeOption(int value) {
+		return getPBLBuildingTypeOption(String.valueOf(value));
+	}
+	public static OL_PBL_BuildingType getPBLBuildingTypeOption(String value) {
+		return OL_PBL_BuildingType.valueOf(J_PBLUtil.getOLTypeString(value));
+	}
+	
+	//Convert input buildYear into ConstructionPeriod option (spaceHeating)
+	public static int getConstructionPeriodOption_spaceHeatingAndResidents(int buildYear) {
+		if (buildYear <= 1929){ return 0;}
+		if (buildYear <= 1945){ return 1;}
+		if (buildYear <= 1964){ return 2;}
+		if (buildYear <= 1974){ return 3;}
+		if (buildYear <= 1991){ return 4;}
+		if (buildYear <= 1995){ return 5;}
+		if (buildYear <= 1999){ return 6;}
+		if (buildYear <= 2005){ return 7;}
+		if (buildYear <= 2010){ return 8;}
+		if (buildYear <= 2014){ return 9;}
+		return 10; //Anything above 2014 = 10
+	}
+	//Convert input buildYear into ConstructionPeriod option (dhw and cooking)
+	public static int getConstructionPeriodOption_DHWAndCooking(int buildYear) {
+		if (buildYear <= 1930){ return 0;}
+		if (buildYear <= 1959){ return 1;}
+		if (buildYear <= 1980){ return 2;}
+		if (buildYear <= 1995){ return 3;}
+		return 4; //Anything above 1995 = 4
+	}
+	
+	//Convert input int or string into OL_PBL_OwnershipType option
+	public static OL_PBL_OwnershipType getPBLOwnershipTypeOption(int value) {
+		return getPBLOwnershipTypeOption(String.valueOf(value));
+	}
+	public static OL_PBL_OwnershipType getPBLOwnershipTypeOption(String value) {
+		return OL_PBL_OwnershipType.valueOf(J_PBLUtil.getOLTypeString(value));
+	}
+	
+	//Convert input string of energylabel into OL_GridConnectionEnergyLabel option	
+	public static OL_GridConnectionEnergyLabel getEnergyLabelOption(String energyLabel) {
+		if(energyLabel == null || energyLabel.equals("x") || energyLabel.equals("")) {
+			return OL_GridConnectionEnergyLabel.UNKNOWN;
+		}
+		else if(energyLabel.startsWith("A+")) { //For now all A+, A++, etc. are converted into A
+			return OL_GridConnectionEnergyLabel.A;
+		}
+		else {
+			return OL_GridConnectionEnergyLabel.valueOf(energyLabel);
+		}
+	}
+	
+	//Convert input string of insulationlabel into OL_GridConnectionInsulationLabel option	
+	public static OL_GridConnectionInsulationLabel getInsulationLabelOption(String insulationLabel) {
+		return convertEnergyToInsulationLabel(getEnergyLabelOption(insulationLabel));
+	}
+	
+	//Get the most suited regression population
+	public static int getPBLRegressionPopulation(OL_GridConnectionInsulationLabel insulationLabel, OL_PBL_BuildingType buildingType) {
+		if (insulationLabel == null || insulationLabel == OL_GridConnectionInsulationLabel.NONE || insulationLabel == OL_GridConnectionInsulationLabel.UNKNOWN){ 
+		    return 3;
+		} 
+		else if(buildingType == OL_PBL_BuildingType.TYPE_1){//If detached house
+			return 2;
+		}
+		else {
+			return 1;
+		}
+	}
+	
+	//Get the TNO surface code based on floor surface
+	public static int getTNOFloorSurfaceCode(double floorSurfaceArea_m2) {
+		if (floorSurfaceArea_m2 < 75){ return 1;}
+		if (floorSurfaceArea_m2 < 100){ return 2;}
+		if (floorSurfaceArea_m2 < 125){ return 3;}
+		if (floorSurfaceArea_m2 < 150){ return 4;}
+		return 5; // floorSurfaceArea_m2 >= 150 -> 5
+	}
+	
+	private static String getOLTypeString(String number) {
+		return "TYPE_" + number;
+	}
+	
+	public static OL_GridConnectionEnergyLabel convertInsulationToEnergyLabel(OL_GridConnectionInsulationLabel insulationLabel) {
+		return OL_GridConnectionEnergyLabel.valueOf(insulationLabel.toString());
+	}
+	public static OL_GridConnectionInsulationLabel convertEnergyToInsulationLabel(OL_GridConnectionEnergyLabel energyLabel) {
+		return OL_GridConnectionInsulationLabel.valueOf(energyLabel.toString());
+	}
+}
\ No newline at end of file
diff --git a/_alp/Classes/Class.PBL_DHWAndCooking_data.java b/_alp/Classes/Class.PBL_DHWAndCooking_data.java
new file mode 100644
index 0000000..fa693a9
--- /dev/null
+++ b/_alp/Classes/Class.PBL_DHWAndCooking_data.java
@@ -0,0 +1,13 @@
+/**
+ * PBL_DHWAndCooking_data
+ */	
+@lombok.Builder
+@lombok.Value
+@lombok.experimental.Accessors(fluent = true)
+public class PBL_DHWAndCooking_data {
+	Integer construction_period;	
+	Integer surface_code;
+	Integer household_size;
+	Double cooking_gas_demand_m3pa;
+	Double dhw_gas_demand_m3pa;
+}
diff --git a/_alp/Classes/Class.PBL_SpaceHeatingAndResidents_data.java b/_alp/Classes/Class.PBL_SpaceHeatingAndResidents_data.java
new file mode 100644
index 0000000..ab5b4f4
--- /dev/null
+++ b/_alp/Classes/Class.PBL_SpaceHeatingAndResidents_data.java
@@ -0,0 +1,17 @@
+/**
+ * PBL_SpaceHeatingAndResidents_data
+ */	
+@lombok.Builder
+@lombok.Value
+@lombok.experimental.Accessors(fluent = true)
+public class PBL_SpaceHeatingAndResidents_data {	
+	OL_PBL_BuildingType building_type;	
+	Integer construction_period;	
+	OL_PBL_OwnershipType ownership_type;	
+	OL_GridConnectionInsulationLabel insulation_label;	
+	Integer regression_population; // 1, 2 or 3	
+	Double slope_space_heating_gas_m3pm2a;	
+	Double constant_space_heating_gas_m3pa;	
+	Double slope_residents;	
+	Double constant_residents;
+}
\ No newline at end of file