diff --git a/Zero_engine.alpx b/Zero_engine.alpx
index 90810d25..9223e561 100644
--- a/Zero_engine.alpx
+++ b/Zero_engine.alpx
@@ -2229,6 +2229,10 @@ LARGE_CONNECTION (grootverbruik, > 3x80)
 				<Name><![CDATA[J_BackupGeneratorManagementExternalSetpoint]]></Name>
 				<Folder>1776078970513</Folder>
 			</JavaClass>
+			<JavaClass>
+				<Id>1781710977201</Id>
+				<Name><![CDATA[GISUtil]]></Name>
+			</JavaClass>
 		</JavaClasses>
 		<RequiredLibraryReference>
 			<LibraryName>com.anylogic.libraries.modules.markup_descriptors</LibraryName>
diff --git a/_alp/Agents/EnergyModel/Code/Functions.java b/_alp/Agents/EnergyModel/Code/Functions.java
index 26946658..03088ce3 100644
--- a/_alp/Agents/EnergyModel/Code/Functions.java
+++ b/_alp/Agents/EnergyModel/Code/Functions.java
@@ -159,14 +159,22 @@
 v_batteryStoredEnergy_kWh = 0;
 
 if (b_parallelizeGridConnections) {
-	c_gridConnections.parallelStream().forEach(gc -> gc.f_calculateEnergyBalance(p_timeVariables, v_isRapidRun));
+	c_gridConnections.parallelStream().forEach(gc -> {if(!(gc instanceof GCDistrictHeating)){ gc.f_calculateEnergyBalance(p_timeVariables, v_isRapidRun);}});
 } 
 else {
 	for(GridConnection gc : c_gridConnections) {
-		gc.f_calculateEnergyBalance(p_timeVariables, v_isRapidRun);
+		if(!(gc instanceof GCDistrictHeating)){
+			gc.f_calculateEnergyBalance(p_timeVariables, v_isRapidRun);
+		}
 	}
 }
 
+for(GCDistrictHeating GCDH : DistrictHeatingSystems){
+	if(GCDH.f_isActive()){
+		GCDH.f_calculateEnergyBalance(p_timeVariables, v_isRapidRun);
+	}	
+}
+
 //OLD LOCATION OF AGGREGATOR CALL, NECESSARY IF MANAGEMENT IS WITHOUT TIME STEP DELAY
 
 for(GridConnection gc : c_gridConnections) { // Can't do this in parallel due to different threads writing to the same values!
@@ -502,7 +510,7 @@
 double f_gridNodeRecursiveAdd(GridNode GN)
 {/*ALCODESTART::1716886716306*/
 c_gridNodeExecutionList.add(GN);
-for (GridNode GNchild : GN.c_connectedGridNodes) {
+for (GridNode GNchild : GN.f_getConnectedGridNodes()) {
 	f_gridNodeRecursiveAdd(GNchild);
 }
 
diff --git a/_alp/Agents/EnergyModel/EmbeddedObjects.xml b/_alp/Agents/EnergyModel/EmbeddedObjects.xml
index 64b1ef39..ff9cddd6 100644
--- a/_alp/Agents/EnergyModel/EmbeddedObjects.xml
+++ b/_alp/Agents/EnergyModel/EmbeddedObjects.xml
@@ -90,6 +90,12 @@
 			<Parameter>
 				<Name><![CDATA[p_profileType]]></Name>
 			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_heatLossFactorDistribution_kW]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_heatLossFactorTransport_kWpm]]></Name>
+			</Parameter>
 		</Parameters>
 		<ReplicationFlag>true</ReplicationFlag>
 		<Replication Class="CodeValue">
diff --git a/_alp/Agents/GridNode/AOC.GridNode.xml b/_alp/Agents/GridNode/AOC.GridNode.xml
index 3ab0b8eb..fb7c606e 100644
--- a/_alp/Agents/GridNode/AOC.GridNode.xml
+++ b/_alp/Agents/GridNode/AOC.GridNode.xml
@@ -115,7 +115,7 @@ if (p_energyType.equals(OL_EnergyCarriers.HEAT)) {
 			<Id>1705919330576</Id>
 			<Name><![CDATA[data_liveLoad_kW]]></Name>
 			<X>50</X>
-			<Y>850</Y>
+			<Y>880</Y>
 			<Label>
 				<X>15</X>
 				<Y>0</Y>
@@ -144,7 +144,7 @@ if (p_energyType.equals(OL_EnergyCarriers.HEAT)) {
 			<Id>1712668669449</Id>
 			<Name><![CDATA[data_liveCapacityDemand_kW]]></Name>
 			<X>50</X>
-			<Y>890</Y>
+			<Y>920</Y>
 			<Label>
 				<X>15</X>
 				<Y>0</Y>
@@ -173,7 +173,7 @@ if (p_energyType.equals(OL_EnergyCarriers.HEAT)) {
 			<Id>1712673776914</Id>
 			<Name><![CDATA[data_liveCapacitySupply_kW]]></Name>
 			<X>50</X>
-			<Y>870</Y>
+			<Y>900</Y>
 			<Label>
 				<X>15</X>
 				<Y>0</Y>
@@ -202,7 +202,7 @@ if (p_energyType.equals(OL_EnergyCarriers.HEAT)) {
 			<Id>1715167370828</Id>
 			<Name><![CDATA[data_totalLoad_kW]]></Name>
 			<X>50</X>
-			<Y>920</Y>
+			<Y>950</Y>
 			<Label>
 				<X>15</X>
 				<Y>0</Y>
@@ -231,7 +231,7 @@ if (p_energyType.equals(OL_EnergyCarriers.HEAT)) {
 			<Id>1715167392629</Id>
 			<Name><![CDATA[data_summerWeekLoad_kW]]></Name>
 			<X>50</X>
-			<Y>940</Y>
+			<Y>970</Y>
 			<Label>
 				<X>15</X>
 				<Y>0</Y>
@@ -260,7 +260,7 @@ if (p_energyType.equals(OL_EnergyCarriers.HEAT)) {
 			<Id>1715167408643</Id>
 			<Name><![CDATA[data_winterWeekLoad_kW]]></Name>
 			<X>50</X>
-			<Y>960</Y>
+			<Y>990</Y>
 			<Label>
 				<X>15</X>
 				<Y>0</Y>
diff --git a/_alp/Agents/GridNode/Code/Functions.java b/_alp/Agents/GridNode/Code/Functions.java
index 25077a76..cfd8167c 100644
--- a/_alp/Agents/GridNode/Code/Functions.java
+++ b/_alp/Agents/GridNode/Code/Functions.java
@@ -54,28 +54,6 @@
 	}
 }*/
 
-/*ALCODEEND*/}
-
-double f_sumLoads()
-{/*ALCODESTART::1660122738707*/
-v_currentLoad_kW = 0;
-
-// determine the net energy flows from all subconnections by nodetype
-
-for( GridNode GN : c_connectedGridNodes ) {
-	v_currentLoad_kW += GN.v_currentLoad_kW;
-}
-
-for( GridConnection GC : c_connectedGridConnections) {
-	v_currentLoad_kW += GC.fm_currentBalanceFlows_kW.get(p_energyCarrier);
-}
-
-
-/*if( p_energyType == OL_EnergyCarriers.ELECTRICITY ){
-	v_electricLoadRatioExclBattery = v_currentLoadElectricity_kW / p_capacity_kW;
-}*/
-
-
 /*ALCODEEND*/}
 
 double f_nodeMetering(J_TimeVariables timeVariables,J_TimeParameters timeParameters,boolean isRapidRun)
@@ -179,62 +157,6 @@ else if (p_energyCarrier == OL_EnergyCarriers.HEAT) {
 }
 /*ALCODEEND*/}
 
-double f_instantiateEnergyAssets()
-{/*ALCODESTART::1676387466304*/
-//traceln("asset " + p_energyAssetList);
-
-if( p_energyAssetList != null) {
-	for( JsonNode l : p_energyAssetList ) {
-		OL_EACategories assetCategory = OL_EACategories.valueOf(l.required( "category" ).textValue());
-		switch( assetCategory )  {		
-			case STORAGE:
-				//EnergyAsset storageAsset = main.add_pop_energyAssets();
-				//storageAsset.set_p_parentAgentID( this.p_gridNodeID );
-				OL_EnergyAssetType assetType = ( OL_EnergyAssetType.valueOf(l.required( "type" ).textValue()));
-				//storageAsset.set_p_defaultEnergyAssetPresetName(l.required( "name" ).textValue());
-				if( assetType == OL_EnergyAssetType.STORAGE_HEAT){
-				    double capacityHeat_kW = l.path( "capacityHeat_kW").doubleValue();
-					double lossFactor_WpK = l.path( "lossFactor_WpK" ).doubleValue();
-					double heatCapacity_JpK = l.path( "heatCapacity_JpK" ).doubleValue();
-					double minTemperature_degC = l.path( "minTemp_degC" ).asDouble(40.0); // provide default values
-					double maxTemperature_degC = l.path( "maxTemp_degC" ).asDouble(90.0);
-					double setTemperature_degC = l.path( "setTemp_degC" ).asDouble(60.0);
-					double initialTemperature_degC = l.path( "initialTemperature_degC" ).doubleValue();
-					String ambientTempType2 = l.path( "ambientTempType" ).textValue();
-					
-					// minTemperature_degC = 35; // TO DELETE TEMP FIX
-					// setTemperature_degC = uniform_discr(38, 45); // TO DELETE TEMP FIX
-					// initialTemperature_degC = uniform_discr(70,80) * 1.0; // TO DELETE TEMP FIX
-					// heatCapacity_JpK = heatCapacity_JpK * uniform(0.7, 1.3); // TO DELETE TEMP FIX
-					traceln("heatstorage asset initialisation check! minTemp = "+minTemperature_degC+", maxTemperature_degC = "+maxTemperature_degC+", setTemp_degC = "+ setTemperature_degC+", initialTemperature_degC = "+initialTemperature_degC);
-					
-					//traceln("Heat Storage init: minTemperature = "+minTemperature_degC+", maxTemperature_degC = "+maxTemperature_degC+", setTemperature_degC = "+setTemperature_degC+", initialTemperature_degC = "+initialTemperature_degC);
-					
-					
-					p_transportBuffer = new J_EAStorageHeat((Agent)this, OL_EAStorageTypes.HEATBUFFER, capacityHeat_kW, lossFactor_WpK, energyModel.p_timeStep_h, initialTemperature_degC, minTemperature_degC, maxTemperature_degC, setTemperature_degC, heatCapacity_JpK, ambientTempType2);	
-					//J_EAStorageHeat(Agent parentAgent, OL_EAStorageTypes heatStorageType, double capacityHeat_kW, double lossFactor_WpK, double timestep_h, double initialTemperature_degC, double minTemperature_degC, double maxTemperature_degC, double setTemperature_degC, double heatCapacity_JpK, String ambientTempType ) {
-					//p_transportBuffer = storageAsset.j_ea;
-					p_transportBuffer.updateAmbientTemperature( energyModel.p_undergroundTemperature_degC );
-					if(heatCapacity_JpK > 0 & capacityHeat_kW > 0) {
-						b_transportBufferValid = true;
-					}
-				}
-				else{
-					traceln("F_instantiateEnergyAssets: ERROR, storage asset type not available");
-				}
-				//storageAsset.f_connectToParentNode( this );
-				//main.c_storageAssets.add(storageAsset);
-
-			break;
-			default:
-				traceln("not a valid energy asset category." + assetCategory);
-			break;
-		}
-	}
-//traceln("GridConnection "+this.p_gridNodeID+" has finished initializing its energyAssets!");
-}
-/*ALCODEEND*/}
-
 double f_calculateEnergyBalance(J_TimeVariables timeVariables,J_TimeParameters timeParameters,boolean isRapidRun)
 {/*ALCODESTART::1688370981599*/
 f_sumLoads();
@@ -302,16 +224,6 @@ else if (p_energyCarrier == OL_EnergyCarriers.HEAT) {
 f_getCurrentChargingInformation(timeParameters);
 /*ALCODEEND*/}
 
-double f_addGridBatteryLoad()
-{/*ALCODESTART::1688372319365*/
-for( Agent a : subConnections.getConnections() ) {
-	if ( a instanceof GCGridBattery){
-		v_currentLoadElectricity_kW += ((GCGridBattery)a).v_currentPowerElectricity_kW;
-	}	
-}
-
-/*ALCODEEND*/}
-
 double f_resetStates(J_TimeParameters timeParameters)
 {/*ALCODESTART::1698919552330*/
 // Current status
@@ -530,38 +442,54 @@ J_LoadDurationCurves f_getDuurkrommes(J_TimeParameters timeParameters)
 
 DataSet f_getPeakImportWeekDataSet(J_TimeParameters timeParameters)
 {/*ALCODESTART::1754461654982*/
-double[] elecBalance_kW = acc_annualElectricityBalance_kW.getTimeSeries_kW();
+ZeroAccumulator acc_annualBalance_kW;
+if(p_energyCarrier == OL_EnergyCarriers.ELECTRICITY){
+	acc_annualBalance_kW = acc_annualElectricityBalance_kW;
+}
+else{
+	acc_annualBalance_kW = acc_annualHeatBalance_kW;
+}
+
+double[] balance_kW = acc_annualBalance_kW.getTimeSeries_kW();
 
 Integer maxIndex = 0; // index with peak import
-for (int i = 1; i < elecBalance_kW.length; i++) {
-    if (elecBalance_kW[i] > elecBalance_kW[maxIndex]) {
+for (int i = 1; i < balance_kW.length; i++) {
+    if (balance_kW[i] > balance_kW[maxIndex]) {
         maxIndex = i;
     }
 }
 
 double peakTime_h = maxIndex*timeParameters.getTimeStep_h();
-double duration_h = acc_annualElectricityBalance_kW.getDuration();
+double duration_h = acc_annualBalance_kW.getDuration();
 double accStartTime_h = min(duration_h-7*24,max(0,peakTime_h - 3.5*24));
-DataSet ds = acc_annualElectricityBalance_kW.getDataSet(timeParameters.getRunStartTime_h(), accStartTime_h, accStartTime_h+24*7);
+DataSet ds = acc_annualBalance_kW.getDataSet(timeParameters.getRunStartTime_h(), accStartTime_h, accStartTime_h+24*7);
    
 return ds;
 /*ALCODEEND*/}
 
 DataSet f_getPeakExportWeekDataSet(J_TimeParameters timeParameters)
 {/*ALCODESTART::1754462048041*/
-double[] elecBalance_kW = acc_annualElectricityBalance_kW.getTimeSeries_kW();
+ZeroAccumulator acc_annualBalance_kW;
+if(p_energyCarrier == OL_EnergyCarriers.ELECTRICITY){
+	acc_annualBalance_kW = acc_annualElectricityBalance_kW;
+}
+else{
+	acc_annualBalance_kW = acc_annualHeatBalance_kW;
+}
+
+double[] balance_kW = acc_annualBalance_kW.getTimeSeries_kW();
 
 Integer minIndex = 0; // index with peak import
-for (int i = 1; i < elecBalance_kW.length; i++) {
-    if (elecBalance_kW[i] < elecBalance_kW[minIndex]) {
+for (int i = 1; i < balance_kW.length; i++) {
+    if (balance_kW[i] < balance_kW[minIndex]) {
         minIndex = i;
     }
 }
 
 double peakTime_h = minIndex*timeParameters.getTimeStep_h();
-double duration_h = acc_annualElectricityBalance_kW.getDuration();
+double duration_h = acc_annualBalance_kW.getDuration();
 double accStartTime_h = min(duration_h-7*24,max(0,peakTime_h - 3.5*24));
-DataSet ds = acc_annualElectricityBalance_kW.getDataSet(timeParameters.getRunStartTime_h(), accStartTime_h, accStartTime_h+24*7);
+DataSet ds = acc_annualBalance_kW.getDataSet(timeParameters.getRunStartTime_h(), accStartTime_h, accStartTime_h+24*7);
    
 return ds;
 /*ALCODEEND*/}
@@ -601,3 +529,38 @@ int f_getCurrentNumberOfChargeRequestsBalancingThisGN()
 return v_currentChargingPowerBalancingThisGN_kW;
 /*ALCODEEND*/}
 
+double f_calculateHeatNodeTransportLoss_kW(double latConnectedGN,double lonConnectedGN)
+{/*ALCODESTART::1781699944841*/
+double totalDist_m = GISUtil.calculateManhattanDistance_m(p_latitude, p_longitude, latConnectedGN, lonConnectedGN);
+double heatLoss_kW = totalDist_m * p_heatLossFactorTransport_kWpm;
+
+return heatLoss_kW;
+/*ALCODEEND*/}
+
+double f_sumLoads()
+{/*ALCODESTART::1781700026205*/
+v_currentLoad_kW = 0;
+v_currentLoss_kW = 0;
+
+// determine the net energy flows from all subconnections by nodetype
+
+for( GridNode connectedGN : c_connectedGridNodes ) {
+	v_currentLoad_kW += connectedGN.v_currentLoad_kW;
+	if (p_energyCarrier == OL_EnergyCarriers.HEAT && p_parentNodeID != null) {
+		double heatLoss_kW = 0;
+		heatLoss_kW = f_calculateHeatNodeTransportLoss_kW(connectedGN.p_latitude, connectedGN.p_longitude);
+		v_currentLoad_kW += heatLoss_kW;
+		v_currentLoss_kW += heatLoss_kW;
+	}
+}
+
+for( GridConnection GC : c_connectedGridConnections) {
+	v_currentLoad_kW += GC.fm_currentBalanceFlows_kW.get(p_energyCarrier);
+	if (p_energyCarrier == OL_EnergyCarriers.HEAT && p_parentNodeID != null) {
+		double heatLoss_kW = p_heatLossFactorDistribution_kW;
+		v_currentLoad_kW += heatLoss_kW;
+		v_currentLoss_kW += heatLoss_kW;
+	}
+}
+/*ALCODEEND*/}
+
diff --git a/_alp/Agents/GridNode/Code/Functions.xml b/_alp/Agents/GridNode/Code/Functions.xml
index 2a01515e..6b762140 100644
--- a/_alp/Agents/GridNode/Code/Functions.xml
+++ b/_alp/Agents/GridNode/Code/Functions.xml
@@ -5,8 +5,8 @@
 		<ReturnType>double</ReturnType>
 		<Id>1658495336616</Id>
 		<Name><![CDATA[f_connectToParentNode]]></Name>
-		<X>780</X>
-		<Y>80</Y>
+		<X>810</X>
+		<Y>60</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -16,13 +16,13 @@
 		<ShowLabel>true</ShowLabel>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
-	<Function AccessType="default" StaticFunction="false">
+	<Function AccessType="public" StaticFunction="false">
 		<ReturnModificator>VOID</ReturnModificator>
 		<ReturnType>double</ReturnType>
 		<Id>1658495630251</Id>
 		<Name><![CDATA[f_connectToChild]]></Name>
-		<X>780</X>
-		<Y>100</Y>
+		<X>810</X>
+		<Y>80</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -36,29 +36,13 @@
 		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
-	<Function AccessType="default" StaticFunction="false">
-		<ReturnModificator>VOID</ReturnModificator>
-		<ReturnType>double</ReturnType>
-		<Id>1660122738707</Id>
-		<Name><![CDATA[f_sumLoads]]></Name>
-		<X>780</X>
-		<Y>180</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>1660216693598</Id>
 		<Name><![CDATA[f_nodeMetering]]></Name>
-		<X>790</X>
-		<Y>240</Y>
+		<X>820</X>
+		<Y>270</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -85,8 +69,8 @@
 		<ReturnType>double</ReturnType>
 		<Id>1666556555538</Id>
 		<Name><![CDATA[f_setCongestionTariff]]></Name>
-		<X>780</X>
-		<Y>140</Y>
+		<X>810</X>
+		<Y>110</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -107,25 +91,8 @@
 		<Name><![CDATA[f_resetCongestionTariffs]]></Name>
 		<Description><![CDATA[Gridoperator roept deze functie alleen aan als deze node vorige tijdstap congested was maar nu niet meer.]]></Description>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>780</X>
-		<Y>160</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="public" StaticFunction="false">
-		<ReturnModificator>VOID</ReturnModificator>
-		<ReturnType>double</ReturnType>
-		<Id>1676387466304</Id>
-		<Name><![CDATA[f_instantiateEnergyAssets]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>780</X>
-		<Y>60</Y>
+		<X>810</X>
+		<Y>130</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -140,8 +107,8 @@
 		<ReturnType>double</ReturnType>
 		<Id>1688370981599</Id>
 		<Name><![CDATA[f_calculateEnergyBalance]]></Name>
-		<X>780</X>
-		<Y>220</Y>
+		<X>810</X>
+		<Y>160</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -163,30 +130,13 @@
 		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
-	<Function AccessType="public" StaticFunction="false">
-		<ReturnModificator>VOID</ReturnModificator>
-		<ReturnType>double</ReturnType>
-		<Id>1688372319365</Id>
-		<Name><![CDATA[f_addGridBatteryLoad]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>780</X>
-		<Y>200</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>1698919552330</Id>
 		<Name><![CDATA[f_resetStates]]></Name>
-		<X>780</X>
-		<Y>320</Y>
+		<X>810</X>
+		<Y>350</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -205,8 +155,8 @@
 		<ReturnType>double</ReturnType>
 		<Id>1713181018774</Id>
 		<Name><![CDATA[f_calculateKPIs]]></Name>
-		<X>780</X>
-		<Y>260</Y>
+		<X>810</X>
+		<Y>290</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -222,8 +172,8 @@
 		<Id>1718290223518</Id>
 		<Name><![CDATA[f_getConnectedGridNodes]]></Name>
 		<Description><![CDATA[Function that gets all the directly connected grid nodes]]></Description>
-		<X>1110</X>
-		<Y>190</Y>
+		<X>410</X>
+		<Y>130</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -239,8 +189,8 @@
 		<Id>1718290606581</Id>
 		<Name><![CDATA[f_getConnectedGridConnections]]></Name>
 		<Description><![CDATA[Function that gets all the directly connected grid connections]]></Description>
-		<X>1110</X>
-		<Y>210</Y>
+		<X>410</X>
+		<Y>150</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -255,8 +205,8 @@
 		<ReturnType>double</ReturnType>
 		<Id>1718896086734</Id>
 		<Name><![CDATA[f_propagateNodalPricing]]></Name>
-		<X>780</X>
-		<Y>400</Y>
+		<X>810</X>
+		<Y>430</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -271,8 +221,8 @@
 		<ReturnType>double</ReturnType>
 		<Id>1719300860382</Id>
 		<Name><![CDATA[f_initializeGridnode]]></Name>
-		<X>780</X>
-		<Y>350</Y>
+		<X>810</X>
+		<Y>380</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -287,8 +237,8 @@
 		<ReturnType>double</ReturnType>
 		<Id>1719302290904</Id>
 		<Name><![CDATA[f_updateForecasts]]></Name>
-		<X>780</X>
-		<Y>370</Y>
+		<X>810</X>
+		<Y>400</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -303,8 +253,8 @@
 		<ReturnType>double</ReturnType>
 		<Id>1722591244558</Id>
 		<Name><![CDATA[f_updateTotalInstalledProductionAssets]]></Name>
-		<X>1040</X>
-		<Y>310</Y>
+		<X>810</X>
+		<Y>560</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -332,8 +282,8 @@
 		<Id>1725964027407</Id>
 		<Name><![CDATA[f_getLowerLVLConnectedGridNodes]]></Name>
 		<Description><![CDATA[Function that gets all grid nodes and the children of those grid nodes, etc. All the way to the bottom node.]]></Description>
-		<X>1110</X>
-		<Y>230</Y>
+		<X>410</X>
+		<Y>170</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -349,8 +299,8 @@
 		<Id>1725966618828</Id>
 		<Name><![CDATA[f_getAllConnectedGridNodes_recursion]]></Name>
 		<Description><![CDATA[Recursion Function that gets all grid nodes and the children of those grid nodes, etc. All the way to the bottom node. For basic use should be called with an empty list!]]></Description>
-		<X>1150</X>
-		<Y>250</Y>
+		<X>450</X>
+		<Y>190</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -370,8 +320,8 @@
 		<Id>1734617656602</Id>
 		<Name><![CDATA[f_getAllLowerLVLConnectedGridConnections]]></Name>
 		<Description><![CDATA[Function that gets all the directly connected grid connections]]></Description>
-		<X>1110</X>
-		<Y>270</Y>
+		<X>410</X>
+		<Y>210</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -386,8 +336,8 @@
 		<ReturnType>J_LoadDurationCurves</ReturnType>
 		<Id>1753341238941</Id>
 		<Name><![CDATA[f_getDuurkrommes]]></Name>
-		<X>780</X>
-		<Y>290</Y>
+		<X>810</X>
+		<Y>320</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -406,8 +356,8 @@
 		<ReturnType>DataSet</ReturnType>
 		<Id>1754461654982</Id>
 		<Name><![CDATA[f_getPeakImportWeekDataSet]]></Name>
-		<X>1060</X>
-		<Y>440</Y>
+		<X>810</X>
+		<Y>500</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -426,8 +376,8 @@
 		<ReturnType>DataSet</ReturnType>
 		<Id>1754462048041</Id>
 		<Name><![CDATA[f_getPeakExportWeekDataSet]]></Name>
-		<X>1060</X>
-		<Y>460</Y>
+		<X>810</X>
+		<Y>520</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -446,8 +396,8 @@
 		<ReturnType>double</ReturnType>
 		<Id>1758209089894</Id>
 		<Name><![CDATA[f_getCurrentChargingInformation]]></Name>
-		<X>810</X>
-		<Y>600</Y>
+		<X>780</X>
+		<Y>760</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -466,8 +416,8 @@
 		<ReturnType>int</ReturnType>
 		<Id>1765548180792</Id>
 		<Name><![CDATA[f_getCurrentNumberOfChargeRequestsBalancingThisGN]]></Name>
-		<X>830</X>
-		<Y>690</Y>
+		<X>800</X>
+		<Y>850</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -482,8 +432,48 @@
 		<ReturnType>double</ReturnType>
 		<Id>1765548222744</Id>
 		<Name><![CDATA[f_getCurrentChargingPowerBalancingThisGN_kW]]></Name>
-		<X>830</X>
-		<Y>650</Y>
+		<X>800</X>
+		<Y>810</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>RETURNS_VALUE</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1781699944841</Id>
+		<Name><![CDATA[f_calculateHeatNodeTransportLoss_kW]]></Name>
+		<X>840</X>
+		<Y>200</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[latConnectedGN]]></Name>
+			<Type><![CDATA[double]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[lonConnectedGN]]></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>1781700026205</Id>
+		<Name><![CDATA[f_sumLoads]]></Name>
+		<X>820</X>
+		<Y>180</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
diff --git a/_alp/Agents/GridNode/Levels/Level.level.xml b/_alp/Agents/GridNode/Levels/Level.level.xml
index 6b2ff18c..4cf6e66c 100644
--- a/_alp/Agents/GridNode/Levels/Level.level.xml
+++ b/_alp/Agents/GridNode/Levels/Level.level.xml
@@ -56,7 +56,7 @@
 	<Text>
 		<Id>1670316967152</Id>
 		<Name><![CDATA[text4]]></Name>
-		<X>820</X>
+		<X>850</X>
 		<Y>20</Y>
 		<Label>
 			<X>0</X>
@@ -81,7 +81,7 @@
 	<Line>
 		<Id>1670316967156</Id>
 		<Name><![CDATA[line4]]></Name>
-		<X>770</X>
+		<X>800</X>
 		<Y>40</Y>
 		<Label>
 			<X>10</X>
@@ -110,7 +110,7 @@
 		<Id>1670317019803</Id>
 		<Name><![CDATA[line7]]></Name>
 		<X>400</X>
-		<Y>470</Y>
+		<Y>520</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -138,7 +138,7 @@
 		<Id>1670317019806</Id>
 		<Name><![CDATA[text7]]></Name>
 		<X>450</X>
-		<Y>450</Y>
+		<Y>500</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -159,61 +159,6 @@
 		</Font>
 		<Alignment>LEFT</Alignment>
 	</Text>
-	<Line>
-		<Id>1670317049666</Id>
-		<Name><![CDATA[line1]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>300</X>
-		<Y>40</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>true</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>false</ShowLabel>
-		<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
-		<EmbeddedIcon>false</EmbeddedIcon>
-		<Z>0</Z>
-		<ZHeight>10</ZHeight>
-		<LineWidth>1</LineWidth>
-		<LineColor>-16777216</LineColor>
-		<LineMaterial>null</LineMaterial>
-		<LineStyle>SOLID</LineStyle>
-		<BeginArrowSize>1</BeginArrowSize>
-		<BeginArrowStyle>0</BeginArrowStyle>
-		<EndArrowSize>1</EndArrowSize>
-		<EndArrowStyle>0</EndArrowStyle>
-		<Dx>140</Dx>
-		<Dy>0</Dy>
-		<Dz>0</Dz>
-	</Line>
-	<Text>
-		<Id>1670317049669</Id>
-		<Name><![CDATA[text1]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>350</X>
-		<Y>20</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[Assets]]></Text>
-		<Font>
-			<Name><![CDATA[SansSerif]]></Name>
-			<Size>11</Size>
-			<Style>0</Style>
-		</Font>
-		<Alignment>LEFT</Alignment>
-	</Text>
 	<Line>
 		<Id>1670317065284</Id>
 		<Name><![CDATA[line2]]></Name>
@@ -271,8 +216,8 @@
 		<Id>1670317113685</Id>
 		<Name><![CDATA[plot]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>270</X>
-		<Y>180</Y>
+		<X>1380</X>
+		<Y>420</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
diff --git a/_alp/Agents/GridNode/Variables.xml b/_alp/Agents/GridNode/Variables.xml
index 16092492..61ec8dcf 100644
--- a/_alp/Agents/GridNode/Variables.xml
+++ b/_alp/Agents/GridNode/Variables.xml
@@ -4,7 +4,7 @@
 		<Id>1665061187538</Id>
 		<Name><![CDATA[v_congested]]></Name>
 		<X>50</X>
-		<Y>640</Y>
+		<Y>670</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -26,7 +26,7 @@
 		<Id>1666594510176</Id>
 		<Name><![CDATA[v_congestionMode]]></Name>
 		<X>50</X>
-		<Y>660</Y>
+		<Y>690</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -52,7 +52,7 @@
 @author: Jorrit
 @since: 27-10-2022]]></Description>
 		<X>400</X>
-		<Y>500</Y>
+		<Y>550</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -80,7 +80,7 @@ geupdate vanuit
 @since: 27-10-2022]]></Description>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>400</X>
-		<Y>540</Y>
+		<Y>590</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -107,7 +107,7 @@ geupdate vanuit
 @since: 27-10-2022]]></Description>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>400</X>
-		<Y>520</Y>
+		<Y>570</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -129,7 +129,7 @@ geupdate vanuit
 		<Id>1667553127377</Id>
 		<Name><![CDATA[v_timeOfPeakPosLoadFiltered_h]]></Name>
 		<X>400</X>
-		<Y>560</Y>
+		<Y>610</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -148,7 +148,7 @@ geupdate vanuit
 		<Id>1668600984923</Id>
 		<Name><![CDATA[v_currentLoadElectricityLowPassed_kW]]></Name>
 		<X>50</X>
-		<Y>581</Y>
+		<Y>611</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -170,7 +170,7 @@ geupdate vanuit
 		<Id>1668603168061</Id>
 		<Name><![CDATA[v_lowPassFactor_fr]]></Name>
 		<X>50</X>
-		<Y>561</Y>
+		<Y>591</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -196,7 +196,7 @@ geupdate vanuit
 @author: Jorrit
 @since: 27-10-2022]]></Description>
 		<X>400</X>
-		<Y>660</Y>
+		<Y>710</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -218,7 +218,7 @@ geupdate vanuit
 		<Id>1670405904360</Id>
 		<Name><![CDATA[v_timeOfPeakLoadFiltered_h]]></Name>
 		<X>400</X>
-		<Y>680</Y>
+		<Y>730</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -241,7 +241,7 @@ geupdate vanuit
 @author: Jorrit
 @since: 27-10-2022]]></Description>
 		<X>400</X>
-		<Y>600</Y>
+		<Y>650</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -267,7 +267,7 @@ geupdate vanuit
 @author: Jorrit
 @since: 27-10-2022]]></Description>
 		<X>400</X>
-		<Y>620</Y>
+		<Y>670</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -289,7 +289,7 @@ geupdate vanuit
 		<Id>1672304151508</Id>
 		<Name><![CDATA[v_timeOfPeakNegLoadFiltered_h]]></Name>
 		<X>400</X>
-		<Y>580</Y>
+		<Y>630</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -308,7 +308,7 @@ geupdate vanuit
 		<Id>1675683578599</Id>
 		<Name><![CDATA[v_currentCongestionPrice_eurpkWh]]></Name>
 		<X>50</X>
-		<Y>680</Y>
+		<Y>710</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -327,7 +327,7 @@ geupdate vanuit
 		<Id>1689233711411</Id>
 		<Name><![CDATA[v_filteredLoadCongestionPricing_kW]]></Name>
 		<X>50</X>
-		<Y>720</Y>
+		<Y>750</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -346,7 +346,7 @@ geupdate vanuit
 		<Id>1689234315318</Id>
 		<Name><![CDATA[v_lowPassFactorCongestionPricing_fr]]></Name>
 		<X>50</X>
-		<Y>700</Y>
+		<Y>730</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -368,7 +368,7 @@ geupdate vanuit
 		<Id>1696857656646</Id>
 		<Name><![CDATA[v_totalTimeOverloaded_h]]></Name>
 		<X>400</X>
-		<Y>700</Y>
+		<Y>750</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -698,7 +698,7 @@ geupdate vanuit
 		<Id>1718111648009</Id>
 		<Name><![CDATA[acc_annualElectricityBalance_kW]]></Name>
 		<X>400</X>
-		<Y>790</Y>
+		<Y>840</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -717,7 +717,7 @@ geupdate vanuit
 		<Id>1718895936296</Id>
 		<Name><![CDATA[v_currentLocalNodalPrice_eurpkWh]]></Name>
 		<X>50</X>
-		<Y>770</Y>
+		<Y>800</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -736,7 +736,7 @@ geupdate vanuit
 		<Id>1718895937973</Id>
 		<Name><![CDATA[v_currentTotalNodalPrice_eurpkWh]]></Name>
 		<X>50</X>
-		<Y>790</Y>
+		<Y>820</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -756,7 +756,7 @@ geupdate vanuit
 		<Name><![CDATA[v_currentParentNodalPrice_eurpkWh]]></Name>
 		<Description><![CDATA[Given a default value for 'top' agents, this can be seen as average market price of electricity.]]></Description>
 		<X>50</X>
-		<Y>750</Y>
+		<Y>780</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -777,8 +777,8 @@ geupdate vanuit
 	<Variable Class="PlainVariable">
 		<Id>1719300900648</Id>
 		<Name><![CDATA[v_totalInstalledWindPower_kW]]></Name>
-		<X>1044</X>
-		<Y>344</Y>
+		<X>824</X>
+		<Y>584</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -799,8 +799,8 @@ geupdate vanuit
 	<Variable Class="PlainVariable">
 		<Id>1719300900650</Id>
 		<Name><![CDATA[v_totalInstalledPVPower_kW]]></Name>
-		<X>1044</X>
-		<Y>364</Y>
+		<X>824</X>
+		<Y>604</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -821,8 +821,8 @@ geupdate vanuit
 	<Variable Class="PlainVariable">
 		<Id>1719301262027</Id>
 		<Name><![CDATA[v_electricityYieldForecast_fr]]></Name>
-		<X>1044</X>
-		<Y>382</Y>
+		<X>824</X>
+		<Y>622</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -845,7 +845,7 @@ geupdate vanuit
 		<Name><![CDATA[acc_DLR_kW]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>400</X>
-		<Y>810</Y>
+		<Y>860</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -867,7 +867,7 @@ geupdate vanuit
 		<Id>1722498291003</Id>
 		<Name><![CDATA[v_currentDLRCapacity_kW]]></Name>
 		<X>50</X>
-		<Y>610</Y>
+		<Y>640</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -889,7 +889,7 @@ geupdate vanuit
 		<Id>1730975924463</Id>
 		<Name><![CDATA[v_currentLoad_kW]]></Name>
 		<X>50</X>
-		<Y>530</Y>
+		<Y>540</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1197,8 +1197,8 @@ geupdate vanuit
 	<Variable Class="PlainVariable">
 		<Id>1758209121923</Id>
 		<Name><![CDATA[v_currentChargingPowerBalancingThisGN_kW]]></Name>
-		<X>810</X>
-		<Y>630</Y>
+		<X>780</X>
+		<Y>790</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1219,8 +1219,8 @@ geupdate vanuit
 	<Variable Class="PlainVariable">
 		<Id>1758209124347</Id>
 		<Name><![CDATA[v_currentNumberOfChargeRequestsBalancingThisGN]]></Name>
-		<X>810</X>
-		<Y>670</Y>
+		<X>780</X>
+		<Y>830</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1242,8 +1242,8 @@ geupdate vanuit
 		<Id>1758209126431</Id>
 		<Name><![CDATA[v_nextNumberOfChargingChargePoints]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>810</X>
-		<Y>720</Y>
+		<X>780</X>
+		<Y>880</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1261,8 +1261,8 @@ geupdate vanuit
 	<Variable Class="PlainVariable">
 		<Id>1758536215526</Id>
 		<Name><![CDATA[v_lowPassedLoadFilter_kW]]></Name>
-		<X>810</X>
-		<Y>750</Y>
+		<X>780</X>
+		<Y>910</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1284,7 +1284,7 @@ geupdate vanuit
 		<Id>1774261505840</Id>
 		<Name><![CDATA[acc_annualHeatBalance_kW]]></Name>
 		<X>400</X>
-		<Y>840</Y>
+		<Y>890</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1299,6 +1299,28 @@ geupdate vanuit
 			<Type><![CDATA[ZeroAccumulator]]></Type>
 		</Properties>
 	</Variable>
+	<Variable Class="PlainVariable">
+		<Id>1781702519741</Id>
+		<Name><![CDATA[v_currentLoss_kW]]></Name>
+		<X>70</X>
+		<Y>560</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true"
+              Constant="false"
+              AccessType="public"
+              StaticVariable="false">
+			<Type><![CDATA[double]]></Type>
+			<InitialValue Class="CodeValue">
+				<Code><![CDATA[0]]></Code>
+			</InitialValue>
+		</Properties>
+	</Variable>
 	<Variable Class="Parameter">
 		<Id>1658477613290</Id>
 		<Name><![CDATA[p_gridNodeID]]></Name>
@@ -1837,7 +1859,7 @@ geupdate vanuit
 	<Variable Class="Parameter">
 		<Id>1726583647250</Id>
 		<Name><![CDATA[p_originalCapacity_kW]]></Name>
-		<X>170</X>
+		<X>190</X>
 		<Y>160</Y>
 		<Label>
 			<X>10</X>
@@ -1887,69 +1909,11 @@ geupdate vanuit
 			</ParameterEditor>
 		</Properties>
 	</Variable>
-	<Variable Class="CollectionVariable">
-		<Id>1664536960213</Id>
-		<Name><![CDATA[c_connectedEnergyAssets]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>290</X>
-		<Y>60</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Properties SaveInSnapshot="true" AccessType="default" StaticVariable="false">
-			<CollectionClass>ArrayList</CollectionClass>
-			<ElementClass>J_EA</ElementClass>
-			<ValueElementClass>String</ValueElementClass>
-		</Properties>
-	</Variable>
-	<Variable Class="CollectionVariable">
-		<Id>1664536960219</Id>
-		<Name><![CDATA[c_connectedStorageAssets]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>300</X>
-		<Y>120</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Properties SaveInSnapshot="true" AccessType="default" StaticVariable="false">
-			<CollectionClass>ArrayList</CollectionClass>
-			<ElementClass>J_EAStorage</ElementClass>
-			<ValueElementClass>String</ValueElementClass>
-		</Properties>
-	</Variable>
-	<Variable Class="CollectionVariable">
-		<Id>1664536960221</Id>
-		<Name><![CDATA[c_connectedConsumptionAssets]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>300</X>
-		<Y>80</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Properties SaveInSnapshot="true" AccessType="default" StaticVariable="false">
-			<CollectionClass>ArrayList</CollectionClass>
-			<ElementClass>J_EAConsumption</ElementClass>
-			<ValueElementClass>String</ValueElementClass>
-		</Properties>
-	</Variable>
-	<Variable Class="CollectionVariable">
-		<Id>1664536960223</Id>
-		<Name><![CDATA[c_connectedProductionAssets]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>300</X>
-		<Y>100</Y>
+	<Variable Class="Parameter">
+		<Id>1781699037581</Id>
+		<Name><![CDATA[p_heatLossFactorDistribution_kW]]></Name>
+		<X>860</X>
+		<Y>240</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1957,18 +1921,27 @@ geupdate vanuit
 		<PublicFlag>false</PublicFlag>
 		<PresentationFlag>true</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
-		<Properties SaveInSnapshot="true" AccessType="default" StaticVariable="false">
-			<CollectionClass>ArrayList</CollectionClass>
-			<ElementClass>J_EAProduction</ElementClass>
-			<ValueElementClass>String</ValueElementClass>
+		<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>1781699037579</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
 		</Properties>
 	</Variable>
-	<Variable Class="CollectionVariable">
-		<Id>1664536960226</Id>
-		<Name><![CDATA[c_connectedConversionAssets]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>300</X>
-		<Y>140</Y>
+	<Variable Class="Parameter">
+		<Id>1781701119436</Id>
+		<Name><![CDATA[p_heatLossFactorTransport_kWpm]]></Name>
+		<X>860</X>
+		<Y>220</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1976,16 +1949,26 @@ geupdate vanuit
 		<PublicFlag>false</PublicFlag>
 		<PresentationFlag>true</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
-		<Properties SaveInSnapshot="true" AccessType="default" StaticVariable="false">
-			<CollectionClass>ArrayList</CollectionClass>
-			<ElementClass>J_EAConversion</ElementClass>
-			<ValueElementClass>String</ValueElementClass>
+		<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>1781701119434</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
 		</Properties>
 	</Variable>
 	<Variable Class="CollectionVariable">
 		<Id>1666560357503</Id>
 		<Name><![CDATA[c_connectedGridConnections]]></Name>
-		<X>540</X>
+		<X>410</X>
 		<Y>80</Y>
 		<Label>
 			<X>10</X>
@@ -1994,7 +1977,7 @@ geupdate vanuit
 		<PublicFlag>false</PublicFlag>
 		<PresentationFlag>true</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
-		<Properties SaveInSnapshot="true" AccessType="default" StaticVariable="false">
+		<Properties SaveInSnapshot="true" AccessType="private" StaticVariable="false">
 			<CollectionClass>ArrayList</CollectionClass>
 			<ElementClass>GridConnection</ElementClass>
 			<ValueElementClass>String</ValueElementClass>
@@ -2003,7 +1986,7 @@ geupdate vanuit
 	<Variable Class="CollectionVariable">
 		<Id>1676567375230</Id>
 		<Name><![CDATA[c_energyCoops]]></Name>
-		<X>540</X>
+		<X>410</X>
 		<Y>100</Y>
 		<Label>
 			<X>10</X>
@@ -2012,7 +1995,7 @@ geupdate vanuit
 		<PublicFlag>false</PublicFlag>
 		<PresentationFlag>true</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
-		<Properties SaveInSnapshot="true" AccessType="default" StaticVariable="false">
+		<Properties SaveInSnapshot="true" AccessType="private" StaticVariable="false">
 			<CollectionClass>ArrayList</CollectionClass>
 			<ElementClass>EnergyCoop</ElementClass>
 			<ValueElementClass>String</ValueElementClass>
@@ -2021,7 +2004,7 @@ geupdate vanuit
 	<Variable Class="CollectionVariable">
 		<Id>1716885463799</Id>
 		<Name><![CDATA[c_connectedGridNodes]]></Name>
-		<X>540</X>
+		<X>410</X>
 		<Y>60</Y>
 		<Label>
 			<X>10</X>
@@ -2030,7 +2013,7 @@ geupdate vanuit
 		<PublicFlag>false</PublicFlag>
 		<PresentationFlag>true</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
-		<Properties SaveInSnapshot="true" AccessType="default" StaticVariable="false">
+		<Properties SaveInSnapshot="true" AccessType="private" StaticVariable="false">
 			<CollectionClass>ArrayList</CollectionClass>
 			<ElementClass>GridNode</ElementClass>
 			<ValueElementClass>String</ValueElementClass>
diff --git a/_alp/Classes/Class.GISUtil.java b/_alp/Classes/Class.GISUtil.java
new file mode 100644
index 00000000..974fc822
--- /dev/null
+++ b/_alp/Classes/Class.GISUtil.java
@@ -0,0 +1,11 @@
+/**
+ * GISUtil
+ */	
+public class GISUtil {
+	public static double calculateManhattanDistance_m(double latitude1, double longitude1, double latitude2, double longitude2) {
+		double latDist_m = getDistanceGIS(latitude1, longitude1, latitude2, longitude1); //Use anylogic getDistanceGIS function for point 1 
+		double longDist_m = getDistanceGIS(latitude2, longitude1, latitude2, longitude2); //Use anylogic getDistanceGIS function
+		double totalDist_m = latDist_m + longDist_m;
+		return totalDist_m;
+	}
+}
\ No newline at end of file
diff --git a/_alp/Classes/Class.J_HeatingManagementDistrictHeating.java b/_alp/Classes/Class.J_HeatingManagementDistrictHeating.java
index 99bf89a0..34eb0e5c 100644
--- a/_alp/Classes/Class.J_HeatingManagementDistrictHeating.java
+++ b/_alp/Classes/Class.J_HeatingManagementDistrictHeating.java
@@ -51,14 +51,30 @@ public void manageHeating(J_TimeVariables timeVariables) {
     	if ( !isInitialized ) {
     		this.initializeAssets();
     	}
-    	// v_currentLoad_kW is the GN load of the previous timestep
-    	double heatTransferToNetwork_kW = max(0, gc.p_parentNodeHeat.v_currentLoad_kW + previousHeatFeedin_kW);
-    	if (heatTransferToNetwork_kW > heatingAsset.getOutputCapacity_kW()) {
+
+    	double currentHeatrequest_kW = calculateCurrentHeatBalanceOnHeatGrid_kW(timeVariables);
+    	if (currentHeatrequest_kW > heatingAsset.getOutputCapacity_kW()) {
     		throw new RuntimeException("Heating asset in " + this.getClass() + " does not have sufficient capacity.");
     	}
-    	gc.f_updateFlexAssetFlows(heatingAsset, heatTransferToNetwork_kW / heatingAsset.getOutputCapacity_kW(), timeVariables);
-
-    	previousHeatFeedin_kW = -gc.fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.HEAT);
+    	gc.f_updateFlexAssetFlows(heatingAsset, currentHeatrequest_kW / heatingAsset.getOutputCapacity_kW(), timeVariables);
+    }
+    
+    private double calculateCurrentHeatBalanceOnHeatGrid_kW(J_TimeVariables timeVariables) {
+    	List<GridConnection> allLowerLVLConsumerGridConnections = findAll(gc.p_parentNodeHeat.f_getAllLowerLVLConnectedGridConnections(), lowerLVLGC -> !(lowerLVLGC instanceof GCDistrictHeating));
+    	//Heat consumption
+    	double currentHeatrequest_kW = sum(allLowerLVLConsumerGridConnections, lowerLVLGC -> lowerLVLGC.fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.HEAT));
+    	
+    	//Heat distribution to consumer losses
+    	currentHeatrequest_kW += sum(allLowerLVLConsumerGridConnections, lowerLVLGC -> lowerLVLGC.p_parentNodeHeat.p_heatLossFactorDistribution_kW);
+    	
+    	//Heat transport to heatnodes losses
+    	List<GridNode> transportNodes = findAll(gc.p_parentNodeHeat.f_getLowerLVLConnectedGridNodes(), lowerLVLGN -> lowerLVLGN.f_getConnectedGridNodes().size()>0);
+		for(GridNode transportNode : transportNodes) {
+			for(GridNode childHeatNode : transportNode.f_getConnectedGridNodes()) {
+				currentHeatrequest_kW += transportNode.f_calculateHeatNodeTransportLoss_kW(childHeatNode.p_latitude, childHeatNode.p_longitude);
+			}
+		}
+		return currentHeatrequest_kW;
     }
     
     public void initializeAssets() {