diff --git a/Zero_engine.alpx b/Zero_engine.alpx
index 43084e2d..53a63dad 100644
--- a/Zero_engine.alpx
+++ b/Zero_engine.alpx
@@ -985,6 +985,10 @@
 					<Id>1742557314771</Id>
 					<Name><![CDATA[BALANCE_COOP]]></Name>
 				</Option>
+				<Option>
+					<Id>1750764233265</Id>
+					<Name><![CDATA[PEAK_SHAVING_SIMPLE]]></Name>
+				</Option>
 				<Option>
 					<Id>1734001947459</Id>
 					<Name><![CDATA[OFF]]></Name>
diff --git a/_alp/Agents/EnergyModel/EmbeddedObjects.xml b/_alp/Agents/EnergyModel/EmbeddedObjects.xml
index b7f29616..5cc307f4 100644
--- a/_alp/Agents/EnergyModel/EmbeddedObjects.xml
+++ b/_alp/Agents/EnergyModel/EmbeddedObjects.xml
@@ -147,9 +147,6 @@
 			</GenericParameterSubstituteReference>
 		</GenericParameterSubstitute>
 		<Parameters>
-			<Parameter>
-				<Name><![CDATA[p_energyAssetList]]></Name>
-			</Parameter>
 			<Parameter>
 				<Name><![CDATA[p_gridConnectionCategory]]></Name>
 			</Parameter>
@@ -1033,9 +1030,6 @@
 			<Parameter>
 				<Name><![CDATA[p_heatingType]]></Name>
 			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_energyAssetList]]></Name>
-			</Parameter>
 			<Parameter>
 				<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
 			</Parameter>
@@ -1230,9 +1224,6 @@
 			<Parameter>
 				<Name><![CDATA[p_heatingType]]></Name>
 			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_energyAssetList]]></Name>
-			</Parameter>
 			<Parameter>
 				<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
 			</Parameter>
@@ -1391,9 +1382,6 @@
 			<Parameter>
 				<Name><![CDATA[p_heatingType]]></Name>
 			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_energyAssetList]]></Name>
-			</Parameter>
 			<Parameter>
 				<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
 			</Parameter>
@@ -1552,9 +1540,6 @@
 			<Parameter>
 				<Name><![CDATA[p_heatingType]]></Name>
 			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_energyAssetList]]></Name>
-			</Parameter>
 			<Parameter>
 				<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
 			</Parameter>
@@ -1749,9 +1734,6 @@
 			<Parameter>
 				<Name><![CDATA[p_heatingType]]></Name>
 			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_energyAssetList]]></Name>
-			</Parameter>
 			<Parameter>
 				<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
 			</Parameter>
@@ -1901,9 +1883,6 @@
 			<Parameter>
 				<Name><![CDATA[p_heatingType]]></Name>
 			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_energyAssetList]]></Name>
-			</Parameter>
 			<Parameter>
 				<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
 			</Parameter>
@@ -2056,9 +2035,6 @@
 			<Parameter>
 				<Name><![CDATA[p_heatingType]]></Name>
 			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_energyAssetList]]></Name>
-			</Parameter>
 			<Parameter>
 				<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
 			</Parameter>
@@ -2529,9 +2505,6 @@
 			<Parameter>
 				<Name><![CDATA[p_heatingType]]></Name>
 			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_energyAssetList]]></Name>
-			</Parameter>
 			<Parameter>
 				<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
 			</Parameter>
@@ -2721,9 +2694,6 @@
 			<Parameter>
 				<Name><![CDATA[p_heatingType]]></Name>
 			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_energyAssetList]]></Name>
-			</Parameter>
 			<Parameter>
 				<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
 			</Parameter>
diff --git a/_alp/Agents/GCDistrictHeating/AOC.GCDistrictHeating.xml b/_alp/Agents/GCDistrictHeating/AOC.GCDistrictHeating.xml
index af287861..3c49fd91 100644
--- a/_alp/Agents/GCDistrictHeating/AOC.GCDistrictHeating.xml
+++ b/_alp/Agents/GCDistrictHeating/AOC.GCDistrictHeating.xml
@@ -35,9 +35,6 @@
 		<Parameter>
 			<Name><![CDATA[p_heatingType]]></Name>
 		</Parameter>
-		<Parameter>
-			<Name><![CDATA[p_energyAssetList]]></Name>
-		</Parameter>
 		<Parameter>
 			<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
 		</Parameter>
diff --git a/_alp/Agents/GCEnergyConversion/AOC.GCEnergyConversion.xml b/_alp/Agents/GCEnergyConversion/AOC.GCEnergyConversion.xml
index 9d021323..d8ee7f63 100644
--- a/_alp/Agents/GCEnergyConversion/AOC.GCEnergyConversion.xml
+++ b/_alp/Agents/GCEnergyConversion/AOC.GCEnergyConversion.xml
@@ -39,9 +39,6 @@
 		<Parameter>
 			<Name><![CDATA[p_heatingType]]></Name>
 		</Parameter>
-		<Parameter>
-			<Name><![CDATA[p_energyAssetList]]></Name>
-		</Parameter>
 		<Parameter>
 			<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
 		</Parameter>
diff --git a/_alp/Agents/GCEnergyProduction/AOC.GCEnergyProduction.xml b/_alp/Agents/GCEnergyProduction/AOC.GCEnergyProduction.xml
index 72712445..6ecd1d50 100644
--- a/_alp/Agents/GCEnergyProduction/AOC.GCEnergyProduction.xml
+++ b/_alp/Agents/GCEnergyProduction/AOC.GCEnergyProduction.xml
@@ -35,9 +35,6 @@
 		<Parameter>
 			<Name><![CDATA[p_heatingType]]></Name>
 		</Parameter>
-		<Parameter>
-			<Name><![CDATA[p_energyAssetList]]></Name>
-		</Parameter>
 		<Parameter>
 			<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
 		</Parameter>
diff --git a/_alp/Agents/GCGridBattery/AOC.GCGridBattery.xml b/_alp/Agents/GCGridBattery/AOC.GCGridBattery.xml
index f816ed62..c1057bf9 100644
--- a/_alp/Agents/GCGridBattery/AOC.GCGridBattery.xml
+++ b/_alp/Agents/GCGridBattery/AOC.GCGridBattery.xml
@@ -35,9 +35,6 @@
 		<Parameter>
 			<Name><![CDATA[p_heatingType]]></Name>
 		</Parameter>
-		<Parameter>
-			<Name><![CDATA[p_energyAssetList]]></Name>
-		</Parameter>
 		<Parameter>
 			<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
 		</Parameter>
diff --git a/_alp/Agents/GCHouse/AOC.GCHouse.xml b/_alp/Agents/GCHouse/AOC.GCHouse.xml
index cd91971e..166ed7ec 100644
--- a/_alp/Agents/GCHouse/AOC.GCHouse.xml
+++ b/_alp/Agents/GCHouse/AOC.GCHouse.xml
@@ -35,9 +35,6 @@
 		<Parameter>
 			<Name><![CDATA[p_heatingType]]></Name>
 		</Parameter>
-		<Parameter>
-			<Name><![CDATA[p_energyAssetList]]></Name>
-		</Parameter>
 		<Parameter>
 			<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
 		</Parameter>
diff --git a/_alp/Agents/GCIndustry/AOC.GCIndustry.xml b/_alp/Agents/GCIndustry/AOC.GCIndustry.xml
index d321ef73..b1690abc 100644
--- a/_alp/Agents/GCIndustry/AOC.GCIndustry.xml
+++ b/_alp/Agents/GCIndustry/AOC.GCIndustry.xml
@@ -35,9 +35,6 @@
 		<Parameter>
 			<Name><![CDATA[p_heatingType]]></Name>
 		</Parameter>
-		<Parameter>
-			<Name><![CDATA[p_energyAssetList]]></Name>
-		</Parameter>
 		<Parameter>
 			<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
 		</Parameter>
diff --git a/_alp/Agents/GCNeighborhood/AOC.GCNeighborhood.xml b/_alp/Agents/GCNeighborhood/AOC.GCNeighborhood.xml
index 66fb1ee7..f883d0fa 100644
--- a/_alp/Agents/GCNeighborhood/AOC.GCNeighborhood.xml
+++ b/_alp/Agents/GCNeighborhood/AOC.GCNeighborhood.xml
@@ -38,9 +38,6 @@
 		<Parameter>
 			<Name><![CDATA[p_heatingType]]></Name>
 		</Parameter>
-		<Parameter>
-			<Name><![CDATA[p_energyAssetList]]></Name>
-		</Parameter>
 		<Parameter>
 			<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
 		</Parameter>
diff --git a/_alp/Agents/GCPublicCharger/AOC.GCPublicCharger.xml b/_alp/Agents/GCPublicCharger/AOC.GCPublicCharger.xml
index 914b70d7..fc369d4c 100644
--- a/_alp/Agents/GCPublicCharger/AOC.GCPublicCharger.xml
+++ b/_alp/Agents/GCPublicCharger/AOC.GCPublicCharger.xml
@@ -38,9 +38,6 @@
 		<Parameter>
 			<Name><![CDATA[p_heatingType]]></Name>
 		</Parameter>
-		<Parameter>
-			<Name><![CDATA[p_energyAssetList]]></Name>
-		</Parameter>
 		<Parameter>
 			<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
 		</Parameter>
diff --git a/_alp/Agents/GCUtility/AOC.GCUtility.xml b/_alp/Agents/GCUtility/AOC.GCUtility.xml
index b4dfd071..dd79c930 100644
--- a/_alp/Agents/GCUtility/AOC.GCUtility.xml
+++ b/_alp/Agents/GCUtility/AOC.GCUtility.xml
@@ -38,9 +38,6 @@
 		<Parameter>
 			<Name><![CDATA[p_heatingType]]></Name>
 		</Parameter>
-		<Parameter>
-			<Name><![CDATA[p_energyAssetList]]></Name>
-		</Parameter>
 		<Parameter>
 			<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
 		</Parameter>
diff --git a/_alp/Agents/GCUtility/Code/Functions.java b/_alp/Agents/GCUtility/Code/Functions.java
index 2d70c49e..a5adc7b0 100644
--- a/_alp/Agents/GCUtility/Code/Functions.java
+++ b/_alp/Agents/GCUtility/Code/Functions.java
@@ -23,6 +23,9 @@
 			case NODAL_PRICING:
 				f_batteryManagementNodalPricing(p_batteryAsset.getCurrentStateOfCharge());
 				break;
+			case PEAK_SHAVING_SIMPLE:
+				f_batteryManagementPeakShaving();
+				break;
 		}
 		
 		p_batteryAsset.f_updateAllFlows(p_batteryAsset.v_powerFraction_fr);
diff --git a/_alp/Agents/GridConnection/AOC.GridConnection.xml b/_alp/Agents/GridConnection/AOC.GridConnection.xml
index 7bb2fb98..d12ab29e 100644
--- a/_alp/Agents/GridConnection/AOC.GridConnection.xml
+++ b/_alp/Agents/GridConnection/AOC.GridConnection.xml
@@ -120,7 +120,6 @@ v_liveData.assetsMetaData = v_liveAssetsMetaData;
 	<CurrentLevel>1658499438202</CurrentLevel>
 	<ConnectionsId>1658499438198</ConnectionsId>
 	<Variables xmlns:al="http://anylogic.com"/>
-	<Events xmlns:al="http://anylogic.com"/>
 	<Functions xmlns:al="http://anylogic.com"/>
 	<AgentLinks>
 		<AgentLink>
@@ -147,79 +146,6 @@ v_liveData.assetsMetaData = v_liveAssetsMetaData;
 			<LineArrow>NONE</LineArrow>
 			<LineArrowPosition>END</LineArrowPosition>
 		</AgentLink>
-		<AgentLink>
-			<Id>1658499472169</Id>
-			<Name><![CDATA[superConnection]]></Name>
-			<ExcludeFromBuild>true</ExcludeFromBuild>
-			<X>40</X>
-			<Y>-90</Y>
-			<Label>
-				<X>15</X>
-				<Y>0</Y>
-			</Label>
-			<PublicFlag>false</PublicFlag>
-			<PresentationFlag>true</PresentationFlag>
-			<ShowLabel>true</ShowLabel>
-			<HandleReceiveInConnections>false</HandleReceiveInConnections>
-			<AgentLinkType>COLLECTION_OF_LINKS</AgentLinkType>
-			<AgentLinkBidirectional>false</AgentLinkBidirectional>
-			<MessageType>Object</MessageType>
-			<LineStyle>SOLID</LineStyle>
-			<LineWidth>1</LineWidth>
-			<LineColor>-16777216</LineColor>
-			<LineZOrder>UNDER_AGENTS</LineZOrder>
-			<LineArrow>NONE</LineArrow>
-			<LineArrowPosition>END</LineArrowPosition>
-		</AgentLink>
-		<AgentLink>
-			<Id>1658499483833</Id>
-			<Name><![CDATA[assetLinks]]></Name>
-			<ExcludeFromBuild>true</ExcludeFromBuild>
-			<X>40</X>
-			<Y>-170</Y>
-			<Label>
-				<X>15</X>
-				<Y>0</Y>
-			</Label>
-			<PublicFlag>false</PublicFlag>
-			<PresentationFlag>true</PresentationFlag>
-			<ShowLabel>true</ShowLabel>
-			<HandleReceiveInConnections>false</HandleReceiveInConnections>
-			<AgentLinkType>COLLECTION_OF_LINKS</AgentLinkType>
-			<AgentLinkBidirectional>false</AgentLinkBidirectional>
-			<MessageType>Object</MessageType>
-			<LineStyle>SOLID</LineStyle>
-			<LineWidth>1</LineWidth>
-			<LineColor>-16777216</LineColor>
-			<LineZOrder>UNDER_AGENTS</LineZOrder>
-			<LineArrow>NONE</LineArrow>
-			<LineArrowPosition>END</LineArrowPosition>
-		</AgentLink>
-		<AgentLink>
-			<Id>1704894941623</Id>
-			<Name><![CDATA[l_connectedBuildings]]></Name>
-			<ExcludeFromBuild>true</ExcludeFromBuild>
-			<X>40</X>
-			<Y>-20</Y>
-			<Label>
-				<X>15</X>
-				<Y>0</Y>
-			</Label>
-			<PublicFlag>false</PublicFlag>
-			<PresentationFlag>true</PresentationFlag>
-			<ShowLabel>true</ShowLabel>
-			<HandleReceiveInConnections>false</HandleReceiveInConnections>
-			<AgentLinkType>COLLECTION_OF_LINKS</AgentLinkType>
-			<AgentReferenceId>1676382560905</AgentReferenceId>
-			<AgentLinkBidirectional>false</AgentLinkBidirectional>
-			<MessageType>Object</MessageType>
-			<LineStyle>SOLID</LineStyle>
-			<LineWidth>1</LineWidth>
-			<LineColor>-16777216</LineColor>
-			<LineZOrder>UNDER_AGENTS</LineZOrder>
-			<LineArrow>NONE</LineArrow>
-			<LineArrowPosition>END</LineArrowPosition>
-		</AgentLink>
 	</AgentLinks>
 	<ContainerLinks>
 		<ContainerLink>
diff --git a/_alp/Agents/GridConnection/Code/Events.java b/_alp/Agents/GridConnection/Code/Events.java
deleted file mode 100644
index 39ec2610..00000000
--- a/_alp/Agents/GridConnection/Code/Events.java
+++ /dev/null
@@ -1,6 +0,0 @@
-void e_initializeLowPassEprice()
-{/*ALCODESTART::1675011317461*/
-v_electricityPriceLowPassed_eurpkWh = v_currentElectricityPriceConsumption_eurpkWh;
-v_currentLoadLowPassed_kW = v_currentPowerElectricity_kW;
-/*ALCODEEND*/}
-
diff --git a/_alp/Agents/GridConnection/Code/Events.xml b/_alp/Agents/GridConnection/Code/Events.xml
deleted file mode 100644
index dc960048..00000000
--- a/_alp/Agents/GridConnection/Code/Events.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Events>
-	<Event>
-		<Id>1675011317461</Id>
-		<Name><![CDATA[e_initializeLowPassEprice]]></Name>
-		<Description><![CDATA[Make sure this is correct, so after the first official timestep has passed]]></Description>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>1120</X>
-		<Y>-80</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>false</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Properties TriggerType="timeout" Mode="occuresOnce">
-			<Timeout Class="CodeUnitValue">
-				<Code><![CDATA[1]]></Code>
-				<Unit Class="TimeUnits">HOUR</Unit>
-			</Timeout>
-			<Rate Class="CodeUnitValue">
-				<Code><![CDATA[1]]></Code>
-				<Unit Class="RateUnits">PER_HOUR</Unit>
-			</Rate>
-			<OccurrenceAtTime>true</OccurrenceAtTime>
-			<OccurrenceDate>1675065600000</OccurrenceDate>
-			<OccurrenceTime Class="CodeUnitValue">
-				<Code><![CDATA[energyModel.p_timeStep_h*60+1]]></Code>
-				<Unit Class="TimeUnits">MINUTE</Unit>
-			</OccurrenceTime>
-			<RecurrenceCode Class="CodeUnitValue">
-				<Code><![CDATA[1]]></Code>
-				<Unit Class="TimeUnits">HOUR</Unit>
-			</RecurrenceCode>
-			<Condition>false</Condition>
-		</Properties>
-		<Action xmlns:al="http://anylogic.com"/>
-	</Event>
-</Events>
diff --git a/_alp/Agents/GridConnection/Code/Functions.java b/_alp/Agents/GridConnection/Code/Functions.java
index 035a1156..9000e5b1 100644
--- a/_alp/Agents/GridConnection/Code/Functions.java
+++ b/_alp/Agents/GridConnection/Code/Functions.java
@@ -33,94 +33,6 @@
 }*/
 /*ALCODEEND*/}
 
-double f_connectToChild(J_EA ConnectingEnergyAsset)
-{/*ALCODESTART::1658752229618*/
-//assetLinks.connectTo(ConnectingChildNode);
-J_EA j_ea = ConnectingEnergyAsset;
-
-//dont add asset to list if it is not a tangible asset (i.e. a heating model for buildings)
-if( ! (j_ea instanceof J_EAStorageHeat)) {
-	c_energyAssets.add(j_ea);
-}
-if (j_ea instanceof J_EAConsumption ) {
-	if (j_ea instanceof J_EADieselVehicle) {
-		//c_vehicleAssets.add( EA );
-		//c_dieselVehicles.add( EA );
-		//c_vehicleAssets.get( v_vehicleIndex ).v_powerFraction_fr = 1;
-		/*MobilityTracker m = main.add_mobilityTrackers();
-		c_mobilityTrackers.add( m );
-		m.p_vehicleIndex = v_vehicleIndex;
-		m.p_gridConnection = this;
-		m.p_energyAsset = c_vehicleAssets.get( v_vehicleIndex );
-		m.p_vehicleInstance = (J_EADieselVehicle)m.p_energyAsset.j_ea;
-		m.p_vehicleInstance = (J_EADieselVehicle)m.p_vehicleInstance;
-		m.p_mobilityPatternType = OL_MobilityPatternType.TRUCK;
-		((J_EADieselVehicle)m.p_vehicleInstance).setMobilityTracker( m );
-		m.f_getData();*/
-		//v_vehicleIndex ++;
-	}
-	//c_consumptionAssets.add(EA);
-} 
-else if (j_ea instanceof J_EAProduction ) {
-	c_productionAssets.add((J_EAProduction)j_ea);
-} 
-else if (j_ea instanceof J_EAStorage ) {
-	if ( j_ea instanceof J_EAStorageHeat) {
-		if ( ((J_EAStorageHeat)j_ea).heatStorageType == OL_EAStorageTypes.HEATMODEL_BUILDING ) {
-			//p_BuildingThermalAsset = EA; // Obsolete
-		}
-		else if ( ((J_EAStorageHeat)j_ea).heatStorageType == OL_EAStorageTypes.HEATBUFFER ) {
-			//c_storageAssets.add(EA);
-			//p_heatBuffer = EA;
-		}
-	} 
-	else if (j_ea instanceof J_EAStorageElectric) {
-		if(j_ea instanceof J_EAEV && ((J_EAEV)j_ea).getStorageCapacity_kWh() !=0) {
-			//c_storageAssets.add(EA);
-			//c_vehicleAssets.add( EA );
-			//EA.v_powerFraction_fr = 1; //Waarom staat dit op 1? 29-01-23 PH
-			/*MobilityTracker m = main.add_mobilityTrackers();
-			c_mobilityTrackers.add( m );
-			m.p_vehicleIndex = v_vehicleIndex;
-			m.p_gridConnection = this;
-			m.p_energyAsset = EA;
-			m.p_vehicleInstance = (J_EAEV)m.p_energyAsset.j_ea;
- 			m.p_mobilityPatternType = OL_MobilityPatternType.TRUCK;
-			((J_EAEV)m.p_vehicleInstance).setMobilityTracker( m );
-			m.f_getData();*/
-			//v_vehicleIndex ++;
-		}
-		else if (((J_EAStorageElectric)j_ea).getStorageCapacity_kWh() != 0) {
-			//c_storageAssets.add(EA);
-			//p_batteryAsset = EA;
-		}		
-		else{
-			traceln(getName() + "storage asset create that cannot be identified (i.e. its not an EV and not an heatstorage");
-		}
-	}
-} 
-else if (j_ea instanceof J_EAConversion) {
-	c_conversionAssets.add((J_EAConversion)j_ea);
-	if (j_ea instanceof J_EAConversionGasBurner|| j_ea instanceof J_EAConversionHeatPump || j_ea instanceof J_EAConversionHeatDeliverySet ) {
-		if (p_primaryHeatingAsset == null) {
-			p_primaryHeatingAsset = (J_EAConversion)j_ea;
-		} else if (p_secondaryHeatingAsset == null) {
-			p_secondaryHeatingAsset = (J_EAConversion)j_ea;
-		} else {
-			traceln("House " + p_gridConnectionID + " already has two heating systems!");
-		}
-		//traceln("heatingAsset class " + p_spaceHeatingAsset.getClass().toString());
-	}
-	else if (j_ea instanceof J_EAConversionCurtailer || j_ea instanceof J_EAConversionCurtailerHeat) {
-		p_curtailer = (J_EAConversionCurtailer)j_ea;
-	} 
-}
-else {
-	traceln("f_connectToChild in GC: Exception! EnergyAsset " + ConnectingEnergyAsset + " is of unknown type: " + j_ea.energyAssetType);
-	traceln( "TEST");
-}
-/*ALCODEEND*/}
-
 double f_connectionMetering()
 {/*ALCODESTART::1660212665961*/
 if ( abs(fm_currentConsumptionFlows_kW.get(OL_EnergyCarriers.HEAT) - fm_currentProductionFlows_kW.get(OL_EnergyCarriers.HEAT)) > 0.1 && p_parentNodeHeat == null ) {
@@ -143,216 +55,6 @@ else if (j_ea instanceof J_EAConversionCurtailer || j_ea instanceof J_EAConversi
 //Must be overwritten in child agent
 /*ALCODEEND*/}
 
-double f_instantiateEnergyAssets()
-{/*ALCODESTART::1668181559833*/
-//traceln("asset " + p_energyAssetList);
-if( p_energyAssetList != null) {
-	for( JsonNode l : p_energyAssetList ) {
-		OL_EACategories assetCategory = OL_EACategories.valueOf(l.required( "category" ).textValue());
-		OL_EnergyAssetType assetType = OL_EnergyAssetType.valueOf(l.required( "type" ).textValue()) ;
-		String assetName = l.required( "name" ).textValue();	
-		switch( assetCategory )  {
-			case CONSUMPTION:							
-				if ( p_gridConnectionCategory == OL_GridConnectionCategory.HOUSE) {
-					if( assetType.equals("ELECTRICITY_DEMAND") && assetName.contains("TEMPLATE House other electricity demand") ) {
-						assetName = "House_other_electricity"; 
-					} else if (assetType.equals("HOT_WATER_CONSUMPTION")) {				
-						assetName = "House_hot_water";
-					} 
-				}
-											
-				double yearlyDemandElectricity_kWh = l.path( "yearlyDemandElectricity_kWh").doubleValue();
-				double yearlyDemandHeat_kWh = l.path( "yearlyDemandHeat_kWh").doubleValue();
-				double yearlyDemandHydrogen_kWh = l.path( "yearlyDemandHydrogen_kWh").doubleValue();
-				double yearlyDemandMethane_kWh = l.path( "yearlyDemandMethane_kWh").doubleValue();
-				double yearlyDemandDiesel_kWh = l.path( "yearlyDemandDiesel_kWh").doubleValue();
-				double energyConsumption_kWhpkm = l.path( "energyConsumption_kWhpkm" ).doubleValue();
-				double vehicleScaling = l.path("vehicleScaling").asDouble(1.0);
-	
-				if (assetType == OL_EnergyAssetType.DIESEL_VEHICLE) {
-					//traceln("Adding diesel vehicle asset without EnergyAsset agent!");
-					J_EADieselVehicle dieselVehicle = new J_EADieselVehicle(this, energyConsumption_kWhpkm, energyModel.p_timeStep_h, vehicleScaling);
-					f_connectToJ_EA(dieselVehicle);					
-				} else {
-					J_EAConsumption consumptionAsset = new J_EAConsumption(this,assetType,assetName,yearlyDemandElectricity_kWh,yearlyDemandHeat_kWh,yearlyDemandHydrogen_kWh,yearlyDemandMethane_kWh,yearlyDemandDiesel_kWh,energyModel.p_timeStep_h);
-					f_connectToJ_EA(consumptionAsset);						
-				}
-			break;
-			
-			case PRODUCTION:								
-				double capacityElectricity_kW = l.path( "capacityElectricity_kW").doubleValue();
-				double capacityHeat_kW = l.path( "capacityHeat_kW").doubleValue();
-				double yearlyProductionHydrogen_kWh = l.path( "yearlyProductionHydrogen_kWh").doubleValue();
-				double yearlyProductionMethane_kWh = l.path( "yearlyProductionMethane_kWh").doubleValue();
-				double outputTemperature_degC = l.path( "deliveryTemp_degC").doubleValue();
-				
-				J_EAProduction productionAsset = new J_EAProduction ( this, assetType, assetName, capacityElectricity_kW, capacityHeat_kW, yearlyProductionMethane_kWh, yearlyProductionHydrogen_kWh, energyModel.p_timeStep_h, outputTemperature_degC );
-				f_connectToJ_EA(productionAsset);
-			
-				// Determine residual heat delivery temperature from coldest connected asset
-				/*if(this instanceof GCResidualHeat) {					
-					traceln("Residual heat delivery temperature = "+outputTemperature_degC);
-					((GCResidualHeat)this).p_deliveryTemp_degC = outputTemperature_degC < ((GCResidualHeat)this).p_deliveryTemp_degC? outputTemperature_degC : ((GCResidualHeat)this).p_deliveryTemp_degC;
-				}*/
-			break;
-			
-			case CONVERSION:
-				if ( assetType == OL_EnergyAssetType.GAS_PIT || assetType == OL_EnergyAssetType.GAS_BURNER || assetType == OL_EnergyAssetType.METHANE_FURNACE ){
-					// traceln("Adding gaspit!");
-					double capacityHeat_kW1 = l.required( "capacityHeat_kW").doubleValue();
-					double eta_r = l.required( "eta_r").doubleValue();
-					double deliveryTemp_degC1 = 0.0;
-					J_EAConversionGasBurner gasburner = new J_EAConversionGasBurner(this, assetType, capacityHeat_kW1, eta_r, energyModel.p_timeStep_h, deliveryTemp_degC1);
-					f_connectToJ_EA(gasburner);
-				} else if ( assetType == OL_EnergyAssetType.ELECTRIC_HOB){
-					//traceln("Adding electric HOB!");
-					double capacityHeat_kW1 = l.required( "capacityHeat_kW").doubleValue();
-					double eta_r = l.required( "eta_r").doubleValue();
-					double deliveryTemp_degC1 = 0.0;
-					J_EAElectricHob eHOB = new J_EAElectricHob(this, capacityHeat_kW1, eta_r, energyModel.p_timeStep_h, deliveryTemp_degC1);
-					f_connectToJ_EA(eHOB);
-				} else if ( assetType == OL_EnergyAssetType.HEAT_PUMP_AIR || assetType == OL_EnergyAssetType.HEAT_PUMP_GROUND || assetType == OL_EnergyAssetType.HEAT_PUMP_WATER){
-					double capacityElectric_kW = l.path( "capacityElectricity_kW").doubleValue();
-					double eta_r = l.required( "eta_r").doubleValue();
-					double deliveryTemp_degC = l.path( "deliveryTemp_degC" ).doubleValue();
-					String ambientTempType = l.path( "ambientTempType" ).asText();
-					double belowZeroHeatpumpEtaReductionFactor = l.path( "etaReduction_r" ).asDouble(1.0);
-					J_EAConversionHeatPump	heatpump = new J_EAConversionHeatPump( this, energyModel.p_timeStep_h, capacityElectric_kW, eta_r, main.v_currentAmbientTemperature_degC, deliveryTemp_degC, ambientTempType, 0, belowZeroHeatpumpEtaReductionFactor );
-					main.c_ambientAirDependentAssets.add(heatpump);
-					f_connectToJ_EA(heatpump);
-				} else if ( assetType == OL_EnergyAssetType.ELECTRIC_HEATER){
-					double capacityElectric_kW = l.path( "capacityElectricity_kW").doubleValue();
-					double eta_r = l.required( "eta_r").doubleValue();
-					double deliveryTemp_degC = l.path( "deliveryTemp_degC" ).doubleValue();
-					J_EAConversionElectricHeater electricHeater = new J_EAConversionElectricHeater( this, capacityElectric_kW, eta_r, energyModel.p_timeStep_h, deliveryTemp_degC);
-					f_connectToJ_EA(electricHeater);
-				} else if ( assetType == OL_EnergyAssetType.HEAT_DELIVERY_SET){
-					double capacityHeat_kW1 = l.required( "capacityHeat_kW").doubleValue();
-					double eta_r = l.required( "eta_r").doubleValue();
-					double deliveryTemp_degC = l.path( "deliveryTemp_degC" ).doubleValue();
-					J_EAConversionHeatDeliverySet deliverySet = new J_EAConversionHeatDeliverySet( this, capacityHeat_kW1, eta_r, deliveryTemp_degC, energyModel.p_timeStep_h );
-					f_connectToJ_EA(deliverySet);
-				} else if ( assetType == OL_EnergyAssetType.HYDROGEN_FURNACE){
-					double capacityHeat_kW1 = l.required( "capacityHeat_kW").doubleValue();
-					double eta_r = l.required( "eta_r").doubleValue();
-					double deliveryTemp_degC = 0.0;
-					J_EAConversionHydrogenBurner hydrogenBurner = new J_EAConversionHydrogenBurner( this, capacityHeat_kW1, eta_r, energyModel.p_timeStep_h, deliveryTemp_degC );
-					f_connectToJ_EA(hydrogenBurner);
-				} else if ( assetType == OL_EnergyAssetType.ELECTROLYSER){
-					double capacityElectric_kW = l.path( "capacityElectricity_kW").doubleValue();
-					double eta_r = l.required( "eta_r").doubleValue();
-					J_EAConversionElektrolyser electrolyser = new J_EAConversionElektrolyser( this, capacityElectric_kW, eta_r, energyModel.p_timeStep_h );
-					f_connectToJ_EA(electrolyser);
-				} else if ( assetType == OL_EnergyAssetType.CURTAILER){
-					double capacityElectric_kW = l.path( "capacityElectricity_kW").doubleValue();
-					double eta_r = l.required( "eta_r").doubleValue();
-					J_EAConversionCurtailer curtailer = new J_EAConversionCurtailer( this, capacityElectric_kW, eta_r, energyModel.p_timeStep_h );
-					f_connectToJ_EA(curtailer);
-				} else if ( assetType == OL_EnergyAssetType.CURTAILER_HEAT){
-					double capacityHeat_kW1 = l.required( "capacityHeat_kW").doubleValue();
-					double eta_r = l.required( "eta_r").doubleValue();
-					J_EAConversionCurtailerHeat curtailerHeat = new J_EAConversionCurtailerHeat( this, capacityHeat_kW1, eta_r, energyModel.p_timeStep_h );
-					f_connectToJ_EA(curtailerHeat);
-				} else if ( assetType == OL_EnergyAssetType.METHANE_CHP){
-					double capacityHeat_kW1 = l.required( "capacityHeat_kW").doubleValue();
-					double capacityElectric_kW = l.path( "capacityElectricity_kW").doubleValue();
-					double eta_r = l.required( "eta_r").doubleValue();
-					double deliveryTemp_degC = 0.0;
-					J_EAConversionGasCHP GasCHP = new J_EAConversionGasCHP(this, capacityElectric_kW, capacityHeat_kW1, eta_r, energyModel.p_timeStep_h, deliveryTemp_degC);
-					f_connectToJ_EA(GasCHP);
-				} else if ( assetType == OL_EnergyAssetType.BIOGAS_METHANE_CONVERTER){
-					double capacityMethane_kW = l.required( "capacityMethane_kW").doubleValue();
-					double eta_r = l.required( "eta_r").doubleValue();
-					J_EAConversionBiogasMethane biogasMethaneConverter = new J_EAConversionBiogasMethane(this, capacityMethane_kW, eta_r, energyModel.p_timeStep_h);
-					f_connectToJ_EA(biogasMethaneConverter);
-				} else {
-					traceln("Unknown conversion energy asset! Skipping instantiation!");
-
-				} 
-			break;				
-			case STORAGE:
-				if ( assetType == OL_EnergyAssetType.ELECTRIC_VEHICLE){
-					double capacityElectric_kW1 = l.path( "capacityElectricity_kW").doubleValue();
-					double storageCapacity_kWh = l.path( "storageCapacity_kWh" ).doubleValue();
-					double initialStateOfCharge_r = l.path( "stateOfCharge_r" ).doubleValue();
-					double energyConsumption_kWhpkm2 = l.path( "energyConsumption_kWhpkm" ).doubleValue();
-					double vehicleScalingElectric = l.path("vehicleScaling").asDouble(1.0);
-					//storageAsset.j_ea = new J_EAEV(storageAsset, capacityElectric_kW1, storageCapacity_kWh, initialStateOfCharge_r, energyModel.p_timeStep_h, energyConsumption_kWhpkm2, vehicleScalingElectric );  
-					
-					J_EAEV ev= new J_EAEV(this, capacityElectric_kW1, storageCapacity_kWh, initialStateOfCharge_r, energyModel.p_timeStep_h, energyConsumption_kWhpkm2, vehicleScalingElectric );  
-					f_connectToJ_EA(ev);	
-					
-				} else if ( assetType == OL_EnergyAssetType.BUILDINGTHERMALS) {										
-					double capacityHeat_kW3 = l.path( "capacityHeat_kW").doubleValue();
-			
-					double lossFactor_WpK2 = l.path( "lossFactor_WpK" ).doubleValue() * uniform(0.8, 1.2);
-					double heatCapacity_JpK2 = l.path( "heatCapacity_JpK" ).doubleValue() * uniform(0.7, 1.3);
-									
-					double minTemperature_degC2 = l.path( "minTemp_degC" ).asDouble(1.0);
-					double maxTemperature_degC2 = l.path( "maxTemp_degC" ).asDouble(90.0);
-					double initialTemperature_degC2 = l.path( "initialTemperature_degC" ).doubleValue();
-					String ambientTempType3 = l.path( "ambientTempType" ).asText("AIR"); //ALWAYS AIR!
-					double setTemperature_degC2 = 10.0; // this value does nothing for a heatmodel. But it is required to initialize the J_instance
-					double solarAbsorptionFactor_m2 = l.path("solarAbsorptionFactor_m2").asDouble(1.0);
-
-					J_EABuilding buildingThermals = new J_EABuilding(this, OL_EAStorageTypes.HEATMODEL_BUILDING, capacityHeat_kW3, lossFactor_WpK2, energyModel.p_timeStep_h, initialTemperature_degC2, minTemperature_degC2, maxTemperature_degC2, setTemperature_degC2, heatCapacity_JpK2, ambientTempType3, solarAbsorptionFactor_m2);
-					f_connectToJ_EA(buildingThermals);
-							
-				} else if (assetType == OL_EnergyAssetType.STORAGE_ELECTRIC) {
-					double capacityElectric_kW1 = l.path( "capacityElectricity_kW").doubleValue();
-					double storageCapacity_kWh = l.path( "storageCapacity_kWh" ).doubleValue();
-					double initialStateOfCharge_r = l.path( "stateOfCharge_r" ).doubleValue();
-					J_EAStorageElectric storageAsset = new J_EAStorageElectric(this, capacityElectric_kW1, storageCapacity_kWh, initialStateOfCharge_r, energyModel.p_timeStep_h);						
-					f_connectToJ_EA(storageAsset);
-					p_batteryAsset=storageAsset;
-					c_storageAssets.add(storageAsset);
-					v_batterySOC_fr = storageAsset.getCurrentStateOfCharge();
-			
-				} else if (assetType == OL_EnergyAssetType.STORAGE_GAS) {
-					double capacityGas_kW = l.path( "capacityGas_kW").doubleValue();
-					double storageCapacity_kWh = l.path( "storageCapacity_kWh" ).doubleValue();
-					double initialStateOfCharge_r = l.path( "stateOfCharge_r" ).doubleValue();
-					J_EAStorageGas storageAsset = new J_EAStorageGas(this, capacityGas_kW, storageCapacity_kWh, initialStateOfCharge_r, energyModel.p_timeStep_h);
-					f_connectToJ_EA(storageAsset);
-					c_storageAssets.add(storageAsset);
-					p_gasBuffer = storageAsset;
-					//traceln("gasBuffer gasCapacity_kW: " + p_gasBuffer.j_ea.getGasCapacity_kW() + " kW");
-				
-				} else if( assetType == OL_EnergyAssetType.STORAGE_HEAT) {
-					
-				    double capacityHeat_kW2 = l.path( "capacityHeat_kW").doubleValue();
-					double lossFactor_WpK = l.path( "lossFactor_WpK" ).doubleValue() * uniform(0.7, 1.3);
-					double heatCapacity_JpK = l.path( "heatCapacity_JpK" ).doubleValue();
-					double minTemperature_degC = l.path( "minTemp_degC" ).asDouble(44.0); // provide default values
-					double maxTemperature_degC = l.path( "maxTemp_degC" ).asDouble(99.0);
-					double setTemperature_degC = l.path( "setTemp_degC" ).asDouble(66.0);
-					double initialTemperature_degC = l.path( "initialTemperature_degC" ).doubleValue();
-					String ambientTempType2 = l.path( "ambientTempType" ).asText();
-					
-					if (this instanceof GCHouse ) {
-						heatCapacity_JpK = heatCapacity_JpK * uniform(0.7, 1.3);
-						initialTemperature_degC = initialTemperature_degC * uniform(0.7, 1.3);
-					}
-					
-					//traceln("gridconnection heatstorage asset initialisation check! minTemp = "+minTemperature_degC+", maxTemperature_degC = "+maxTemperature_degC+", setTemp_degC = "+ setTemperature_degC+", initialTemperature_degC = "+initialTemperature_degC);
-					J_EAStorageHeat storageAsset = new J_EAStorageHeat(this, OL_EAStorageTypes.HEATBUFFER, capacityHeat_kW2, lossFactor_WpK, energyModel.p_timeStep_h, initialTemperature_degC, minTemperature_degC, maxTemperature_degC, setTemperature_degC, heatCapacity_JpK, ambientTempType2);	
-					
-					f_connectToJ_EA(storageAsset);
-					c_storageAssets.add(storageAsset);
-				} else {
-					traceln("F_instantiateEnergyAssets: ERROR, storage asset type not available");		
-					
-				}
-			break;
-			default:
-				traceln("not a valid energy asset category." + assetCategory);
-			break;
-		}
-	}
-//traceln("GridConnection "+this.p_gridConnectionID+" has finished initializing its energyAssets!");
-}
-/*ALCODEEND*/}
-
 double f_calculateEnergyBalance()
 {/*ALCODESTART::1668528273163*/
 v_previousPowerElectricity_kW = fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY);
@@ -831,22 +533,6 @@ else if (p_primaryHeatingAsset== null && p_secondaryHeatingAsset != null && v_ha
 }
 /*ALCODEEND*/}
 
-double f_setAllowedCapacity()
-{/*ALCODESTART::1669193537955*/
-v_allowedCapacity_kW = p_connectionCapacity_kW;
-//if(p_nfatoLvl_kW == 0 && p_nfatoStart_h == 0 && p_nfatoEnd_h == 0){
-if(!v_enable_nfATO_b){
-	e_startNonFirmATO.reset();
-	e_endNonFirmATO.reset();			
-}
-else {
-	e_startNonFirmATO.restartTo(p_nfatoStart_h, HOUR);
-	e_endNonFirmATO.restartTo(p_nfatoEnd_h, HOUR);
-	if(p_nfatoLvl_kW == 0.0) { p_nfatoLvl_kW = p_connectionCapacity_kW; }
-}
-//}
-/*ALCODEEND*/}
-
 double f_manageCharging()
 {/*ALCODESTART::1671095995172*/
 double availableCapacityFromBatteries = p_batteryAsset == null ? 0 : p_batteryAsset.getCapacityAvailable_kW(); 
@@ -1618,118 +1304,6 @@ else if (j_ea.energyAssetType == OL_EnergyAssetType.WINDMILL) {
 
 /*ALCODEEND*/}
 
-double f_initializeAccumulators()
-{/*ALCODESTART::1716282675260*/
-//========== TOTAL ACCUMULATORS ==========//
-am_totalBalanceAccumulators_kW.createEmptyAccumulators( v_activeEnergyCarriers, true, 24.0, energyModel.p_runEndTime_h - energyModel.p_runStartTime_h );
-am_totalBalanceAccumulators_kW.put( OL_EnergyCarriers.ELECTRICITY, new ZeroAccumulator(true, energyModel.p_timeStep_h, energyModel.p_runEndTime_h - energyModel.p_runStartTime_h) );
-am_dailyAverageConsumptionAccumulators_kW.createEmptyAccumulators(v_activeConsumptionEnergyCarriers, true, 24.0, energyModel.p_runEndTime_h - energyModel.p_runStartTime_h);
-am_dailyAverageProductionAccumulators_kW.createEmptyAccumulators(v_activeProductionEnergyCarriers, true, 24.0, energyModel.p_runEndTime_h - energyModel.p_runStartTime_h);
-
-acc_dailyAverageEnergyProduction_kW = new ZeroAccumulator(true, 24.0, energyModel.p_runEndTime_h - energyModel.p_runStartTime_h);
-acc_dailyAverageEnergyConsumption_kW = new ZeroAccumulator(true, 24.0, energyModel.p_runEndTime_h - energyModel.p_runStartTime_h);
-
-acc_totalEnergyCurtailed_kW = new ZeroAccumulator(true, 24.0, energyModel.p_runEndTime_h - energyModel.p_runStartTime_h);
-acc_totalPrimaryEnergyProductionHeatpumps_kW = new ZeroAccumulator(true, 24.0, energyModel.p_runEndTime_h - energyModel.p_runStartTime_h);
-
-acc_dailyAverageBaseloadElectricityConsumption_kW = new ZeroAccumulator(true, 24.0, energyModel.p_runEndTime_h - energyModel.p_runStartTime_h);
-acc_dailyAverageHeatPumpElectricityConsumption_kW = new ZeroAccumulator(true, 24.0, energyModel.p_runEndTime_h - energyModel.p_runStartTime_h);
-acc_dailyAverageElectricVehicleConsumption_kW = new ZeroAccumulator(true, 24.0, energyModel.p_runEndTime_h - energyModel.p_runStartTime_h);
-acc_dailyAverageBatteriesConsumption_kW = new ZeroAccumulator(true, 24.0, energyModel.p_runEndTime_h - energyModel.p_runStartTime_h);
-acc_dailyAverageElectricCookingConsumption_kW = new ZeroAccumulator(true, 24.0, energyModel.p_runEndTime_h - energyModel.p_runStartTime_h);
-acc_dailyAverageElectrolyserElectricityConsumption_kW = new ZeroAccumulator(true, 24.0, energyModel.p_runEndTime_h - energyModel.p_runStartTime_h);
-acc_dailyAverageDistrictHeatingConsumption_kW = new ZeroAccumulator(true, 24.0, energyModel.p_runEndTime_h - energyModel.p_runStartTime_h);
-
-acc_dailyAveragePVProduction_kW = new ZeroAccumulator(true, 24.0, energyModel.p_runEndTime_h - energyModel.p_runStartTime_h);
-acc_dailyAverageWindProduction_kW = new ZeroAccumulator(true, 24.0, energyModel.p_runEndTime_h - energyModel.p_runStartTime_h);
-acc_dailyAverageV2GProduction_kW = new ZeroAccumulator(true, 24.0, energyModel.p_runEndTime_h - energyModel.p_runStartTime_h);
-acc_dailyAverageBatteriesProduction_kW = new ZeroAccumulator(true, 24.0, energyModel.p_runEndTime_h - energyModel.p_runStartTime_h);
-acc_dailyAverageCHPElectricityProduction_kW = new ZeroAccumulator(true, 24.0, energyModel.p_runEndTime_h - energyModel.p_runStartTime_h);
-
-//acc_dailyAverageBatteriesStoredEnergy_MWh = new ZeroAccumulator(true, 24.0, energyModel.p_runEndTime_h - energyModel.p_runStartTime_h);
-
-//========== SUMMER WEEK ACCUMULATORS ==========//
-am_summerWeekBalanceAccumulators_kW.createEmptyAccumulators(v_activeEnergyCarriers, true, energyModel.p_timeStep_h, 168.0);
-am_summerWeekConsumptionAccumulators_kW.createEmptyAccumulators(v_activeEnergyCarriers, true, energyModel.p_timeStep_h, 168.0);
-am_summerWeekProductionAccumulators_kW.createEmptyAccumulators(v_activeEnergyCarriers, true, energyModel.p_timeStep_h, 168.0);
-
-acc_summerWeekEnergyProduction_kW = new ZeroAccumulator(true, energyModel.p_timeStep_h, 168.0);
-acc_summerWeekEnergyConsumption_kW = new ZeroAccumulator(true, energyModel.p_timeStep_h, 168.0);
-
-acc_summerWeekEnergyCurtailed_kW = new ZeroAccumulator(true, energyModel.p_timeStep_h, 168.0);
-acc_summerWeekPrimaryEnergyProductionHeatpumps_kW = new ZeroAccumulator(true, energyModel.p_timeStep_h, 168.0);
-
-acc_summerWeekFeedinCapacity_kW = new ZeroAccumulator(true, energyModel.p_timeStep_h, 168.0);
-acc_summerWeekDeliveryCapacity_kW = new ZeroAccumulator(true, energyModel.p_timeStep_h, 168.0);
-
-acc_summerWeekBaseloadElectricityConsumption_kW = new ZeroAccumulator(true, energyModel.p_timeStep_h, 168.0);
-acc_summerWeekHeatPumpElectricityConsumption_kW = new ZeroAccumulator(true, energyModel.p_timeStep_h, 168.0);
-acc_summerWeekElectricVehicleConsumption_kW = new ZeroAccumulator(true, energyModel.p_timeStep_h, 168.0);
-acc_summerWeekBatteriesConsumption_kW = new ZeroAccumulator(true, energyModel.p_timeStep_h, 168.0);
-acc_summerWeekElectricCookingConsumption_kW = new ZeroAccumulator(true, energyModel.p_timeStep_h, 168.0);
-acc_summerWeekElectrolyserElectricityConsumption_kW = new ZeroAccumulator(true, energyModel.p_timeStep_h, 168.0);
-acc_summerWeekDistrictHeatingConsumption_kW = new ZeroAccumulator(true, energyModel.p_timeStep_h, 168.0);
-
-acc_summerWeekPVProduction_kW = new ZeroAccumulator(true, energyModel.p_timeStep_h, 168.0);
-acc_summerWeekWindProduction_kW = new ZeroAccumulator(true, energyModel.p_timeStep_h, 168.0);
-acc_summerWeekV2GProduction_kW = new ZeroAccumulator(true, energyModel.p_timeStep_h, 168.0);
-acc_summerWeekBatteriesProduction_kW = new ZeroAccumulator(true, energyModel.p_timeStep_h, 168.0);
-acc_summerWeekCHPElectricityProduction_kW = new ZeroAccumulator(true, energyModel.p_timeStep_h, 168.0);
-
-//acc_summerWeekBatteriesStoredEnergy_MWh = new ZeroAccumulator(true, energyModel.p_timeStep_h, 168.0);
-
-//========== WINTER WEEK ACCUMULATORS ==========//
-am_winterWeekBalanceAccumulators_kW.createEmptyAccumulators(v_activeEnergyCarriers, true, energyModel.p_timeStep_h, 168.0);
-am_winterWeekConsumptionAccumulators_kW.createEmptyAccumulators(v_activeEnergyCarriers, true, energyModel.p_timeStep_h, 168.0);
-am_winterWeekProductionAccumulators_kW.createEmptyAccumulators(v_activeEnergyCarriers, true, energyModel.p_timeStep_h, 168.0);
-
-acc_winterWeekEnergyProduction_kW = new ZeroAccumulator(true, energyModel.p_timeStep_h, 168.0);
-acc_winterWeekEnergyConsumption_kW = new ZeroAccumulator(true, energyModel.p_timeStep_h, 168.0);
-
-acc_winterWeekEnergyCurtailed_kW = new ZeroAccumulator(true, energyModel.p_timeStep_h, 168.0);
-acc_winterWeekPrimaryEnergyProductionHeatpumps_kW = new ZeroAccumulator(true, energyModel.p_timeStep_h, 168.0);
-
-acc_winterWeekFeedinCapacity_kW = new ZeroAccumulator(true, energyModel.p_timeStep_h, 168.0);
-acc_winterWeekDeliveryCapacity_kW = new ZeroAccumulator(true, energyModel.p_timeStep_h, 168.0);
-
-acc_winterWeekBaseloadElectricityConsumption_kW = new ZeroAccumulator(true, energyModel.p_timeStep_h, 168.0);
-acc_winterWeekHeatPumpElectricityConsumption_kW = new ZeroAccumulator(true, energyModel.p_timeStep_h, 168.0);
-acc_winterWeekElectricVehicleConsumption_kW = new ZeroAccumulator(true, energyModel.p_timeStep_h, 168.0);
-acc_winterWeekBatteriesConsumption_kW = new ZeroAccumulator(true, energyModel.p_timeStep_h, 168.0);
-acc_winterWeekElectricCookingConsumption_kW = new ZeroAccumulator(true, energyModel.p_timeStep_h, 168.0);
-acc_winterWeekElectrolyserElectricityConsumption_kW = new ZeroAccumulator(true, energyModel.p_timeStep_h, 168.0);
-acc_winterWeekDistrictHeatingConsumption_kW = new ZeroAccumulator(true, energyModel.p_timeStep_h, 168.0);
-
-acc_winterWeekPVProduction_kW = new ZeroAccumulator(true, energyModel.p_timeStep_h, 168.0);
-acc_winterWeekWindProduction_kW = new ZeroAccumulator(true, energyModel.p_timeStep_h, 168.0);
-acc_winterWeekV2GProduction_kW = new ZeroAccumulator(true, energyModel.p_timeStep_h, 168.0);
-acc_winterWeekBatteriesProduction_kW = new ZeroAccumulator(true, energyModel.p_timeStep_h, 168.0);
-acc_winterWeekCHPElectricityProduction_kW = new ZeroAccumulator(true, energyModel.p_timeStep_h, 168.0);
-
-//acc_winterWeekBatteriesStoredEnergy_MWh = new ZeroAccumulator(true, energyModel.p_timeStep_h, 168.0);
-
-//========== DAYTIME ACCUMULATORS ==========//
-am_daytimeImports_kW.createEmptyAccumulators( v_activeEnergyCarriers, false, energyModel.p_timeStep_h, 0.5 * (energyModel.p_runEndTime_h - energyModel.p_runStartTime_h));
-am_daytimeExports_kW.createEmptyAccumulators( v_activeEnergyCarriers, false, energyModel.p_timeStep_h, 0.5 * (energyModel.p_runEndTime_h - energyModel.p_runStartTime_h));
-
-acc_daytimeEnergyProduction_kW = new ZeroAccumulator(false, energyModel.p_timeStep_h, 0.5 * (energyModel.p_runEndTime_h - energyModel.p_runStartTime_h));
-acc_daytimeEnergyConsumption_kW = new ZeroAccumulator(false, energyModel.p_timeStep_h,0.5 * (energyModel.p_runEndTime_h - energyModel.p_runStartTime_h));
-//acc_daytimeEnergyCurtailed_kW = new ZeroAccumulator(false, energyModel.p_timeStep_h, energyModel.p_runEndTime_h - energyModel.p_runStartTime_h);
-acc_daytimeElectricityProduction_kW = new ZeroAccumulator(false, energyModel.p_timeStep_h, 0.5 * (energyModel.p_runEndTime_h - energyModel.p_runStartTime_h));
-acc_daytimeElectricityConsumption_kW = new ZeroAccumulator(false, energyModel.p_timeStep_h, 0.5 * (energyModel.p_runEndTime_h - energyModel.p_runStartTime_h));
-
-//========== WEEKEND ACCUMULATORS ==========//
-am_weekendImports_kW.createEmptyAccumulators( v_activeEnergyCarriers, false, energyModel.p_timeStep_h, 2 / 7  * (energyModel.p_runEndTime_h - energyModel.p_runStartTime_h) + 48);
-am_weekendExports_kW.createEmptyAccumulators( v_activeEnergyCarriers, false, energyModel.p_timeStep_h, 2 / 7 * (energyModel.p_runEndTime_h - energyModel.p_runStartTime_h) + 48);
-
-acc_weekendEnergyProduction_kW = new ZeroAccumulator(false, energyModel.p_timeStep_h, 2 / 7  * (energyModel.p_runEndTime_h - energyModel.p_runStartTime_h) + 48);
-acc_weekendEnergyConsumption_kW = new ZeroAccumulator(false, energyModel.p_timeStep_h,2 / 7  * (energyModel.p_runEndTime_h - energyModel.p_runStartTime_h) + 48);
-//acc_weekendEnergyCurtailed_kW = new ZeroAccumulator(false, energyModel.p_timeStep_h, energyModel.p_runEndTime_h - energyModel.p_runStartTime_h);
-acc_weekendElectricityProduction_kW = new ZeroAccumulator(false, energyModel.p_timeStep_h, 2 / 7  * (energyModel.p_runEndTime_h - energyModel.p_runStartTime_h) + 48);
-acc_weekendElectricityConsumption_kW = new ZeroAccumulator(false, energyModel.p_timeStep_h, 2 / 7  * (energyModel.p_runEndTime_h - energyModel.p_runStartTime_h) + 48);
-
-/*ALCODEEND*/}
-
 double f_resetSpecificGCStates()
 {/*ALCODESTART::1717060111619*/
 
@@ -2460,3 +2034,81 @@ else if (flowsMap.get(EC) > 0){
 }
 /*ALCODEEND*/}
 
+double f_batteryManagementPeakShaving()
+{/*ALCODESTART::1750763679197*/
+if (p_batteryAsset.getStorageCapacity_kWh() != 0){
+	int index = roundToInt((energyModel.t_h % 24)/energyModel.p_timeStep_h);
+	if(index == 0){
+		f_peakShavingForecast_simple();
+	}
+	p_batteryAsset.v_powerFraction_fr = max(-1,min(1, v_batteryChargingForecast_kW[index] / p_batteryAsset.getCapacityElectric_kW()));
+}
+/*ALCODEEND*/}
+
+double f_peakShavingForecast_simple()
+{/*ALCODESTART::1750763679201*/
+double amountOfHoursInADay = 24;
+double[] nettoBalance_kW = new double[96];
+
+//Get elec consumption profile
+J_EAProfile elecConsumptionProfile = findFirst(c_profileAssets, profile -> profile.profileType == OL_ProfileAssetType.ELECTRICITYBASELOAD);
+
+J_EAConsumption elecConsumptionConsumptionAsset = findFirst(c_consumptionAssets, cons -> cons.energyAssetType == OL_EnergyAssetType.ELECTRICITY_DEMAND);
+
+J_EAProduction elecProductionAsset = findFirst(c_productionAssets, prod -> prod.energyAssetType == OL_EnergyAssetType.PHOTOVOLTAIC);
+
+//For simulation that cross the year end
+double hour_of_simulation_year = energyModel.t_h - energyModel.p_runStartTime_h;
+//traceln("hour_of_year: " + hour_of_simulation_year);
+
+int startTimeDayIndex = roundToInt(hour_of_simulation_year/energyModel.p_timeStep_h);
+int endTimeDayIndex = roundToInt((hour_of_simulation_year + 24)/energyModel.p_timeStep_h);
+
+if(elecConsumptionProfile != null){
+	nettoBalance_kW = ZeroMath.arrayMultiply(Arrays.copyOfRange(elecConsumptionProfile.a_energyProfile_kWh, startTimeDayIndex, endTimeDayIndex), 1/energyModel.p_timeStep_h);
+}
+if(elecConsumptionConsumptionAsset != null){
+	for(double time = energyModel.t_h; time < energyModel.t_h + 24; time += energyModel.p_timeStep_h){
+		nettoBalance_kW[roundToInt((time-energyModel.t_h)/energyModel.p_timeStep_h)] += elecConsumptionConsumptionAsset.profilePointer.getValue(time)*elecConsumptionConsumptionAsset.yearlyDemand_kWh*elecConsumptionConsumptionAsset.getConsumptionScaling_fr();
+	}
+}
+
+if(elecProductionAsset != null){
+	for(double time = energyModel.t_h; time < energyModel.t_h + 24; time += energyModel.p_timeStep_h){
+		nettoBalance_kW[roundToInt((time-energyModel.t_h)/energyModel.p_timeStep_h)] -= elecProductionAsset.profilePointer.getValue(time)*elecProductionAsset.getCapacityElectric_kW();
+	}
+}
+
+
+////Fill chargesetpoint Array
+
+//Initialize chargepoint array
+v_batteryChargingForecast_kW = new double[96];
+
+
+//Calculate the total export over the day that can be collected by the battery
+double totalExport_kWh = 0;
+for(int i = 0; i < nettoBalance_kW.length; i++){
+	if(nettoBalance_kW[i] < 0){
+		totalExport_kWh += min(p_batteryAsset.getCapacityElectric_kW(), -nettoBalance_kW[i])*energyModel.p_timeStep_h;
+	}
+}
+	
+
+//Flatten the morning net balance while charging
+double totalDailyImport_kWh = 0;
+for(int i = 0; i < nettoBalance_kW.length; i++){
+	if(i< amountOfHoursInADay/energyModel.p_timeStep_h){
+		totalDailyImport_kWh += max(0,nettoBalance_kW[i]*energyModel.p_timeStep_h);
+	}
+}
+double batteryEnergyNeeded_kWh = max(0,(p_batteryAsset.getStorageCapacity_kWh()*(1-p_batteryAsset.getCurrentStateOfCharge()))-totalExport_kWh);
+double averageDailyConsumption_kW = (totalDailyImport_kWh + batteryEnergyNeeded_kWh)/amountOfHoursInADay;
+
+//If 24 hours
+for(int i = 0; i < nettoBalance_kW.length; i++){
+	v_batteryChargingForecast_kW[i] += averageDailyConsumption_kW - nettoBalance_kW[i];
+}
+
+/*ALCODEEND*/}
+
diff --git a/_alp/Agents/GridConnection/Code/Functions.xml b/_alp/Agents/GridConnection/Code/Functions.xml
index 38ffe642..7a8040e9 100644
--- a/_alp/Agents/GridConnection/Code/Functions.xml
+++ b/_alp/Agents/GridConnection/Code/Functions.xml
@@ -16,34 +16,13 @@
 		<ShowLabel>true</ShowLabel>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
-	<Function AccessType="public" StaticFunction="false">
-		<ReturnModificator>VOID</ReturnModificator>
-		<ReturnType>double</ReturnType>
-		<Id>1658752229618</Id>
-		<Name><![CDATA[f_connectToChild]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>750</X>
-		<Y>-80</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Parameter>
-			<Name><![CDATA[ConnectingEnergyAsset]]></Name>
-			<Type><![CDATA[J_EA]]></Type>
-		</Parameter>
-		<Body xmlns:al="http://anylogic.com"/>
-	</Function>
 	<Function AccessType="default" StaticFunction="false">
 		<ReturnModificator>VOID</ReturnModificator>
 		<ReturnType>double</ReturnType>
 		<Id>1660212665961</Id>
 		<Name><![CDATA[f_connectionMetering]]></Name>
 		<X>910</X>
-		<Y>550</Y>
+		<Y>630</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -69,23 +48,6 @@
 		<ShowLabel>true</ShowLabel>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
-	<Function AccessType="public" StaticFunction="false">
-		<ReturnModificator>VOID</ReturnModificator>
-		<ReturnType>double</ReturnType>
-		<Id>1668181559833</Id>
-		<Name><![CDATA[f_instantiateEnergyAssets]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>750</X>
-		<Y>-40</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>
@@ -123,7 +85,7 @@
 		<ReturnType>double</ReturnType>
 		<Id>1668983912731</Id>
 		<Name><![CDATA[f_resetStates]]></Name>
-		<X>1230</X>
+		<X>1270</X>
 		<Y>530</Y>
 		<Label>
 			<X>10</X>
@@ -180,24 +142,7 @@
 		<Id>1669025846794</Id>
 		<Name><![CDATA[f_manageHeatingAssets]]></Name>
 		<X>920</X>
-		<Y>340</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>1669193537955</Id>
-		<Name><![CDATA[f_setAllowedCapacity]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>750</X>
-		<Y>-60</Y>
+		<Y>420</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -213,7 +158,7 @@
 		<Id>1671095995172</Id>
 		<Name><![CDATA[f_manageCharging]]></Name>
 		<X>920</X>
-		<Y>360</Y>
+		<Y>440</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -230,7 +175,7 @@
 		<Name><![CDATA[f_simpleCharging]]></Name>
 		<Description><![CDATA[Charging when arriving home, not taking grid limits into account]]></Description>
 		<X>940</X>
-		<Y>380</Y>
+		<Y>460</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -246,7 +191,7 @@
 		<Id>1671095995177</Id>
 		<Name><![CDATA[f_maxSpreadCharging]]></Name>
 		<X>940</X>
-		<Y>400</Y>
+		<Y>480</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -263,7 +208,7 @@
 		<Name><![CDATA[f_maxPowerCharging]]></Name>
 		<Description><![CDATA[Charge at max power taking grid constaints into account]]></Description>
 		<X>940</X>
-		<Y>420</Y>
+		<Y>500</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -283,7 +228,7 @@
 		<Id>1671095995181</Id>
 		<Name><![CDATA[f_chargeOnPrice]]></Name>
 		<X>940</X>
-		<Y>460</Y>
+		<Y>540</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -322,7 +267,7 @@
 		<ReturnType>double</ReturnType>
 		<Id>1692799608559</Id>
 		<Name><![CDATA[f_connectToJ_EA_default]]></Name>
-		<X>1070</X>
+		<X>1090</X>
 		<Y>90</Y>
 		<Label>
 			<X>10</X>
@@ -363,7 +308,7 @@
 		<Id>1695822607494</Id>
 		<Name><![CDATA[f_chargeOnPrice_V2G]]></Name>
 		<X>940</X>
-		<Y>480</Y>
+		<Y>560</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -450,7 +395,7 @@
 		<ReturnType>double</ReturnType>
 		<Id>1714646913998</Id>
 		<Name><![CDATA[f_removeTheJ_EA_default]]></Name>
-		<X>1070</X>
+		<X>1090</X>
 		<Y>110</Y>
 		<Label>
 			<X>10</X>
@@ -465,29 +410,12 @@
 		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
-	<Function AccessType="default" StaticFunction="false">
-		<ReturnModificator>VOID</ReturnModificator>
-		<ReturnType>double</ReturnType>
-		<Id>1716282675260</Id>
-		<Name><![CDATA[f_initializeAccumulators]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>910</X>
-		<Y>70</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Body xmlns:al="http://anylogic.com"/>
-	</Function>
 	<Function AccessType="default" StaticFunction="false">
 		<ReturnModificator>VOID</ReturnModificator>
 		<ReturnType>double</ReturnType>
 		<Id>1717060111619</Id>
 		<Name><![CDATA[f_resetSpecificGCStates]]></Name>
-		<X>1250</X>
+		<X>1290</X>
 		<Y>550</Y>
 		<Label>
 			<X>10</X>
@@ -502,7 +430,7 @@
 		<ReturnType>double</ReturnType>
 		<Id>1717068094093</Id>
 		<Name><![CDATA[f_resetStatesAfterRapidRun]]></Name>
-		<X>1230</X>
+		<X>1270</X>
 		<Y>570</Y>
 		<Label>
 			<X>10</X>
@@ -518,7 +446,7 @@
 		<ReturnType>double</ReturnType>
 		<Id>1717068167776</Id>
 		<Name><![CDATA[f_resetSpecificGCStatesAfterRapidRun]]></Name>
-		<X>1250</X>
+		<X>1290</X>
 		<Y>590</Y>
 		<Label>
 			<X>10</X>
@@ -535,7 +463,7 @@
 		<Id>1720442672576</Id>
 		<Name><![CDATA[f_curtailment]]></Name>
 		<X>910</X>
-		<Y>530</Y>
+		<Y>610</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -552,7 +480,7 @@
 		<Name><![CDATA[f_nfatoUpdateConnectionCapacity]]></Name>
 		<Description><![CDATA[Updates the Connection Capacity of the GC depending on the time of day / day of week.]]></Description>
 		<X>890</X>
-		<Y>650</Y>
+		<Y>710</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -569,7 +497,7 @@
 		<Name><![CDATA[f_nfatoSetConnectionCapacity]]></Name>
 		<Description><![CDATA[When changing the NFATO settings this function sets the GC capacity to the correct value. When reset is true the capacity is restored back to its original value.]]></Description>
 		<X>890</X>
-		<Y>670</Y>
+		<Y>730</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -641,7 +569,7 @@
 		<Id>1722518225504</Id>
 		<Name><![CDATA[f_fillLiveDataSets]]></Name>
 		<X>930</X>
-		<Y>570</Y>
+		<Y>650</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -657,7 +585,7 @@
 		<Id>1722518905501</Id>
 		<Name><![CDATA[f_rapidRunDataLogging]]></Name>
 		<X>930</X>
-		<Y>590</Y>
+		<Y>670</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -694,7 +622,7 @@
 		<Id>1725455130676</Id>
 		<Name><![CDATA[f_getChargeDeadline]]></Name>
 		<X>960</X>
-		<Y>440</Y>
+		<Y>520</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -729,7 +657,7 @@
 		<ReturnType>double</ReturnType>
 		<Id>1730728785333</Id>
 		<Name><![CDATA[f_initializeDataSets]]></Name>
-		<X>1070</X>
+		<X>910</X>
 		<Y>70</Y>
 		<Label>
 			<X>10</X>
@@ -746,7 +674,39 @@
 		<Id>1750258434630</Id>
 		<Name><![CDATA[f_manageChargers]]></Name>
 		<X>920</X>
-		<Y>500</Y>
+		<Y>580</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>1750763679197</Id>
+		<Name><![CDATA[f_batteryManagementPeakShaving]]></Name>
+		<X>920</X>
+		<Y>340</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>1750763679201</Id>
+		<Name><![CDATA[f_peakShavingForecast_simple]]></Name>
+		<X>950</X>
+		<Y>360</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
diff --git a/_alp/Agents/GridConnection/Levels/Level.level.xml b/_alp/Agents/GridConnection/Levels/Level.level.xml
index 8feadc15..1f9befb8 100644
--- a/_alp/Agents/GridConnection/Levels/Level.level.xml
+++ b/_alp/Agents/GridConnection/Levels/Level.level.xml
@@ -22,15 +22,15 @@
 		<LineMaterial>null</LineMaterial>
 		<LineStyle>SOLID</LineStyle>
 		<Width>780</Width>
-		<Height>740</Height>
+		<Height>460</Height>
 		<Rotation>0.0</Rotation>
 		<FillColor>-983041</FillColor>
 		<FillMaterial>null</FillMaterial>
 	</Rectangle>
 	<Rectangle>
 		<Id>1671027904662</Id>
-		<Name><![CDATA[rectangle]]></Name>
-		<X>100</X>
+		<Name><![CDATA[rect_electrictyVariables]]></Name>
+		<X>80</X>
 		<Y>940</Y>
 		<Label>
 			<X>10</X>
@@ -48,7 +48,7 @@
 		<LineMaterial>null</LineMaterial>
 		<LineStyle>SOLID</LineStyle>
 		<Width>280</Width>
-		<Height>610</Height>
+		<Height>360</Height>
 		<Rotation>0.0</Rotation>
 		<FillColor>-131341</FillColor>
 		<FillMaterial>null</FillMaterial>
@@ -603,7 +603,7 @@
 	<Text>
 		<Id>1671027383282</Id>
 		<Name><![CDATA[text9]]></Name>
-		<X>230</X>
+		<X>210</X>
 		<Y>922</Y>
 		<Label>
 			<X>0</X>
@@ -628,7 +628,7 @@
 	<Text>
 		<Id>1671027582352</Id>
 		<Name><![CDATA[text12]]></Name>
-		<X>170</X>
+		<X>150</X>
 		<Y>1000</Y>
 		<Label>
 			<X>0</X>
@@ -675,63 +675,10 @@
 		</Font>
 		<Alignment>LEFT</Alignment>
 	</Text>
-	<Line>
-		<Id>1671027820068</Id>
-		<Name><![CDATA[line8]]></Name>
-		<X>120</X>
-		<Y>1291</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>-4144960</LineColor>
-		<LineMaterial>null</LineMaterial>
-		<LineStyle>SOLID</LineStyle>
-		<BeginArrowSize>1</BeginArrowSize>
-		<BeginArrowStyle>0</BeginArrowStyle>
-		<EndArrowSize>1</EndArrowSize>
-		<EndArrowStyle>0</EndArrowStyle>
-		<Dx>230</Dx>
-		<Dy>0</Dy>
-		<Dz>0</Dz>
-	</Line>
-	<Text>
-		<Id>1671027834321</Id>
-		<Name><![CDATA[text14]]></Name>
-		<X>230</X>
-		<Y>1277</Y>
-		<Label>
-			<X>0</X>
-			<Y>-10</Y>
-		</Label>
-		<PublicFlag>false</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[Cumulative power on this gridconnection]]></Text>
-		<Font>
-			<Name><![CDATA[SansSerif]]></Name>
-			<Size>10</Size>
-			<Style>1</Style>
-		</Font>
-		<Alignment>CENTER</Alignment>
-	</Text>
 	<Rectangle>
 		<Id>1671028034002</Id>
-		<Name><![CDATA[rectangle1]]></Name>
-		<X>410</X>
+		<Name><![CDATA[rect_heatVariables]]></Name>
+		<X>490</X>
 		<Y>940</Y>
 		<Label>
 			<X>10</X>
@@ -754,35 +701,10 @@
 		<FillColor>-134146</FillColor>
 		<FillMaterial>null</FillMaterial>
 	</Rectangle>
-	<Text>
-		<Id>1671028103716</Id>
-		<Name><![CDATA[text15]]></Name>
-		<X>200</X>
-		<Y>1360</Y>
-		<Label>
-			<X>0</X>
-			<Y>-10</Y>
-		</Label>
-		<PublicFlag>false</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[Electricity totals]]></Text>
-		<Font>
-			<Name><![CDATA[SansSerif]]></Name>
-			<Size>10</Size>
-			<Style>0</Style>
-		</Font>
-		<Alignment>LEFT</Alignment>
-	</Text>
 	<Text>
 		<Id>1671033393207</Id>
 		<Name><![CDATA[text16]]></Name>
-		<X>200</X>
+		<X>180</X>
 		<Y>950</Y>
 		<Label>
 			<X>0</X>
@@ -804,38 +726,10 @@
 		</Font>
 		<Alignment>LEFT</Alignment>
 	</Text>
-	<Line>
-		<Id>1671033508415</Id>
-		<Name><![CDATA[line9]]></Name>
-		<X>120</X>
-		<Y>1350</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>false</ShowLabel>
-		<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
-		<EmbeddedIcon>false</EmbeddedIcon>
-		<Z>0</Z>
-		<ZHeight>10</ZHeight>
-		<LineWidth>2</LineWidth>
-		<LineColor>-4144960</LineColor>
-		<LineMaterial>null</LineMaterial>
-		<LineStyle>SOLID</LineStyle>
-		<BeginArrowSize>1</BeginArrowSize>
-		<BeginArrowStyle>0</BeginArrowStyle>
-		<EndArrowSize>1</EndArrowSize>
-		<EndArrowStyle>0</EndArrowStyle>
-		<Dx>230</Dx>
-		<Dy>0</Dy>
-		<Dz>0</Dz>
-	</Line>
 	<Text>
 		<Id>1671033654309</Id>
 		<Name><![CDATA[text17]]></Name>
-		<X>530</X>
+		<X>610</X>
 		<Y>920</Y>
 		<Label>
 			<X>0</X>
@@ -857,58 +751,6 @@
 		</Font>
 		<Alignment>CENTER</Alignment>
 	</Text>
-	<Text>
-		<Id>1671033701021</Id>
-		<Name><![CDATA[text18]]></Name>
-		<X>530</X>
-		<Y>1230</Y>
-		<Label>
-			<X>0</X>
-			<Y>-10</Y>
-		</Label>
-		<PublicFlag>false</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[Combustibles]]></Text>
-		<Font>
-			<Name><![CDATA[Arial]]></Name>
-			<Size>14</Size>
-			<Style>2</Style>
-		</Font>
-		<Alignment>CENTER</Alignment>
-	</Text>
-	<Rectangle>
-		<Id>1671033701024</Id>
-		<Name><![CDATA[rectangle2]]></Name>
-		<X>410</X>
-		<Y>1250</Y>
-		<Label>
-			<X>10</X>
-			<Y>10</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>false</ShowLabel>
-		<Lock>true</Lock>
-		<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
-		<EmbeddedIcon>false</EmbeddedIcon>
-		<Z>0</Z>
-		<ZHeight>10</ZHeight>
-		<LineWidth>1</LineWidth>
-		<LineColor>-4144960</LineColor>
-		<LineMaterial>null</LineMaterial>
-		<LineStyle>SOLID</LineStyle>
-		<Width>260</Width>
-		<Height>300</Height>
-		<Rotation>0.0</Rotation>
-		<FillColor>-786696</FillColor>
-		<FillMaterial>null</FillMaterial>
-	</Rectangle>
 	<Text>
 		<Id>1674329550133</Id>
 		<Name><![CDATA[text8]]></Name>
diff --git a/_alp/Agents/GridConnection/Variables.xml b/_alp/Agents/GridConnection/Variables.xml
index 7a913836..86fc7061 100644
--- a/_alp/Agents/GridConnection/Variables.xml
+++ b/_alp/Agents/GridConnection/Variables.xml
@@ -1,169 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Variables>
-	<Variable Class="PlainVariable">
-		<Id>1658499590783</Id>
-		<Name><![CDATA[v_currentPowerElectricity_kW]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>150</X>
-		<Y>1320</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>
-		</Properties>
-	</Variable>
-	<Variable Class="PlainVariable">
-		<Id>1659355078476</Id>
-		<Name><![CDATA[v_currentPowerMethane_kW]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>460</X>
-		<Y>1310</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>
-		</Properties>
-	</Variable>
-	<Variable Class="PlainVariable">
-		<Id>1659355091165</Id>
-		<Name><![CDATA[v_currentPowerHeat_kW]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>450</X>
-		<Y>990</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>
-		</Properties>
-	</Variable>
-	<Variable Class="PlainVariable">
-		<Id>1659513167233</Id>
-		<Name><![CDATA[v_currentPowerHydrogen_kW]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>460</X>
-		<Y>1350</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>
-		</Properties>
-	</Variable>
-	<Variable Class="PlainVariable">
-		<Id>1660212770050</Id>
-		<Name><![CDATA[v_heatDrawn_kWh]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>450</X>
-		<Y>1060</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>
-		</Properties>
-	</Variable>
-	<Variable Class="PlainVariable">
-		<Id>1660212876474</Id>
-		<Name><![CDATA[v_methaneDelivered_kWh]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>460</X>
-		<Y>1480</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>
-		</Properties>
-	</Variable>
-	<Variable Class="PlainVariable">
-		<Id>1660212876476</Id>
-		<Name><![CDATA[v_heatDelivered_kWh]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>450</X>
-		<Y>1080</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>
-		</Properties>
-	</Variable>
-	<Variable Class="PlainVariable">
-		<Id>1660212876478</Id>
-		<Name><![CDATA[v_hydrogenDelivered_kWh]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>460</X>
-		<Y>1520</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>
-		</Properties>
-	</Variable>
 	<Variable Class="PlainVariable">
 		<Id>1666282164534</Id>
 		<Name><![CDATA[v_previousPowerElectricity_kW]]></Name>
-		<X>1230</X>
+		<X>1270</X>
 		<Y>270</Y>
 		<Label>
 			<X>10</X>
@@ -208,7 +48,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1667902447354</Id>
 		<Name><![CDATA[v_evChargingPowerElectric_kW]]></Name>
-		<X>150</X>
+		<X>110</X>
 		<Y>1110</Y>
 		<Label>
 			<X>10</X>
@@ -224,26 +64,6 @@
 			<Type><![CDATA[double]]></Type>
 		</Properties>
 	</Variable>
-	<Variable Class="PlainVariable">
-		<Id>1668359062406</Id>
-		<Name><![CDATA[v_allowedCapacity_kW]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>1280</X>
-		<Y>-90</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>
-		</Properties>
-	</Variable>
 	<Variable Class="PlainVariable">
 		<Id>1668370002883</Id>
 		<Name><![CDATA[v_additionalTimeSpreadCharging_MIN]]></Name>
@@ -270,7 +90,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1668610729237</Id>
 		<Name><![CDATA[v_fixedConsumptionElectric_kW]]></Name>
-		<X>150</X>
+		<X>110</X>
 		<Y>980</Y>
 		<Label>
 			<X>10</X>
@@ -289,7 +109,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1668610741368</Id>
 		<Name><![CDATA[v_pvProductionElectric_kW]]></Name>
-		<X>150</X>
+		<X>110</X>
 		<Y>1240</Y>
 		<Label>
 			<X>10</X>
@@ -308,7 +128,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1668610757391</Id>
 		<Name><![CDATA[v_batteryPowerElectric_kW]]></Name>
-		<X>150</X>
+		<X>110</X>
 		<Y>1130</Y>
 		<Label>
 			<X>10</X>
@@ -327,7 +147,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1668611038479</Id>
 		<Name><![CDATA[v_conversionPowerElectric_kW]]></Name>
-		<X>150</X>
+		<X>110</X>
 		<Y>1030</Y>
 		<Label>
 			<X>10</X>
@@ -343,50 +163,10 @@
 			<Type><![CDATA[double]]></Type>
 		</Properties>
 	</Variable>
-	<Variable Class="PlainVariable">
-		<Id>1668605322171</Id>
-		<Name><![CDATA[v_currentPowerDiesel_kW]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>460</X>
-		<Y>1330</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>
-		</Properties>
-	</Variable>
-	<Variable Class="PlainVariable">
-		<Id>1668605479367</Id>
-		<Name><![CDATA[v_dieselDelivered_kWh]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>460</X>
-		<Y>1500</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>
-		</Properties>
-	</Variable>
 	<Variable Class="PlainVariable">
 		<Id>1668695288481</Id>
 		<Name><![CDATA[v_electricityPriceLowPassed_eurpkWh]]></Name>
-		<X>1230</X>
+		<X>1270</X>
 		<Y>310</Y>
 		<Label>
 			<X>10</X>
@@ -408,7 +188,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1668695288483</Id>
 		<Name><![CDATA[v_lowPassFactor_fr]]></Name>
-		<X>1230</X>
+		<X>1270</X>
 		<Y>330</Y>
 		<Label>
 			<X>10</X>
@@ -430,7 +210,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1668695288485</Id>
 		<Name><![CDATA[v_batterySOC_fr]]></Name>
-		<X>1230</X>
+		<X>1270</X>
 		<Y>350</Y>
 		<Label>
 			<X>10</X>
@@ -452,7 +232,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1669725778092</Id>
 		<Name><![CDATA[v_maxConnectionLoad_fr]]></Name>
-		<X>1230</X>
+		<X>1270</X>
 		<Y>160</Y>
 		<Label>
 			<X>10</X>
@@ -471,7 +251,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1671027786040</Id>
 		<Name><![CDATA[v_windProductionElectric_kW]]></Name>
-		<X>150</X>
+		<X>110</X>
 		<Y>1260</Y>
 		<Label>
 			<X>10</X>
@@ -487,192 +267,11 @@
 			<Type><![CDATA[double]]></Type>
 		</Properties>
 	</Variable>
-	<Variable Class="PlainVariable">
-		<Id>1671028145282</Id>
-		<Name><![CDATA[v_electricityProducedPV_kWh]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>150</X>
-		<Y>1400</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>
-		</Properties>
-	</Variable>
-	<Variable Class="PlainVariable">
-		<Id>1671028164395</Id>
-		<Name><![CDATA[v_electricityProducedWind_kWh]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>150</X>
-		<Y>1420</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>
-		</Properties>
-	</Variable>
-	<Variable Class="PlainVariable">
-		<Id>1671028183310</Id>
-		<Name><![CDATA[v_electricityConsumedFixedProfile_kWh]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>150</X>
-		<Y>1380</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>
-		</Properties>
-	</Variable>
-	<Variable Class="PlainVariable">
-		<Id>1671028204660</Id>
-		<Name><![CDATA[v_electricityConvertedToX_kWh]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>150</X>
-		<Y>1440</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>
-		</Properties>
-	</Variable>
-	<Variable Class="PlainVariable">
-		<Id>1671028232758</Id>
-		<Name><![CDATA[v_electricityChargedByEVs_kWh]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>150</X>
-		<Y>1480</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>
-		</Properties>
-	</Variable>
-	<Variable Class="PlainVariable">
-		<Id>1671028253782</Id>
-		<Name><![CDATA[v_electricityDischargedByEVs_kWh]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>150</X>
-		<Y>1500</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>
-		</Properties>
-	</Variable>
-	<Variable Class="PlainVariable">
-		<Id>1671028416277</Id>
-		<Name><![CDATA[v_xConvertedToElectricity_kWh]]></Name>
-		<Description><![CDATA[This is the amount of kWh produced. So not the amount of kWh that goes in!]]></Description>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>150</X>
-		<Y>1460</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>
-		</Properties>
-	</Variable>
-	<Variable Class="PlainVariable">
-		<Id>1671028484635</Id>
-		<Name><![CDATA[v_electricityChargedByBattery_kWh]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>150</X>
-		<Y>1520</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>
-		</Properties>
-	</Variable>
-	<Variable Class="PlainVariable">
-		<Id>1671028484651</Id>
-		<Name><![CDATA[v_electricityDischargedByBattery_kWh]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>150</X>
-		<Y>1540</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>
-		</Properties>
-	</Variable>
 	<Variable Class="PlainVariable">
 		<Id>1673870786520</Id>
 		<Name><![CDATA[v_electricHobConsumption_kW]]></Name>
 		<Description><![CDATA[This is part of the v_fixedConsumptionElectric_kW, thus variable only exists for additional information]]></Description>
-		<X>180</X>
+		<X>140</X>
 		<Y>1050</Y>
 		<Label>
 			<X>10</X>
@@ -691,8 +290,8 @@
 	<Variable Class="PlainVariable">
 		<Id>1673949346167</Id>
 		<Name><![CDATA[v_hotwaterDemand_kW]]></Name>
-		<X>450</X>
-		<Y>1100</Y>
+		<X>530</X>
+		<Y>1020</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -713,7 +312,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1674329641809</Id>
 		<Name><![CDATA[v_currentElectricityPriceConsumption_eurpkWh]]></Name>
-		<X>1230</X>
+		<X>1270</X>
 		<Y>370</Y>
 		<Label>
 			<X>10</X>
@@ -732,7 +331,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1674396166866</Id>
 		<Name><![CDATA[v_WTPCharging_eurpkWh]]></Name>
-		<X>1230</X>
+		<X>1270</X>
 		<Y>390</Y>
 		<Label>
 			<X>10</X>
@@ -751,29 +350,8 @@
 	<Variable Class="PlainVariable">
 		<Id>1676468216301</Id>
 		<Name><![CDATA[v_residualHeatGasPit_kW]]></Name>
-		<X>450</X>
-		<Y>1120</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>
-		</Properties>
-	</Variable>
-	<Variable Class="PlainVariable">
-		<Id>1677495410857</Id>
-		<Name><![CDATA[v_electricityTotalsCheck_kWh]]></Name>
-		<Description><![CDATA[Should always be zero]]></Description>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>150</X>
-		<Y>1610</Y>
+		<X>530</X>
+		<Y>1040</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -792,7 +370,7 @@
 		<Id>1677585426154</Id>
 		<Name><![CDATA[v_currentAveraged7kWElectricityPrice_eurpkWh]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>1230</X>
+		<X>1270</X>
 		<Y>490</Y>
 		<Label>
 			<X>10</X>
@@ -811,7 +389,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1678710234324</Id>
 		<Name><![CDATA[v_lowPassFactorLoad_fr]]></Name>
-		<X>1230</X>
+		<X>1270</X>
 		<Y>430</Y>
 		<Label>
 			<X>10</X>
@@ -833,7 +411,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1678710234329</Id>
 		<Name><![CDATA[v_currentLoadLowPassed_kW]]></Name>
-		<X>1230</X>
+		<X>1270</X>
 		<Y>450</Y>
 		<Label>
 			<X>10</X>
@@ -852,7 +430,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1695824940090</Id>
 		<Name><![CDATA[v_WTRV2G_eurpkWh]]></Name>
-		<X>1230</X>
+		<X>1270</X>
 		<Y>410</Y>
 		<Label>
 			<X>10</X>
@@ -872,7 +450,7 @@
 		<Id>1696837525849</Id>
 		<Name><![CDATA[v_heatPumpElectricityConsumption_kW]]></Name>
 		<Description><![CDATA[This is part of the v_fixedConsumptionElectric_kW, thus variable only exists for additional information]]></Description>
-		<X>180</X>
+		<X>140</X>
 		<Y>1070</Y>
 		<Label>
 			<X>10</X>
@@ -891,8 +469,8 @@
 	<Variable Class="PlainVariable">
 		<Id>1701700372072</Id>
 		<Name><![CDATA[v_currentEnergyCurtailed_kW]]></Name>
-		<X>160</X>
-		<Y>1660</Y>
+		<X>110</X>
+		<Y>1280</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -910,8 +488,8 @@
 	<Variable Class="PlainVariable">
 		<Id>1705421898378</Id>
 		<Name><![CDATA[v_currentPrimaryEnergyProductionHeatpumps_kW]]></Name>
-		<X>160</X>
-		<Y>1680</Y>
+		<X>530</X>
+		<Y>1100</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -929,7 +507,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1717414924763</Id>
 		<Name><![CDATA[v_hydrogenElectricityConsumption_kW]]></Name>
-		<X>180</X>
+		<X>140</X>
 		<Y>1090</Y>
 		<Label>
 			<X>10</X>
@@ -971,7 +549,7 @@
 		<Id>1720447120435</Id>
 		<Name><![CDATA[v_curtailmentPowerElectric_kW]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>150</X>
+		<X>110</X>
 		<Y>1150</Y>
 		<Label>
 			<X>10</X>
@@ -1062,7 +640,7 @@
 		<Id>1721833484396</Id>
 		<Name><![CDATA[v_previousPowerHeat_kW]]></Name>
 		<Description><![CDATA[Heat balance of previous timestep]]></Description>
-		<X>1230</X>
+		<X>1270</X>
 		<Y>290</Y>
 		<Label>
 			<X>10</X>
@@ -1171,8 +749,8 @@
 	<Variable Class="PlainVariable">
 		<Id>1726238237441</Id>
 		<Name><![CDATA[v_districtHeatDelivery_kW]]></Name>
-		<X>470</X>
-		<Y>1010</Y>
+		<X>530</X>
+		<Y>970</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1190,8 +768,8 @@
 	<Variable Class="PlainVariable">
 		<Id>1726425994811</Id>
 		<Name><![CDATA[v_heatpumpDelivery_kW]]></Name>
-		<X>470</X>
-		<Y>1030</Y>
+		<X>530</X>
+		<Y>990</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1379,7 +957,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1734088515133</Id>
 		<Name><![CDATA[v_CHPProductionElectric_kW]]></Name>
-		<X>150</X>
+		<X>110</X>
 		<Y>1170</Y>
 		<Label>
 			<X>10</X>
@@ -1398,7 +976,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1737539227165</Id>
 		<Name><![CDATA[v_batteryStoredEnergy_kWh]]></Name>
-		<X>150</X>
+		<X>110</X>
 		<Y>1190</Y>
 		<Label>
 			<X>10</X>
@@ -1418,7 +996,7 @@
 		<Id>1741182119260</Id>
 		<Name><![CDATA[v_rapidRunData]]></Name>
 		<X>570</X>
-		<Y>730</Y>
+		<Y>810</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1437,7 +1015,7 @@
 		<Id>1741182119264</Id>
 		<Name><![CDATA[v_liveData]]></Name>
 		<X>570</X>
-		<Y>660</Y>
+		<Y>740</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1456,7 +1034,7 @@
 		<Id>1741277722819</Id>
 		<Name><![CDATA[v_previousRunData]]></Name>
 		<X>570</X>
-		<Y>750</Y>
+		<Y>830</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1478,7 +1056,7 @@
 		<Id>1741871129695</Id>
 		<Name><![CDATA[v_liveAssetsMetaData]]></Name>
 		<X>590</X>
-		<Y>680</Y>
+		<Y>760</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1497,7 +1075,7 @@
 		<Id>1741942930553</Id>
 		<Name><![CDATA[v_liveConnectionMetaData]]></Name>
 		<X>590</X>
-		<Y>700</Y>
+		<Y>780</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1512,6 +1090,28 @@
 			<Type><![CDATA[J_ConnectionMetaData]]></Type>
 		</Properties>
 	</Variable>
+	<Variable Class="PlainVariable">
+		<Id>1750763679203</Id>
+		<Name><![CDATA[v_batteryChargingForecast_kW]]></Name>
+		<X>970</X>
+		<Y>380</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[new double[96]]]></Code>
+			</InitialValue>
+		</Properties>
+	</Variable>
 	<Variable Class="Parameter">
 		<Id>1658499438204</Id>
 		<Name><![CDATA[p_gridConnectionCategory]]></Name>
@@ -1775,32 +1375,6 @@
 			</ParameterEditor>
 		</Properties>
 	</Variable>
-	<Variable Class="Parameter">
-		<Id>1668180047824</Id>
-		<Name><![CDATA[p_energyAssetList]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>980</X>
-		<Y>-80</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[com.fasterxml.jackson.databind.node.ArrayNode]]></Type>
-			<UnitType>NONE</UnitType>
-			<SdArray>false</SdArray>
-			<ParameterEditor>
-				<Id>1668180047822</Id>
-				<EditorContolType>TEXT_BOX</EditorContolType>
-				<MinSliderValue>0</MinSliderValue>
-				<MaxSliderValue>100</MaxSliderValue>
-				<DelimeterType>NO_DELIMETER</DelimeterType>
-			</ParameterEditor>
-		</Properties>
-	</Variable>
 	<Variable Class="Parameter">
 		<Id>1668693393498</Id>
 		<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
@@ -1861,7 +1435,7 @@
 		<Id>1668695364192</Id>
 		<Name><![CDATA[p_batteryAsset]]></Name>
 		<X>600</X>
-		<Y>390</Y>
+		<Y>450</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1914,7 +1488,7 @@
 		<Id>1676449763319</Id>
 		<Name><![CDATA[p_heatBuffer]]></Name>
 		<X>600</X>
-		<Y>370</Y>
+		<Y>430</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1939,7 +1513,7 @@
 		<Id>1684919785784</Id>
 		<Name><![CDATA[p_gasBuffer]]></Name>
 		<X>600</X>
-		<Y>410</Y>
+		<Y>470</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1963,8 +1537,8 @@
 	<Variable Class="Parameter">
 		<Id>1692878211840</Id>
 		<Name><![CDATA[p_cookingTracker]]></Name>
-		<X>740</X>
-		<Y>230</Y>
+		<X>620</X>
+		<Y>270</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2013,8 +1587,8 @@
 	<Variable Class="Parameter">
 		<Id>1692973005119</Id>
 		<Name><![CDATA[p_DHWAsset]]></Name>
-		<X>741</X>
-		<Y>188</Y>
+		<X>621</X>
+		<Y>288</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2392,7 +1966,7 @@
 		<Id>1659962626907</Id>
 		<Name><![CDATA[c_storageAssets]]></Name>
 		<X>600</X>
-		<Y>270</Y>
+		<Y>310</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2410,7 +1984,7 @@
 		<Id>1659962626909</Id>
 		<Name><![CDATA[c_consumptionAssets]]></Name>
 		<X>600</X>
-		<Y>190</Y>
+		<Y>210</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2428,7 +2002,7 @@
 		<Id>1659962626911</Id>
 		<Name><![CDATA[c_productionAssets]]></Name>
 		<X>600</X>
-		<Y>210</Y>
+		<Y>230</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2446,7 +2020,7 @@
 		<Id>1659962626913</Id>
 		<Name><![CDATA[c_conversionAssets]]></Name>
 		<X>600</X>
-		<Y>230</Y>
+		<Y>250</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2464,7 +2038,7 @@
 		<Id>1667746389220</Id>
 		<Name><![CDATA[c_vehicleAssets]]></Name>
 		<X>600</X>
-		<Y>290</Y>
+		<Y>330</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2482,7 +2056,7 @@
 		<Id>1668359033654</Id>
 		<Name><![CDATA[c_vehiclesAvailableForCharging]]></Name>
 		<X>620</X>
-		<Y>310</Y>
+		<Y>370</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2500,7 +2074,7 @@
 		<Id>1669115948280</Id>
 		<Name><![CDATA[c_dieselVehicles]]></Name>
 		<X>620</X>
-		<Y>330</Y>
+		<Y>390</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2517,8 +2091,8 @@
 	<Variable Class="CollectionVariable">
 		<Id>1692864624612</Id>
 		<Name><![CDATA[c_tripTrackers]]></Name>
-		<X>720</X>
-		<Y>290</Y>
+		<X>620</X>
+		<Y>350</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2535,8 +2109,8 @@
 	<Variable Class="CollectionVariable">
 		<Id>1700044359363</Id>
 		<Name><![CDATA[c_profileAssets]]></Name>
-		<X>740</X>
-		<Y>170</Y>
+		<X>600</X>
+		<Y>188</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2572,7 +2146,7 @@
 		<Id>1711012701187</Id>
 		<Name><![CDATA[c_hydrogenVehicles]]></Name>
 		<X>620</X>
-		<Y>350</Y>
+		<Y>410</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2607,7 +2181,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1722516437894</Id>
 		<Name><![CDATA[c_fixedConsumptionElectricAssets]]></Name>
-		<X>-180</X>
+		<X>-280</X>
 		<Y>980</Y>
 		<Label>
 			<X>10</X>
@@ -2625,7 +2199,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1722516468629</Id>
 		<Name><![CDATA[c_electricHobAssets]]></Name>
-		<X>-180</X>
+		<X>-280</X>
 		<Y>1050</Y>
 		<Label>
 			<X>10</X>
@@ -2644,7 +2218,7 @@
 		<Id>1722516515981</Id>
 		<Name><![CDATA[c_conversionElectricAssets]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>-180</X>
+		<X>-280</X>
 		<Y>1030</Y>
 		<Label>
 			<X>10</X>
@@ -2662,7 +2236,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1722516532968</Id>
 		<Name><![CDATA[c_electricHeatpumpAssets]]></Name>
-		<X>-180</X>
+		<X>-280</X>
 		<Y>1070</Y>
 		<Label>
 			<X>10</X>
@@ -2680,7 +2254,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1722516544883</Id>
 		<Name><![CDATA[c_electrolyserAssets]]></Name>
-		<X>-180</X>
+		<X>-280</X>
 		<Y>1090</Y>
 		<Label>
 			<X>10</X>
@@ -2698,7 +2272,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1722516559744</Id>
 		<Name><![CDATA[c_EvAssets]]></Name>
-		<X>-180</X>
+		<X>-280</X>
 		<Y>1110</Y>
 		<Label>
 			<X>10</X>
@@ -2716,7 +2290,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1722516579645</Id>
 		<Name><![CDATA[c_pvAssets]]></Name>
-		<X>-180</X>
+		<X>-280</X>
 		<Y>1200</Y>
 		<Label>
 			<X>10</X>
@@ -2734,7 +2308,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1722516597938</Id>
 		<Name><![CDATA[c_windAssets]]></Name>
-		<X>-180</X>
+		<X>-280</X>
 		<Y>1220</Y>
 		<Label>
 			<X>10</X>
@@ -2752,7 +2326,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1722517079192</Id>
 		<Name><![CDATA[c_batteryAssets]]></Name>
-		<X>-180</X>
+		<X>-280</X>
 		<Y>1130</Y>
 		<Label>
 			<X>10</X>
@@ -2770,7 +2344,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1734089799023</Id>
 		<Name><![CDATA[c_chpAssets]]></Name>
-		<X>-180</X>
+		<X>-280</X>
 		<Y>1250</Y>
 		<Label>
 			<X>10</X>
@@ -2807,7 +2381,7 @@
 		<Id>1750258408126</Id>
 		<Name><![CDATA[c_chargers]]></Name>
 		<X>600</X>
-		<Y>431</Y>
+		<Y>491</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>