diff --git a/Zero_Interface-Loader.alpx b/Zero_Interface-Loader.alpx
index d78122b..4a8e9ff 100644
--- a/Zero_Interface-Loader.alpx
+++ b/Zero_Interface-Loader.alpx
@@ -392,6 +392,16 @@
 				<Id>1762351349700</Id>
 				<Name><![CDATA[J_RemainingTotalsManager]]></Name>
 			</JavaClass>
+			<JavaClass>
+				<Id>1768318918209</Id>
+				<Name><![CDATA[PBL_SpaceHeating_data]]></Name>
+				<Folder>1754045711603</Folder>
+			</JavaClass>
+			<JavaClass>
+				<Id>1768318961854</Id>
+				<Name><![CDATA[PBL_DHWAndCooking_data]]></Name>
+				<Folder>1754045711603</Folder>
+			</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..738aaa7 100644
--- a/_alp/Agents/AVGC_data/Code/Functions.java
+++ b/_alp/Agents/AVGC_data/Code/Functions.java
@@ -81,5 +81,6 @@
 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;
 /*ALCODEEND*/}
 
diff --git a/_alp/Agents/AVGC_data/Levels/Level.level.xml b/_alp/Agents/AVGC_data/Levels/Level.level.xml
index ce9c9b2..23cc7da 100644
--- a/_alp/Agents/AVGC_data/Levels/Level.level.xml
+++ b/_alp/Agents/AVGC_data/Levels/Level.level.xml
@@ -83,7 +83,7 @@
 		<Id>1726584205542</Id>
 		<Name><![CDATA[txt_avgCompanies]]></Name>
 		<X>40</X>
-		<Y>280</Y>
+		<Y>440</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -286,7 +286,7 @@
 		<Id>1726584205558</Id>
 		<Name><![CDATA[txt_Heatassets]]></Name>
 		<X>40</X>
-		<Y>470</Y>
+		<Y>630</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -311,7 +311,7 @@
 		<Id>1726584205560</Id>
 		<Name><![CDATA[txt_avgPV]]></Name>
 		<X>40</X>
-		<Y>990</Y>
+		<Y>1150</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -336,7 +336,7 @@
 		<Id>1726584205562</Id>
 		<Name><![CDATA[txt_avgBat]]></Name>
 		<X>40</X>
-		<Y>1095</Y>
+		<Y>1255</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -386,7 +386,7 @@
 		<Id>1726584205566</Id>
 		<Name><![CDATA[txt_heatpumps]]></Name>
 		<X>60</X>
-		<Y>490</Y>
+		<Y>650</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -411,7 +411,7 @@
 		<Id>1726584205568</Id>
 		<Name><![CDATA[txt_gasburners]]></Name>
 		<X>60</X>
-		<Y>620</Y>
+		<Y>780</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -436,7 +436,7 @@
 		<Id>1726584205570</Id>
 		<Name><![CDATA[txt_hydrogenburners]]></Name>
 		<X>60</X>
-		<Y>710</Y>
+		<Y>870</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -539,7 +539,7 @@
 		<Id>1726743791200</Id>
 		<Name><![CDATA[text]]></Name>
 		<X>40</X>
-		<Y>1160</Y>
+		<Y>1320</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -589,7 +589,7 @@
 		<Id>1745316061345</Id>
 		<Name><![CDATA[txt_CHP]]></Name>
 		<X>60</X>
-		<Y>800</Y>
+		<Y>960</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -614,7 +614,7 @@
 		<Id>1747314897311</Id>
 		<Name><![CDATA[txt_districtHeatingDeliverySet]]></Name>
 		<X>60</X>
-		<Y>890</Y>
+		<Y>1050</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -639,7 +639,7 @@
 		<Id>1751906160194</Id>
 		<Name><![CDATA[txt_avgHeatBuffer]]></Name>
 		<X>560</X>
-		<Y>980</Y>
+		<Y>1020</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -664,7 +664,7 @@
 		<Id>1751906173848</Id>
 		<Name><![CDATA[txt_avgPT]]></Name>
 		<X>560</X>
-		<Y>900</Y>
+		<Y>940</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -710,4 +710,29 @@
 		</Font>
 		<Alignment>LEFT</Alignment>
 	</Text>
+	<Text>
+		<Id>1768315329120</Id>
+		<Name><![CDATA[txt_thermalModelParameters]]></Name>
+		<X>40</X>
+		<Y>280</Y>
+		<Label>
+			<X>0</X>
+			<Y>-10</Y>
+		</Label>
+		<PublicFlag>true</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>false</ShowLabel>
+		<DrawMode>SHAPE_DRAW_2D</DrawMode>
+		<EmbeddedIcon>false</EmbeddedIcon>
+		<Z>0</Z>
+		<Rotation>0.0</Rotation>
+		<Color>-16777216</Color>
+		<Text><![CDATA[Thermal model parameters]]></Text>
+		<Font>
+			<Name><![CDATA[SansSerif]]></Name>
+			<Size>12</Size>
+			<Style>0</Style>
+		</Font>
+		<Alignment>LEFT</Alignment>
+	</Text>
 </Presentation>
diff --git a/_alp/Agents/AVGC_data/Variables.xml b/_alp/Agents/AVGC_data/Variables.xml
index 0c13915..2d51547 100644
--- a/_alp/Agents/AVGC_data/Variables.xml
+++ b/_alp/Agents/AVGC_data/Variables.xml
@@ -89,7 +89,7 @@
 
 --> 17.25 is way to small -> 3x80 is taken : 55 kW]]></Description>
 		<X>50</X>
-		<Y>330</Y>
+		<Y>490</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>470</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1064,7 +1064,7 @@ For now: Picking 3.33 km per l]]></Description>
 
 Gemiddelde COP is 4.]]></Description>
 		<X>70</X>
-		<Y>520</Y>
+		<Y>680</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>510</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>530</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>550</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1184,7 +1184,7 @@ https://nos.nl/artikel/2483604-elektrische-vrachtwagens-blijven-achter-door-comp
 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>
+		<Y>1180</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1214,7 +1214,7 @@ https://www.zonnepanelennoord.nl/vermogen-zonnepanelen/ --> 215 W/m2]]></Descrip
 		<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>
+		<Y>1280</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1337,7 +1337,7 @@ https://www.zonnepanelennoord.nl/vermogen-zonnepanelen/ --> 215 W/m2]]></Descrip
 		<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>
+		<Y>1200</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1368,7 +1368,7 @@ https://www.zonnepanelennoord.nl/vermogen-zonnepanelen/ --> 215 W/m2]]></Descrip
 
 '0.5' comes from old code, no source found for it yet.]]></Description>
 		<X>70</X>
-		<Y>540</Y>
+		<Y>700</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1400,7 +1400,7 @@ https://warmtepomp-panel.nl/afgiftesysteem.html?utm_source=chatgpt.com -> 35 gra
 
 -> Voor nu gemiddeld 40 genomen.]]></Description>
 		<X>70</X>
-		<Y>580</Y>
+		<Y>740</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1430,7 +1430,7 @@ https://warmtepomp-panel.nl/afgiftesysteem.html?utm_source=chatgpt.com -> 35 gra
 		<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>
+		<Y>810</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1461,7 +1461,7 @@ https://www.mdpi.com/1999-4893/18/7/416 -> 100-104 % efficiency, based on gas en
 
 --> Source?]]></Description>
 		<X>70</X>
-		<Y>670</Y>
+		<Y>830</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1494,7 +1494,7 @@ https://www.mdpi.com/1999-4893/18/7/416 -> 100-104 % efficiency, based on gas en
 
 - https://www.csrf.ac.uk/blog/hydrogen-for-heating/]]></Description>
 		<X>70</X>
-		<Y>740</Y>
+		<Y>900</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1525,7 +1525,7 @@ https://www.mdpi.com/1999-4893/18/7/416 -> 100-104 % efficiency, based on gas en
 
 --> Source?]]></Description>
 		<X>70</X>
-		<Y>760</Y>
+		<Y>920</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1553,7 +1553,7 @@ https://www.mdpi.com/1999-4893/18/7/416 -> 100-104 % efficiency, based on gas en
 		<Id>1726746753360</Id>
 		<Name><![CDATA[p_avgVehiclesPerChargePoint]]></Name>
 		<X>50</X>
-		<Y>1190</Y>
+		<Y>1350</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1670,7 +1670,7 @@ https://www.mdpi.com/1999-4893/18/7/416 -> 100-104 % efficiency, based on gas en
 		<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>
+		<Y>1220</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>570</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>590</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>610</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1796,7 +1796,7 @@ to 18 m3 p m2 for label G
 		<Name><![CDATA[p_avgSolarFieldPower_kWppha]]></Name>
 		<Description><![CDATA[1000]]></Description>
 		<X>50</X>
-		<Y>1080</Y>
+		<Y>1240</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1826,7 +1826,7 @@ to 18 m3 p m2 for label G
 		<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>
+		<Y>990</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1856,7 +1856,7 @@ Ook te vinden hier: https://www.kasalsenergiebron.nl/content/nieuws/2023/E22001_
 		<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>
+		<Y>1010</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1887,7 +1887,7 @@ Ook te vinden hier: https://www.kasalsenergiebron.nl/content/nieuws/2023/E22001_
 
 --> Source?]]></Description>
 		<X>70</X>
-		<Y>870</Y>
+		<Y>1030</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1919,7 +1919,7 @@ Set as 0.8 to account for the losses of the heatgrid, as they are not yet part o
 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>
+		<Y>1080</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1950,7 +1950,7 @@ https://www.klimaat030.nl/warmteverlies-van-stadsverwarming-gigantisch/]]></Desc
 
 70 -> https://www.nplw.nl/warmtenet/warmtetechnieken/middentemperatuur-warmtenet]]></Description>
 		<X>70</X>
-		<Y>940</Y>
+		<Y>1100</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2037,7 +2037,7 @@ https://www.klimaat030.nl/warmteverlies-van-stadsverwarming-gigantisch/]]></Desc
 		<Name><![CDATA[p_avgEVsPerPublicCharger]]></Name>
 		<Description><![CDATA[TODO: Determine this value]]></Description>
 		<X>570</X>
-		<Y>860</Y>
+		<Y>900</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2065,7 +2065,7 @@ https://www.klimaat030.nl/warmteverlies-van-stadsverwarming-gigantisch/]]></Desc
 		<Id>1751893521012</Id>
 		<Name><![CDATA[p_avgPTPower_kWpm2]]></Name>
 		<X>570</X>
-		<Y>930</Y>
+		<Y>970</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2094,7 +2094,7 @@ https://www.klimaat030.nl/warmteverlies-van-stadsverwarming-gigantisch/]]></Desc
 		<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>
+		<Y>1120</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2123,7 +2123,7 @@ https://www.klimaat030.nl/warmteverlies-van-stadsverwarming-gigantisch/]]></Desc
 		<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>
+		<Y>1100</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2215,7 +2215,7 @@ Voor nu gekozen voor 4185.
 		<Name><![CDATA[p_avgMaxHeatBufferTemperature_degC]]></Name>
 		<Description><![CDATA[???]]></Description>
 		<X>570</X>
-		<Y>1010</Y>
+		<Y>1050</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2243,7 +2243,7 @@ Voor nu gekozen voor 4185.
 		<Id>1751906126857</Id>
 		<Name><![CDATA[p_avgMinHeatBufferTemperature_degC]]></Name>
 		<X>570</X>
-		<Y>1030</Y>
+		<Y>1070</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2272,7 +2272,7 @@ Voor nu gekozen voor 4185.
 		<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>
+		<Y>990</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2301,7 +2301,7 @@ Voor nu gekozen voor 4185.
 		<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>
+		<Y>1300</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2455,7 +2455,7 @@ https://www.dewarmte.nl/all-electric-warmtepomp/ -> thermisch vermogen van 2-8 k
 
 -> (4+5+2)/3 -> Gemiddeld ongeveer 3.6 thermisch-> 3.6/3  = 1.2 elektrisch]]></Description>
 		<X>70</X>
-		<Y>600</Y>
+		<Y>760</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2484,7 +2484,7 @@ https://www.dewarmte.nl/all-electric-warmtepomp/ -> thermisch vermogen van 2-8 k
 		<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>
+		<Y>850</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2513,7 +2513,7 @@ https://www.dewarmte.nl/all-electric-warmtepomp/ -> thermisch vermogen van 2-8 k
 		<Name><![CDATA[p_minHydrogenBurnerOutputCapacity_kW]]></Name>
 		<Description><![CDATA[Zelfde gekozen als gasbrander.]]></Description>
 		<X>70</X>
-		<Y>780</Y>
+		<Y>940</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2542,7 +2542,7 @@ https://www.dewarmte.nl/all-electric-warmtepomp/ -> thermisch vermogen van 2-8 k
 		<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>
+		<Y>1120</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>
+-> Voor nu gemiddeld 45 genomen.]]></Description>
 		<X>70</X>
-		<Y>560</Y>
+		<Y>720</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,126 @@ 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>570</X>
+		<Y>840</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]]></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>50</X>
+		<Y>310</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_energyLabel_lossfactorPerFloorSurface_WpKm2]]></Name>
+		<X>50</X>
+		<Y>330</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_GridConnectionIsolationLabel, Double>]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<DefaultValue Class="CodeValue">
+				<Code><![CDATA[Map.of(
+OL_GridConnectionIsolationLabel.A, 0.35, 
+OL_GridConnectionIsolationLabel.B, 0.45,
+OL_GridConnectionIsolationLabel.C, 0.65,
+OL_GridConnectionIsolationLabel.D, 0.85, 
+OL_GridConnectionIsolationLabel.E, 1.05,
+OL_GridConnectionIsolationLabel.F, 1.25,
+OL_GridConnectionIsolationLabel.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>50</X>
+		<Y>350</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>
 </Variables>
diff --git a/_alp/Agents/Zero_Interface/Code/Functions.java b/_alp/Agents/Zero_Interface/Code/Functions.java
index 21422d0..e6a159d 100644
--- a/_alp/Agents/Zero_Interface/Code/Functions.java
+++ b/_alp/Agents/Zero_Interface/Code/Functions.java
@@ -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..eb3812d 100644
--- a/_alp/Agents/Zero_Loader/AOC.Zero_Loader.xml
+++ b/_alp/Agents/Zero_Loader/AOC.Zero_Loader.xml
@@ -149,7 +149,7 @@ import java.util.UUID;]]></Import>
 			<Id>1756980503493</Id>
 			<Name><![CDATA[inputCSVcookingActivities]]></Name>
 			<X>-369</X>
-			<Y>759</Y>
+			<Y>784</Y>
 			<Label>
 				<X>10</X>
 				<Y>0</Y>
@@ -171,7 +171,7 @@ import java.util.UUID;]]></Import>
 			<Id>1756980506290</Id>
 			<Name><![CDATA[inputCSVhouseholdTrips]]></Name>
 			<X>-369</X>
-			<Y>799</Y>
+			<Y>824</Y>
 			<Label>
 				<X>10</X>
 				<Y>0</Y>
@@ -193,7 +193,7 @@ import java.util.UUID;]]></Import>
 			<Id>1756980507645</Id>
 			<Name><![CDATA[inputCSVtruckTrips]]></Name>
 			<X>-369</X>
-			<Y>779</Y>
+			<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..7eacfe9 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){
@@ -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,8 +3300,16 @@ 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 cookingDemand_kwhpa)
 {/*ALCODESTART::1749726189312*/
+double yearlyCookingDemand_kWh = cookingDemand_kwhpa;
+
+if(cookingDemand_kwhpa == 0){
+	//yearlyCookingDemand_kWh = uniform_discr(200,600); //way to high compared to referentiewoningen
+	yearlyCookingDemand_kWh = uniform_discr(70,130);
+	//  traceln("Cooking demand unknown");
+}
+
 switch(CookingType){
 
 	case ELECTRIC_HOB:
@@ -3324,11 +3324,22 @@ List<J_ChargingSessionData>  f_getChargerProfile()
 }
 /*ALCODEEND*/}
 
-double f_addHotWaterDemand(GCHouse houseGC,double surface_m2)
+double f_addHotWaterDemand(GCHouse houseGC,double surface_m2,double hotWaterDemand_kwhpa)
 {/*ALCODESTART::1749726279652*/
+double yearlyHWD_kWh = hotWaterDemand_kwhpa;
 int aantalBewoners;
-if( surface_m2 > 150){
-	aantalBewoners = uniform_discr(2,6);
+if(hotWaterDemand_kwhpa == 0){
+	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);
+	}
+	 
+	yearlyHWD_kWh = 1000 + aantalBewoners * 150; //Aangepast Naud 13-11-2025 omdat waardes van PBL totaal niet aansloten bij oude aantal bewoners * 600 //12 * surface_m2 * 3 ; Tamelijk willekeurige formule om HWD te schalen tussen 600 - 2400 kWh bij 50m2 tot 200m2, voor een quickfix
 }
 else if (surface_m2 > 50){
 	aantalBewoners = uniform_discr(1,4);
@@ -3337,7 +3348,7 @@ else if (surface_m2 > 50){
 	aantalBewoners = uniform_discr(1,2);
 }
  
-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
+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);
 
@@ -3349,7 +3360,7 @@ else if (surface_m2 > 50){
 }
 /*ALCODEEND*/}
 
-double f_addBuildingHeatModel(GridConnection parentGC,double floorArea_m2)
+double f_addBuildingHeatModel(GridConnection parentGC,double floorArea_m2,double heatDemand_kwhpa)
 {/*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
@@ -3357,42 +3368,34 @@ else if (surface_m2 > 50){
 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 > 0){
+	lossfactor_WpK = roundToDecimal(heatDemand_kwhpa / avgc_data.p_PBL_HeatingLossFactor , 2);
+}
+else{
+	switch (parentGC.p_energyLabel){
+		case NONE:
+		case UNKNOWN:
+			lossfactor_WpK = uniform (avgc_data.map_energyLabel_lossfactorPerFloorSurface_WpKm2.get(OL_GridConnectionIsolationLabel.D), avgc_data.map_energyLabel_lossfactorPerFloorSurface_WpKm2.get(OL_GridConnectionIsolationLabel.G)) * floorArea_m2;
+			break;
+		default:
+			lossfactor_WpK = avgc_data.map_energyLabel_lossfactorPerFloorSurface_WpKm2.get(parentGC.p_energyLabel);
+	}
 }
 
-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 the floor surface 
+heatCapacity_JpK = ((25000 * 100) + floorArea_m2 * 25000) * 5; //oud 50k was te groot verschil per floor area, 100 is avg floor area deel fixed, 2de deel o.b.v. floor area
+
+//Create the thermal building asset
 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
 /*
 double delayHeatReleaseInteriorHeatsink_hr = 0;
@@ -3463,18 +3466,30 @@ List<Building_data> f_getBuildingsInSubScope(List<Building_data> initialBuilding
 	GCH.p_bouwjaar = houseBuildingData.build_year();
 	GCH.p_eigenOprit = houseBuildingData.has_private_parking() != null ? houseBuildingData.has_private_parking() : false;
 	
+	//For PBL heating
+	if(houseBuildingData.pbl_data_available()){
+		GCH.p_PBLParameters = new J_PBLParameters()
+		GCH.p_constructionPeriod_heatingPBL = houseBuildingData.constructionPeriod_int();
+		GCH.p_schillabel_heatingPBL = houseBuildingData.energy_label();
+		GCH.p_buildingType_heatingPBL = houseBuildingData.buildingType_int();
+		GCH.p_ownership_heatingPBL = houseBuildingData.ownership_int();
+		GCH.p_localFactor_heatingPBL = houseBuildingData.localFactor();
+		GCH.p_regionalClimateCorrectionFactor_heatingPBL = houseBuildingData.regionalClimateCorrectionFactor();
+	}
+	
+	
 	//Nageisoleerd
-	if (houseBuildingData.energy_label() != null) {
+	if (houseBuildingData.energy_label() != null){ // && houseBuildingData.energy_label() != OL_GridConnectionIsolationLabel.NONE) {
 		GCH.p_energyLabel = houseBuildingData.energy_label();
 	}
 	else {
 		if (GCH.p_bouwjaar < 1980) {
 			GCH.p_energyLabel = OL_GridConnectionIsolationLabel.D;
 		}
-		else if (GCH.p_bouwjaar < 2000) {
+		else if (GCH.p_bouwjaar < 1996) {
 			GCH.p_energyLabel = OL_GridConnectionIsolationLabel.C;
 		}
-		else if (GCH.p_bouwjaar < 2015) {
+		else if (GCH.p_bouwjaar < 2008) {
 			GCH.p_energyLabel = OL_GridConnectionIsolationLabel.B;
 		}
 		else {
@@ -3532,19 +3547,52 @@ 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);
-
+	//Instantiate energy assets
+	double annualElectricityConsumption_kwhpa;
+	double annualNaturalGasConsumption_kwhpa;
+	double annualSpaceHeatingConsumption_kwhpa; 
+	double annualDHWConsumption_kwhpa;
+	double annualCookingConsumption_kwhpa;
+	try {
+		annualElectricityConsumption_kwhpa = houseBuildingData.electricity_consumption_kwhpa();
+	}
+	catch (NullPointerException e){
+		annualElectricityConsumption_kwhpa = Double.valueOf(uniform_discr(1200, 3800));
+	}
+	try {
+		annualNaturalGasConsumption_kwhpa = houseBuildingData.gas_consumption_m3pa() * avgc_data.p_gas_kWhpm3;
+	}
+	catch (NullPointerException e){
+		annualNaturalGasConsumption_kwhpa =  Double.valueOf(uniform_discr(600, 2000)) * avgc_data.p_gas_kWhpm3;
+	}
+	try {
+		annualSpaceHeatingConsumption_kwhpa = houseBuildingData.space_heating_consumption_kwhpa();
+	}
+	catch (NullPointerException e){
+		annualSpaceHeatingConsumption_kwhpa = annualNaturalGasConsumption_kwhpa * 0.85; //assumed share gas space heating
+	}
+	try {
+		annualDHWConsumption_kwhpa = houseBuildingData.dhw_consumption_kwhpa();
+	}
+	catch (NullPointerException e){
+		annualDHWConsumption_kwhpa =  annualNaturalGasConsumption_kwhpa * 0.1; //assumed share gas dhw heating
+	}
+	try {
+		annualCookingConsumption_kwhpa = houseBuildingData.cooking_consumption_kwhpa();
+	}
+	catch (NullPointerException e){
+		annualCookingConsumption_kwhpa =  annualNaturalGasConsumption_kwhpa * 0.05; //assumed share gas cooking
+	}
+	
 	
 	//GCH.p_initialPVpanels = houseBuildingData.pv_default();
 	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 );	
+	f_addEnergyAssetsToHouses(GCH, annualElectricityConsumption_kwhpa, annualSpaceHeatingConsumption_kwhpa, annualDHWConsumption_kwhpa, annualCookingConsumption_kwhpa );	
 	
-	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 +3605,38 @@ else if (GCH.p_bouwjaar < 2015) {
 
 /*ALCODEEND*/}
 
-double f_addEnergyAssetsToHouses(GCHouse house,double jaarlijksElectriciteitsVerbruik)
+double f_addEnergyAssetsToHouses(GCHouse house,double electricityDemand_kwhpa,double spaceHeatingDemand_kwhpa,double dhwDemand_kwhpa,double cookingDemand_kwhpa)
 {/*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");
+	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);
+f_addBuildingHeatModel(house, house.p_floorSurfaceArea_m2, spaceHeatingDemand_kwhpa);
 
 //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
+//Add heating asset and management
 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);
+//Get
+if(house.p)
+PBL_DHWAndCooking_data DHWAndCookingDataObject = f_getPBLObject_DHWAndCooking(constructionPeriod, floorSurfaceArea_m2, householdSize);
+double hotWaterDemand_kWhpa = DHWAndCookingDataObject.dhw_gas_demand_m3pa() * avgc_data.p_gas_kWhpm3;
+double cookingDemand_kWhpa = DHWAndCookingDataObject.cooking_gas_demand_m3pa() * avgc_data.p_gas_kWhpm3;
+
+f_addHotWaterDemand(house, house.p_floorSurfaceArea_m2, hotWaterDemand_kWhpa);
+f_addCookingAsset(house, OL_EnergyAssetType.GAS_PIT, cookingDemand_kwhpa);
 
 
 //Add pv
@@ -4903,3 +4957,152 @@ OL_GISObjectType f_getNBHGISObjectType(GIS_Object NBH,String NBHCode,OL_GISObjec
 }
 /*ALCODEEND*/}
 
+double f_getSpaceHeatingDemand_PBL_kWh(double floorSurfaceArea_m2,PBL_SpaceHeating_data spaceHeatingObjectPBL,double localFactor,double regionalClimateCorrectionFactor)
+{/*ALCODESTART::1768308906995*/
+double slope_GJpm2pa = spaceHeatingObjectPBL.slope_space_heating_gjpm2a();
+double constant_GJpa = spaceHeatingObjectPBL.constant_space_heating_gjpa();
+
+// space heating demand
+double functionalSpaceHeatingDemand_GJpa = floorSurfaceArea_m2 * slope_GJpm2pa + constant_GJpa;
+
+// Multiply final factors:
+double GJtokWh = 1e9 / 3.6e6; // GJ is 1e9J, kWh is 3.6e6J
+double functionalSpaceHeatingDemand_kWh = functionalSpaceHeatingDemand_GJpa * GJtokWh * localFactor * regionalClimateCorrectionFactor ;
+return functionalSpaceHeatingDemand_kWh;
+/*ALCODEEND*/}
+
+double f_getHeatDemand_PBL1(OL_PBL_BuildingType buildingType,OL_PBL_ConstructionPeriod constructionPeriod,OL_PBL_OwnershipType ownership,OL_GridConnectionIsolationLabel energyLabel,double surfaceArea_m2,double localFactor,double regionalClimateCorrectionFactor)
+{/*ALCODESTART::1768317546933*/
+String schillabel;
+
+int population;
+if (energyLabel == null || energyLabel == OL_GridConnectionIsolationLabel.NONE){ // || schillabel.isEmpty() || schillabel.equals("x")) { // If label unknown - this is based on PBL
+    schillabel = "x";
+    population = 3;
+} else {
+	schillabel = energyLabel.toString();
+	if( buildingType == 1){ //If vrijstaand huis
+		population = 2;
+	} else {
+		population = 1;
+	}
+}
+
+List<Tuple> rows = selectFrom(reg_coef_space_heating_demand)
+	.where(reg_coef_space_heating_demand.woningtype.eq(buildingType))
+	.where(reg_coef_space_heating_demand.bouwperiode.eq(constructionPeriod))
+	.where(reg_coef_space_heating_demand.eigendomstype.eq(ownership))
+	.where(reg_coef_space_heating_demand.schillabel.eq(schillabel))
+	.where(reg_coef_space_heating_demand.population.eq(population))
+	.list();
+
+// Check for no rows
+if (rows.isEmpty() || rows.size() > 1) {
+    System.out.println("Error: no matching row found with conditions:");
+    System.out.println("  woningtype = " + buildingType);
+    System.out.println("  bouwperiode = " + constructionPeriod);
+    System.out.println("  eigendom = " + ownership);
+    System.out.println("  schillabel = " + schillabel);
+    System.out.println("  population = " + population);
+    throw new RuntimeException("No matching row found!");
+}
+
+Tuple row = rows.get(0);
+double slope_GJpm2pa = row.get(reg_coef_space_heating_demand.helling);
+double constant_GJpa = row.get(reg_coef_space_heating_demand.constante);
+double inhabitants = row.get(reg_coef_space_heating_demand.)
+// space heating demand
+double functionalSpaceHeatingDemand_GJpa = surfaceArea_m2 * slope_GJpm2pa + constant_GJpa;
+
+// Multiply final factors:
+double GJtokWh = 1e9 / 3.6e6; // GJ is 1e9J, kWh is 3.6e6J
+double functionalSpaceHeatingDemand_kWh = functionalSpaceHeatingDemand_GJpa * GJtokWh * localFactor * regionalClimateCorrectionFactor ;
+return functionalSpaceHeatingDemand_kWh;
+
+/*ALCODEEND*/}
+
+PBL_SpaceHeating_data f_getPBLObject_spaceHeating(OL_PBL_BuildingType buildingType,OL_PBL_ConstructionPeriod constructionPeriod,OL_PBL_OwnershipType ownershipType,OL_GridConnectionIsolationLabel insulationLabel)
+{/*ALCODESTART::1768319865034*/
+String schillabel;
+
+PBL_SpaceHeating_data PBLObject_spaceHeating = findFirst(c_lookupTablePBL_spaceHeating, pbl -> pbl.building_type() == buildingType &&
+																							   pbl.construction_period() == constructionPeriod &&
+																							   pbl.ownership_type() == ownershipType &&
+																							   pbl.insulation_label() == insulationLabel
+																							   );
+
+// Check for no rows
+if (PBLObject_spaceHeating == 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);
+    throw new RuntimeException("No matching PBL object found!");
+}
+
+return PBLObject_spaceHeating;
+/*ALCODEEND*/}
+
+PBL_DHWAndCooking_data f_getPBLObject_DHWAndCooking(OL_PBL_ConstructionPeriod constructionPeriod,double floorSurfaceArea_m2,int householdSize)
+{/*ALCODESTART::1768319890191*/
+int surfaceCode = f_getTNOSurfaceCode(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*/}
+
+int f_getTNOSurfaceCode(double surfaceArea_m2)
+{/*ALCODESTART::1768321972904*/
+if(surfaceArea_m2 < 75){
+	return 1;
+}
+else if(75 <= surfaceArea_m2 && surfaceArea_m2 < 100){
+	return 2;
+}
+else if(100 <= surfaceArea_m2 && surfaceArea_m2 < 125){
+	return 3;
+}
+else if(125 <= surfaceArea_m2 && surfaceArea_m2 < 150){
+	return 4;
+}
+else{// if(surfaceArea_m2 > 150){
+	return 5;
+}
+/*ALCODEEND*/}
+
+double f_modelPopBackup()
+{/*ALCODESTART::1768322522139*/
+int population;
+if (energyLabel == null || energyLabel == OL_GridConnectionIsolationLabel.NONE){ // || schillabel.isEmpty() || schillabel.equals("x")) { // If label unknown - this is based on PBL
+    schillabel = "x";
+    population = 3;
+} else {
+	schillabel = energyLabel.toString();
+	if( buildingType == 1){ //If vrijstaand huis
+		population = 2;
+	} else {
+		population = 1;
+	}
+}
+/*ALCODEEND*/}
+
+double f_addHeatingToHouses()
+{/*ALCODESTART::1768324153032*/
+
+/*ALCODEEND*/}
+
diff --git a/_alp/Agents/Zero_Loader/Code/Functions.xml b/_alp/Agents/Zero_Loader/Code/Functions.xml
index 0e895ec..6f3ce9a 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>
@@ -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>770.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>910</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>890</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>790</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>650</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>670</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>590</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>690</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>630</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>811</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>
@@ -806,7 +806,7 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<Id>1726584205869</Id>
 		<Name><![CDATA[f_clearDataRecords]]></Name>
 		<X>-390</X>
-		<Y>710</Y>
+		<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>
@@ -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>710</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>460</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>870</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>850</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>830</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>530</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1389,7 +1389,7 @@ verbruik = levering + productie - teruglevering]]></Description>
 			<Type><![CDATA[OL_EnergyAssetType]]></Type>
 		</Parameter>
 		<Parameter>
-			<Name><![CDATA[yearlyCookingDemand_kWh]]></Name>
+			<Name><![CDATA[cookingDemand_kwhpa]]></Name>
 			<Type><![CDATA[double]]></Type>
 		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
@@ -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>550</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1416,6 +1416,10 @@ verbruik = levering + productie - teruglevering]]></Description>
 			<Name><![CDATA[surface_m2]]></Name>
 			<Type><![CDATA[double]]></Type>
 		</Parameter>
+		<Parameter>
+			<Name><![CDATA[hotWaterDemand_kwhpa]]></Name>
+			<Type><![CDATA[double]]></Type>
+		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
 	<Function AccessType="default" StaticFunction="false">
@@ -1423,8 +1427,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>260</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1440,6 +1444,10 @@ 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>
 		<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>140</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1499,7 +1507,19 @@ verbruik = levering + productie - teruglevering]]></Description>
 			<Type><![CDATA[GCHouse]]></Type>
 		</Parameter>
 		<Parameter>
-			<Name><![CDATA[jaarlijksElectriciteitsVerbruik]]></Name>
+			<Name><![CDATA[electricityDemand_kwhpa]]></Name>
+			<Type><![CDATA[double]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[spaceHeatingDemand_kwhpa]]></Name>
+			<Type><![CDATA[double]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[dhwDemand_kwhpa]]></Name>
+			<Type><![CDATA[double]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[cookingDemand_kwhpa]]></Name>
 			<Type><![CDATA[double]]></Type>
 		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
@@ -1509,8 +1529,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>190</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1526,7 +1546,7 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<Id>1749729268458</Id>
 		<Name><![CDATA[f_createParkingSpots]]></Name>
 		<X>430</X>
-		<Y>950</Y>
+		<Y>930</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1687,7 +1707,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 +1741,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 +1858,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 +1878,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>355</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1890,8 +1910,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>310</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1915,7 +1935,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 +2036,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 +2064,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>375</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2084,8 +2104,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>330</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2104,8 +2124,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>420</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2149,7 +2169,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 +2190,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 +2206,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>400</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2275,7 +2295,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 +2315,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>480</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2320,7 +2340,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 +2365,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 +2389,8 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<ReturnType>double</ReturnType>
 		<Id>1755866291695</Id>
 		<Name><![CDATA[f_addCarsToHouses]]></Name>
-		<X>460</X>
-		<Y>720</Y>
+		<X>890</X>
+		<Y>390</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2389,8 +2409,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 +2446,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 +2483,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 +2500,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 +2521,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 +2565,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 +2589,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 +2605,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 +2628,193 @@ 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>270</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_SpaceHeating_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="default" StaticFunction="false">
+		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1768317546933</Id>
+		<Name><![CDATA[f_getHeatDemand_PBL1]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>910</X>
+		<Y>410</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[constructionPeriod]]></Name>
+			<Type><![CDATA[OL_PBL_ConstructionPeriod]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[ownership]]></Name>
+			<Type><![CDATA[OL_PBL_OwnershipType]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[energyLabel]]></Name>
+			<Type><![CDATA[OL_GridConnectionIsolationLabel]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[surfaceArea_m2]]></Name>
+			<Type><![CDATA[double]]></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_SpaceHeating_data</ReturnType>
+		<Id>1768319865034</Id>
+		<Name><![CDATA[f_getPBLObject_spaceHeating]]></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[buildingType]]></Name>
+			<Type><![CDATA[OL_PBL_BuildingType]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[constructionPeriod]]></Name>
+			<Type><![CDATA[OL_PBL_ConstructionPeriod]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[ownershipType]]></Name>
+			<Type><![CDATA[OL_PBL_OwnershipType]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[insulationLabel]]></Name>
+			<Type><![CDATA[OL_GridConnectionIsolationLabel]]></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>290</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[constructionPeriod]]></Name>
+			<Type><![CDATA[OL_PBL_ConstructionPeriod]]></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>int</ReturnType>
+		<Id>1768321972904</Id>
+		<Name><![CDATA[f_getTNOSurfaceCode]]></Name>
+		<X>910</X>
+		<Y>310</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[surfaceArea_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>1768322522139</Id>
+		<Name><![CDATA[f_modelPopBackup]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>910</X>
+		<Y>430</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>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1768324153032</Id>
+		<Name><![CDATA[f_addHeatingToHouses]]></Name>
+		<X>890</X>
+		<Y>160</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+	</Function>
 </Functions>
diff --git a/_alp/Agents/Zero_Loader/EmbeddedObjects.xml b/_alp/Agents/Zero_Loader/EmbeddedObjects.xml
index e58d26f..f3799c9 100644
--- a/_alp/Agents/Zero_Loader/EmbeddedObjects.xml
+++ b/_alp/Agents/Zero_Loader/EmbeddedObjects.xml
@@ -122,7 +122,7 @@
 		<Id>1726584829907</Id>
 		<Name><![CDATA[avgc_data]]></Name>
 		<X>-370</X>
-		<Y>830</Y>
+		<Y>850</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -397,6 +397,18 @@
 			<Parameter>
 				<Name><![CDATA[p_avgOutputTemperatureHybridHeatpump_degC]]></Name>
 			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_minAnnualTravelDistanceSurveyVehicle_km]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_PBL_HeatingLossFactor]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[map_energyLabel_lossfactorPerFloorSurface_WpKm2]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_solarAbsorptionFloorSurfaceScalingFactor_fr]]></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..d1d17f0 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>
@@ -367,7 +367,7 @@
 		<Id>1726584205937</Id>
 		<Name><![CDATA[t_inputFiles]]></Name>
 		<X>-380</X>
-		<Y>720</Y>
+		<Y>750</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -493,7 +493,7 @@
 		<Id>1726584205947</Id>
 		<Name><![CDATA[rect_createEnergyGC]]></Name>
 		<X>400</X>
-		<Y>740</Y>
+		<Y>720</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>250</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>730</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>
@@ -579,7 +579,7 @@
 				<LineMaterial>null</LineMaterial>
 				<LineStyle>SOLID</LineStyle>
 				<Width>400</Width>
-				<Height>140</Height>
+				<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>
@@ -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>
@@ -952,7 +952,7 @@
 		<Id>1744808981703</Id>
 		<Name><![CDATA[txt_DebuggingDataCollections]]></Name>
 		<X>-400</X>
-		<Y>870</Y>
+		<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..2eb2912 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>
@@ -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>
@@ -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>
@@ -443,7 +443,7 @@
 		<Id>1726584205743</Id>
 		<Name><![CDATA[c_surveyCompanyBuilding_data]]></Name>
 		<X>-380</X>
-		<Y>910</Y>
+		<Y>920</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -641,7 +641,7 @@
 		<Id>1737744140895</Id>
 		<Name><![CDATA[c_vallumBuilding_data]]></Name>
 		<X>-380</X>
-		<Y>930</Y>
+		<Y>940</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -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>
@@ -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_spaceHeating]]></Name>
+		<X>-370</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_SpaceHeating_data</ElementClass>
+			<ValueElementClass>String</ValueElementClass>
+		</Properties>
+	</Variable>
+	<Variable Class="CollectionVariable">
+		<Id>1768319047453</Id>
+		<Name><![CDATA[c_lookupTablePBL_DHWAndCooking]]></Name>
+		<X>-370</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.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..d6c2955 100644
--- a/_alp/Classes/Class.Building_data.java
+++ b/_alp/Classes/Class.Building_data.java
@@ -25,6 +25,9 @@ public class Building_data {
 	Double contracted_capacity_kw;
 	Double electricity_consumption_kwhpa;
 	Double gas_consumption_m3pa;
+	Double space_heating_consumption_kwhpa;
+	Double dhw_consumption_kwhpa;
+	Double cooking_consumption_kwhpa;
 	Double pv_installed_kwp;
 	Double pv_potential_kwp;
 	OL_GridConnectionIsolationLabel energy_label;
@@ -33,4 +36,12 @@ public class Building_data {
 	Double latitude;
 	Double longitude;
 	String polygon;
+	
+	//PBL data
+	boolean pbl_data_available;
+	Integer ownership_int;
+	Integer constructionPeriod_int;
+	Integer buildingType_int;
+	Double localFactor;
+	Double regionalClimateCorrectionFactor;
 }
\ 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..89c874e
--- /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 {
+	OL_PBL_ConstructionPeriod construction_period;	
+	int surface_code;
+	int household_size;
+	double cooking_gas_demand_m3pa;
+	double dhw_gas_demand_m3pa;
+}
diff --git a/_alp/Classes/Class.PBL_SpaceHeating_data.java b/_alp/Classes/Class.PBL_SpaceHeating_data.java
new file mode 100644
index 0000000..ba99b5b
--- /dev/null
+++ b/_alp/Classes/Class.PBL_SpaceHeating_data.java
@@ -0,0 +1,17 @@
+/**
+ * PBL_SpaceHeating_data
+ */	
+@lombok.Builder
+@lombok.Value
+@lombok.experimental.Accessors(fluent = true)
+public class PBL_SpaceHeating_data {
+	OL_PBL_BuildingType building_type;	
+	OL_PBL_ConstructionPeriod construction_period;	
+	OL_PBL_OwnershipType ownership_type;	
+	OL_GridConnectionIsolationLabel insulation_label;	
+	//model_population;	
+	double slope_space_heating_gjpm2a;	
+	double constant_space_heating_gjpa;	
+	double slope_residents;	
+	double constant_residents;
+}