From 373a018737ef60859c14c3267fe99b9a2bf99c2b Mon Sep 17 00:00:00 2001
From: Ate Hempenius <ate@zenmo.com>
Date: Tue, 26 Aug 2025 15:42:14 +0200
Subject: [PATCH 1/4] Initial port and cleanup

---
 Zero_engine.alpx                              |  39 ++++++
 _alp/Agents/EnergyCoop/Code/Functions.java    |  11 ++
 _alp/Agents/EnergyCoop/Code/Functions.xml     |  32 +++++
 _alp/Agents/EnergyCoop/Variables.xml          |  25 ++++
 _alp/Agents/EnergyModel/Code/Functions.java   |  13 ++
 _alp/Agents/EnergyModel/Code/Functions.xml    |  24 +++-
 _alp/Agents/EnergyModel/EmbeddedObjects.xml   |   3 +
 .../Agents/EnergyModel/Levels/Level.level.xml |   8 +-
 _alp/Agents/EnergyModel/Variables.xml         |  28 ++---
 _alp/Agents/GridConnection/Code/Functions.xml |  50 ++++----
 .../GridConnection/Levels/Level.level.xml     |  75 ++---------
 _alp/Agents/GridConnection/Variables.xml      | 114 +++++++----------
 .../Class.I_AggregatorBatteryManagement.java  |  26 ++++
 _alp/Classes/Class.I_BatteryManagement.java   |   1 +
 ...I_InterfaceAggragotrBatteryManagement.java |   8 ++
 ...CollectiveSelfConsumption_batterySize.java |  62 ++++++++++
 ...tCollectiveSelfConsumption_exportRate.java | 116 ++++++++++++++++++
 ...ollectiveSelfConsumption_exportRateGH.java |  91 ++++++++++++++
 ...lass.J_AggregatorBatteryManagementOff.java |  47 +++++++
 ...s.J_BatteryManagementExternalSetpoint.java |  62 ++++++++++
 20 files changed, 655 insertions(+), 180 deletions(-)
 create mode 100644 _alp/Classes/Class.I_AggregatorBatteryManagement.java
 create mode 100644 _alp/Classes/Class.I_InterfaceAggragotrBatteryManagement.java
 create mode 100644 _alp/Classes/Class.J_AggregatorBatteryManagementCollectiveSelfConsumption_batterySize.java
 create mode 100644 _alp/Classes/Class.J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRate.java
 create mode 100644 _alp/Classes/Class.J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRateGH.java
 create mode 100644 _alp/Classes/Class.J_AggregatorBatteryManagementOff.java
 create mode 100644 _alp/Classes/Class.J_BatteryManagementExternalSetpoint.java

diff --git a/Zero_engine.alpx b/Zero_engine.alpx
index 058d4c06..c3111ee5 100644
--- a/Zero_engine.alpx
+++ b/Zero_engine.alpx
@@ -1107,6 +1107,11 @@
 				<Id>1755154772688</Id>
 				<Name><![CDATA[ChargingManagement]]></Name>
 			</Folder>
+			<Folder>
+				<Id>1756210851750</Id>
+				<Name><![CDATA[AggregatorAlgorithms]]></Name>
+				<ParentId>1752677826356</ParentId>
+			</Folder>
 		</Folders>
 		<ActiveObjectClasses/>
 		<DifferentialEquationsMethod>EULER</DifferentialEquationsMethod>
@@ -1665,6 +1670,40 @@
 				<Name><![CDATA[J_ChargingManagementLocalBalancing]]></Name>
 				<Folder>1755154772688</Folder>
 			</JavaClass>
+			<JavaClass>
+				<Id>1756208281968</Id>
+				<Name><![CDATA[J_BatteryManagementExternalSetpoint]]></Name>
+				<Folder>1752677826356</Folder>
+			</JavaClass>
+			<JavaClass>
+				<Id>1756210474555</Id>
+				<Name><![CDATA[I_InterfaceAggragotrBatteryManagement]]></Name>
+			</JavaClass>
+			<JavaClass>
+				<Id>1756210846035</Id>
+				<Name><![CDATA[I_AggregatorBatteryManagement]]></Name>
+				<Folder>1756210851750</Folder>
+			</JavaClass>
+			<JavaClass>
+				<Id>1756211095187</Id>
+				<Name><![CDATA[J_AggregatorBatteryManagementOff]]></Name>
+				<Folder>1756210851750</Folder>
+			</JavaClass>
+			<JavaClass>
+				<Id>1756212442478</Id>
+				<Name><![CDATA[J_AggregatorBatteryManagementCollectiveSelfConsumption_batterySize]]></Name>
+				<Folder>1756210851750</Folder>
+			</JavaClass>
+			<JavaClass>
+				<Id>1756213000574</Id>
+				<Name><![CDATA[J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRate]]></Name>
+				<Folder>1756210851750</Folder>
+			</JavaClass>
+			<JavaClass>
+				<Id>1756213864971</Id>
+				<Name><![CDATA[J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRateGH]]></Name>
+				<Folder>1756210851750</Folder>
+			</JavaClass>
 		</JavaClasses>
 		<RequiredLibraryReference>
 			<LibraryName>com.anylogic.libraries.modules.markup_descriptors</LibraryName>
diff --git a/_alp/Agents/EnergyCoop/Code/Functions.java b/_alp/Agents/EnergyCoop/Code/Functions.java
index b59ed006..c2fed749 100644
--- a/_alp/Agents/EnergyCoop/Code/Functions.java
+++ b/_alp/Agents/EnergyCoop/Code/Functions.java
@@ -1581,3 +1581,14 @@ List<GridConnection> f_getMemberGridConnectionsCollectionPointer()
 return this.c_memberGridConnections; // This should NOT be a copy, it should be a pointer!!
 /*ALCODEEND*/}
 
+double f_aggregatorBatteryManagementEnergyCoop()
+{/*ALCODESTART::1756207893357*/
+p_aggregatorBatteryManagement.manageExternalSetpoints();
+/*ALCODEEND*/}
+
+double f_aggregatorManagement_EnergyCoop()
+{/*ALCODESTART::1756207893363*/
+//Run battery setpoint management
+f_aggregatorBatteryManagementEnergyCoop();
+/*ALCODEEND*/}
+
diff --git a/_alp/Agents/EnergyCoop/Code/Functions.xml b/_alp/Agents/EnergyCoop/Code/Functions.xml
index 71e7911b..4fb96fb1 100644
--- a/_alp/Agents/EnergyCoop/Code/Functions.xml
+++ b/_alp/Agents/EnergyCoop/Code/Functions.xml
@@ -705,4 +705,36 @@
 		<ShowLabel>true</ShowLabel>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1756207893357</Id>
+		<Name><![CDATA[f_aggregatorBatteryManagementEnergyCoop]]></Name>
+		<X>660</X>
+		<Y>690</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>1756207893363</Id>
+		<Name><![CDATA[f_aggregatorManagement_EnergyCoop]]></Name>
+		<X>650</X>
+		<Y>670</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
 </Functions>
diff --git a/_alp/Agents/EnergyCoop/Variables.xml b/_alp/Agents/EnergyCoop/Variables.xml
index 73f51e1a..3eb04235 100644
--- a/_alp/Agents/EnergyCoop/Variables.xml
+++ b/_alp/Agents/EnergyCoop/Variables.xml
@@ -1984,6 +1984,31 @@
 			</ParameterEditor>
 		</Properties>
 	</Variable>
+	<Variable Class="Parameter">
+		<Id>1756207893367</Id>
+		<Name><![CDATA[p_aggregatorBatteryManagement]]></Name>
+		<X>670</X>
+		<Y>710</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[I_AggregatorBatteryManagement]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<ParameterEditor>
+				<Id>1756207893365</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
 	<Variable Class="CollectionVariable">
 		<Id>1679563561816</Id>
 		<Name><![CDATA[c_actorContracts]]></Name>
diff --git a/_alp/Agents/EnergyModel/Code/Functions.java b/_alp/Agents/EnergyModel/Code/Functions.java
index 65ba6772..93a9ba00 100644
--- a/_alp/Agents/EnergyModel/Code/Functions.java
+++ b/_alp/Agents/EnergyModel/Code/Functions.java
@@ -176,6 +176,9 @@
 	}
 }
 
+//Call aggregator functions
+f_runAggregators();
+
 for(GridConnection gc : c_gridConnections) { // Can't do this in parallel due to different threads writing to the same values!
 	
 	fm_currentBalanceFlows_kW.addFlows(gc.fm_currentBalanceFlows_kW);
@@ -1139,3 +1142,13 @@ List<GridConnection> f_getPausedGridConnectionsCollectionPointer()
 return this.c_pausedGridConnections;
 /*ALCODEEND*/}
 
+double f_runAggregators()
+{/*ALCODESTART::1756207695591*/
+//Function used to perform central management functions (like setpoint battery steering, within a timestep)
+
+//Run energy coop aggrator
+for (EnergyCoop EC : pop_energyCoops) {
+	EC.f_aggregatorManagement_EnergyCoop();
+}
+/*ALCODEEND*/}
+
diff --git a/_alp/Agents/EnergyModel/Code/Functions.xml b/_alp/Agents/EnergyModel/Code/Functions.xml
index b8d77990..fa4c56a3 100644
--- a/_alp/Agents/EnergyModel/Code/Functions.xml
+++ b/_alp/Agents/EnergyModel/Code/Functions.xml
@@ -6,7 +6,7 @@
 		<Id>1664894248130</Id>
 		<Name><![CDATA[f_updatePricesForNextTimestep]]></Name>
 		<X>1090</X>
-		<Y>290</Y>
+		<Y>310</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -46,7 +46,7 @@
 		<Id>1665051878402</Id>
 		<Name><![CDATA[f_calculateGridnodeFlows]]></Name>
 		<X>1090</X>
-		<Y>250</Y>
+		<Y>270</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -66,7 +66,7 @@
 		<Id>1665051962956</Id>
 		<Name><![CDATA[f_calculateActorFlows]]></Name>
 		<X>1090</X>
-		<Y>270</Y>
+		<Y>290</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -444,7 +444,7 @@
 		<Id>1731329529733</Id>
 		<Name><![CDATA[f_updateLiveData]]></Name>
 		<X>1091</X>
-		<Y>313</Y>
+		<Y>333</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -682,4 +682,20 @@
 		<ShowLabel>true</ShowLabel>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1756207695591</Id>
+		<Name><![CDATA[f_runAggregators]]></Name>
+		<X>1110</X>
+		<Y>250</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
 </Functions>
diff --git a/_alp/Agents/EnergyModel/EmbeddedObjects.xml b/_alp/Agents/EnergyModel/EmbeddedObjects.xml
index 97d00d9a..da40a133 100644
--- a/_alp/Agents/EnergyModel/EmbeddedObjects.xml
+++ b/_alp/Agents/EnergyModel/EmbeddedObjects.xml
@@ -716,6 +716,9 @@
 			<Parameter>
 				<Name><![CDATA[p_actorSubgroup]]></Name>
 			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_aggregatorBatteryManagement]]></Name>
+			</Parameter>
 		</Parameters>
 		<ReplicationFlag>true</ReplicationFlag>
 		<Replication Class="CodeValue">
diff --git a/_alp/Agents/EnergyModel/Levels/Level.level.xml b/_alp/Agents/EnergyModel/Levels/Level.level.xml
index e2c510a3..4962ad8e 100644
--- a/_alp/Agents/EnergyModel/Levels/Level.level.xml
+++ b/_alp/Agents/EnergyModel/Levels/Level.level.xml
@@ -1030,7 +1030,7 @@ energyDataViewer.viewArea.navigateTo();</ActionCode>
 		<Id>1729238026851</Id>
 		<Name><![CDATA[txt_rapidRunTimeProfiling]]></Name>
 		<X>1143</X>
-		<Y>578</Y>
+		<Y>598</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -1055,7 +1055,7 @@ energyDataViewer.viewArea.navigateTo();</ActionCode>
 		<Id>1671703651139</Id>
 		<Name><![CDATA[line_rapidRunTimeProfiling]]></Name>
 		<X>1040</X>
-		<Y>600</Y>
+		<Y>620</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1135,7 +1135,7 @@ energyDataViewer.viewArea.navigateTo();</ActionCode>
 		<Id>1753355115074</Id>
 		<Name><![CDATA[line_timeParametersAndVariables]]></Name>
 		<X>1050</X>
-		<Y>340</Y>
+		<Y>360</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1163,7 +1163,7 @@ energyDataViewer.viewArea.navigateTo();</ActionCode>
 		<Id>1753355117052</Id>
 		<Name><![CDATA[txt_timeParametersAndVariables]]></Name>
 		<X>1150</X>
-		<Y>320</Y>
+		<Y>340</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
diff --git a/_alp/Agents/EnergyModel/Variables.xml b/_alp/Agents/EnergyModel/Variables.xml
index 6da707b5..429f38fc 100644
--- a/_alp/Agents/EnergyModel/Variables.xml
+++ b/_alp/Agents/EnergyModel/Variables.xml
@@ -81,7 +81,7 @@
 		<Id>1663238634515</Id>
 		<Name><![CDATA[v_timeStepsElapsed]]></Name>
 		<X>1070</X>
-		<Y>400</Y>
+		<Y>420</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -236,7 +236,7 @@
 		<Id>1683718894234</Id>
 		<Name><![CDATA[v_timeSeriesRuntime_ms]]></Name>
 		<X>1051</X>
-		<Y>620</Y>
+		<Y>640</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -255,7 +255,7 @@
 		<Id>1683718916458</Id>
 		<Name><![CDATA[v_gridNodesRuntime_ms]]></Name>
 		<X>1051</X>
-		<Y>660</Y>
+		<Y>680</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -274,7 +274,7 @@
 		<Id>1683718921466</Id>
 		<Name><![CDATA[v_gridConnectionsRuntime_ms]]></Name>
 		<X>1051</X>
-		<Y>640</Y>
+		<Y>660</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -293,7 +293,7 @@
 		<Id>1683718924632</Id>
 		<Name><![CDATA[v_incentivesRuntime_ms]]></Name>
 		<X>1051</X>
-		<Y>700</Y>
+		<Y>720</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -312,7 +312,7 @@
 		<Id>1683718924634</Id>
 		<Name><![CDATA[v_financialsRuntime_ms]]></Name>
 		<X>1051</X>
-		<Y>680</Y>
+		<Y>700</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -463,7 +463,7 @@
 		<Id>1699277193134</Id>
 		<Name><![CDATA[t_h]]></Name>
 		<X>1070</X>
-		<Y>360</Y>
+		<Y>380</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -810,7 +810,7 @@
 		<Id>1715074195578</Id>
 		<Name><![CDATA[v_kpiCalcsRuntime_ms]]></Name>
 		<X>1051</X>
-		<Y>720</Y>
+		<Y>740</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1155,7 +1155,7 @@
 		<Id>1731422680250</Id>
 		<Name><![CDATA[b_isDaytime]]></Name>
 		<X>1070</X>
-		<Y>430</Y>
+		<Y>450</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1177,7 +1177,7 @@
 		<Id>1731422698257</Id>
 		<Name><![CDATA[b_isWeekday]]></Name>
 		<X>1070</X>
-		<Y>450</Y>
+		<Y>470</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1199,7 +1199,7 @@
 		<Id>1731422704613</Id>
 		<Name><![CDATA[b_isSummerWeek]]></Name>
 		<X>1070</X>
-		<Y>472</Y>
+		<Y>492</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1221,7 +1221,7 @@
 		<Id>1731422714256</Id>
 		<Name><![CDATA[b_isWinterWeek]]></Name>
 		<X>1070</X>
-		<Y>492</Y>
+		<Y>512</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1243,7 +1243,7 @@
 		<Id>1731422900385</Id>
 		<Name><![CDATA[b_isLastTimeStepOfDay]]></Name>
 		<X>1070</X>
-		<Y>512</Y>
+		<Y>532</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1265,7 +1265,7 @@
 		<Id>1731423522698</Id>
 		<Name><![CDATA[t_hourOfDay]]></Name>
 		<X>1070</X>
-		<Y>380</Y>
+		<Y>400</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
diff --git a/_alp/Agents/GridConnection/Code/Functions.xml b/_alp/Agents/GridConnection/Code/Functions.xml
index a08173a0..b4a0bc4f 100644
--- a/_alp/Agents/GridConnection/Code/Functions.xml
+++ b/_alp/Agents/GridConnection/Code/Functions.xml
@@ -22,7 +22,7 @@
 		<Id>1660212665961</Id>
 		<Name><![CDATA[f_connectionMetering]]></Name>
 		<X>910</X>
-		<Y>390</Y>
+		<Y>400</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -38,7 +38,7 @@
 		<Id>1664961435385</Id>
 		<Name><![CDATA[f_operateFlexAssets]]></Name>
 		<X>910</X>
-		<Y>220</Y>
+		<Y>230</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -54,7 +54,7 @@
 		<Id>1668528273163</Id>
 		<Name><![CDATA[f_calculateEnergyBalance]]></Name>
 		<X>890</X>
-		<Y>180</Y>
+		<Y>190</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -70,7 +70,7 @@
 		<Id>1668528300576</Id>
 		<Name><![CDATA[f_operateFixedAssets]]></Name>
 		<X>910</X>
-		<Y>200</Y>
+		<Y>210</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -102,7 +102,7 @@
 		<Id>1671095995172</Id>
 		<Name><![CDATA[f_manageEVCharging]]></Name>
 		<X>920</X>
-		<Y>310</Y>
+		<Y>320</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -297,7 +297,7 @@
 		<Id>1702373771433</Id>
 		<Name><![CDATA[f_addFlows]]></Name>
 		<X>930</X>
-		<Y>240</Y>
+		<Y>250</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -416,7 +416,7 @@
 		<Id>1720442672576</Id>
 		<Name><![CDATA[f_curtailment]]></Name>
 		<X>910</X>
-		<Y>360</Y>
+		<Y>370</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -433,7 +433,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>470</Y>
+		<Y>480</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -450,7 +450,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>490</Y>
+		<Y>500</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -470,7 +470,7 @@
 		<Id>1722512642645</Id>
 		<Name><![CDATA[f_removeFlows]]></Name>
 		<X>1060</X>
-		<Y>240</Y>
+		<Y>250</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -502,7 +502,7 @@
 		<Id>1722518225504</Id>
 		<Name><![CDATA[f_fillLiveDataSets]]></Name>
 		<X>930</X>
-		<Y>430</Y>
+		<Y>440</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -518,7 +518,7 @@
 		<Id>1722518905501</Id>
 		<Name><![CDATA[f_rapidRunDataLogging]]></Name>
 		<X>930</X>
-		<Y>410</Y>
+		<Y>420</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -535,7 +535,7 @@
 		<Name><![CDATA[f_setActive]]></Name>
 		<Description><![CDATA[Function to pause a gridconnection so it is not operated or counted towards totals in the energy model.]]></Description>
 		<X>270</X>
-		<Y>350</Y>
+		<Y>330</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -592,7 +592,7 @@
 		<Id>1750258434630</Id>
 		<Name><![CDATA[f_manageChargePoints]]></Name>
 		<X>920</X>
-		<Y>330</Y>
+		<Y>340</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -608,7 +608,7 @@
 		<Id>1753099764237</Id>
 		<Name><![CDATA[f_manageHeating]]></Name>
 		<X>920</X>
-		<Y>290</Y>
+		<Y>300</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -624,7 +624,7 @@
 		<Id>1752570332887</Id>
 		<Name><![CDATA[f_manageBattery]]></Name>
 		<X>920</X>
-		<Y>270</Y>
+		<Y>280</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -655,8 +655,8 @@
 		<ReturnType>double</ReturnType>
 		<Id>1753969724598</Id>
 		<Name><![CDATA[f_removeAllHeatingAssets]]></Name>
-		<X>450</X>
-		<Y>-130</Y>
+		<X>620</X>
+		<Y>150</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -671,8 +671,8 @@
 		<ReturnType>OL_GridConnectionHeatingType</ReturnType>
 		<Id>1754051705071</Id>
 		<Name><![CDATA[f_getCurrentHeatingType]]></Name>
-		<X>450</X>
-		<Y>-110</Y>
+		<X>640</X>
+		<Y>130</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -689,7 +689,7 @@
 		<Name><![CDATA[f_addHeatManagementToGC]]></Name>
 		<Description><![CDATA[This function takes heatingType as an argument and adds the default heating management class to the GridConnection]]></Description>
 		<X>890</X>
-		<Y>530</Y>
+		<Y>540</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -716,7 +716,7 @@
 		<ReturnType>EnergyCoop</ReturnType>
 		<Id>1754380684463</Id>
 		<Name><![CDATA[f_addConsumptionEnergyCarrier]]></Name>
-		<X>1285</X>
+		<X>1325</X>
 		<Y>67</Y>
 		<Label>
 			<X>10</X>
@@ -736,7 +736,7 @@
 		<ReturnType>EnergyCoop</ReturnType>
 		<Id>1754380684465</Id>
 		<Name><![CDATA[f_addProductionEnergyCarrier]]></Name>
-		<X>1285</X>
+		<X>1325</X>
 		<Y>87</Y>
 		<Label>
 			<X>10</X>
@@ -756,7 +756,7 @@
 		<ReturnType>EnergyCoop</ReturnType>
 		<Id>1754380684467</Id>
 		<Name><![CDATA[f_addAssetFlow]]></Name>
-		<X>1285</X>
+		<X>1325</X>
 		<Y>107</Y>
 		<Label>
 			<X>10</X>
@@ -798,7 +798,7 @@
 		<Name><![CDATA[f_addChargingManagementToGC]]></Name>
 		<Description><![CDATA[This function takes heatingType as an argument and adds the default heating management class to the GridConnection]]></Description>
 		<X>890</X>
-		<Y>550</Y>
+		<Y>560</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 6e9794b0..47862932 100644
--- a/_alp/Agents/GridConnection/Levels/Level.level.xml
+++ b/_alp/Agents/GridConnection/Levels/Level.level.xml
@@ -2,7 +2,7 @@
 <Presentation>
 	<Rectangle>
 		<Id>1674329507571</Id>
-		<Name><![CDATA[rectangle3]]></Name>
+		<Name><![CDATA[rect_energyBalance]]></Name>
 		<X>0</X>
 		<Y>600</Y>
 		<Label>
@@ -21,7 +21,7 @@
 		<LineColor/>
 		<LineMaterial>null</LineMaterial>
 		<LineStyle>SOLID</LineStyle>
-		<Width>540</Width>
+		<Width>700</Width>
 		<Height>380</Height>
 		<Rotation>0.0</Rotation>
 		<FillColor>-983041</FillColor>
@@ -296,7 +296,7 @@
 		<Id>1667915419987</Id>
 		<Name><![CDATA[text6]]></Name>
 		<X>840</X>
-		<Y>290</Y>
+		<Y>300</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -321,7 +321,7 @@
 		<Id>1667915419990</Id>
 		<Name><![CDATA[line6]]></Name>
 		<X>860</X>
-		<Y>170</Y>
+		<Y>180</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -345,64 +345,11 @@
 		<Dy>190</Dy>
 		<Dz>0</Dz>
 	</Line>
-	<Line>
-		<Id>1667918827406</Id>
-		<Name><![CDATA[line7]]></Name>
-		<X>-220</X>
-		<Y>380</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>false</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>1667918827418</Id>
-		<Name><![CDATA[text7]]></Name>
-		<X>-180</X>
-		<Y>360</Y>
-		<Label>
-			<X>0</X>
-			<Y>-10</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>false</PresentationFlag>
-		<ShowLabel>false</ShowLabel>
-		<DrawMode>SHAPE_DRAW_2D</DrawMode>
-		<EmbeddedIcon>false</EmbeddedIcon>
-		<Z>0</Z>
-		<Rotation>0.0</Rotation>
-		<Color>-16777216</Color>
-		<Text><![CDATA[Not visible]]></Text>
-		<Font>
-			<Name><![CDATA[SansSerif]]></Name>
-			<Size>11</Size>
-			<Style>0</Style>
-		</Font>
-		<Alignment>LEFT</Alignment>
-	</Text>
 	<TimePlot>
 		<Id>1668439095469</Id>
 		<Name><![CDATA[pl_powerFlows]]></Name>
-		<X>560</X>
-		<Y>600</Y>
+		<X>730</X>
+		<Y>640</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -535,8 +482,8 @@
 	<Text>
 		<Id>1670512816306</Id>
 		<Name><![CDATA[text10]]></Name>
-		<X>680</X>
-		<Y>580</Y>
+		<X>850</X>
+		<Y>630</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -559,8 +506,8 @@
 	</Text>
 	<Text>
 		<Id>1674329550133</Id>
-		<Name><![CDATA[text8]]></Name>
-		<X>180</X>
+		<Name><![CDATA[txt_energyBalance]]></Name>
+		<X>350</X>
 		<Y>610</Y>
 		<Label>
 			<X>0</X>
@@ -580,7 +527,7 @@
 			<Size>20</Size>
 			<Style>0</Style>
 		</Font>
-		<Alignment>LEFT</Alignment>
+		<Alignment>CENTER</Alignment>
 	</Text>
 	<Control Type="Button">
 		<EmbeddedIcon>false</EmbeddedIcon>
diff --git a/_alp/Agents/GridConnection/Variables.xml b/_alp/Agents/GridConnection/Variables.xml
index 86b518c5..dc4df818 100644
--- a/_alp/Agents/GridConnection/Variables.xml
+++ b/_alp/Agents/GridConnection/Variables.xml
@@ -22,30 +22,6 @@
 			</InitialValue>
 		</Properties>
 	</Variable>
-	<Variable Class="PlainVariable">
-		<Id>1667746610980</Id>
-		<Name><![CDATA[v_vehicleIndex]]></Name>
-		<Description><![CDATA[Wordt gebruikt om voertuigen aan assets te koppelen tijden initialisatie.]]></Description>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>-190</X>
-		<Y>400</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>false</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Properties SaveInSnapshot="true"
-              Constant="false"
-              AccessType="public"
-              StaticVariable="false">
-			<Type><![CDATA[int]]></Type>
-			<InitialValue Class="CodeValue">
-				<Code><![CDATA[0]]></Code>
-			</InitialValue>
-		</Properties>
-	</Variable>
 	<Variable Class="PlainVariable">
 		<Id>1674329641809</Id>
 		<Name><![CDATA[v_currentElectricityPriceConsumption_eurpkWh]]></Name>
@@ -171,7 +147,7 @@
 		<Id>1720442507543</Id>
 		<Name><![CDATA[v_enableCurtailment]]></Name>
 		<X>270</X>
-		<Y>260</Y>
+		<Y>240</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -194,7 +170,7 @@
 		<Name><![CDATA[v_nfatoWeekendDeliveryCapacity_kW]]></Name>
 		<Description><![CDATA[Capacities for Non-Firm ATO per hour of the day ]]></Description>
 		<X>270</X>
-		<Y>160</Y>
+		<Y>170</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -217,7 +193,7 @@
 		<Name><![CDATA[v_nfatoWeekDeliveryCapacity_kW]]></Name>
 		<Description><![CDATA[Capacities for Non-Firm ATO per hour of the day ]]></Description>
 		<X>270</X>
-		<Y>140</Y>
+		<Y>150</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -239,7 +215,7 @@
 		<Id>1720520594279</Id>
 		<Name><![CDATA[v_enableNFato]]></Name>
 		<X>270</X>
-		<Y>280</Y>
+		<Y>260</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -284,7 +260,7 @@
 		<Id>1721821764640</Id>
 		<Name><![CDATA[v_hasQuarterHourlyValues]]></Name>
 		<X>270</X>
-		<Y>300</Y>
+		<Y>280</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -304,7 +280,7 @@
 		<Name><![CDATA[v_nfatoWeekendFeedinCapacity_kW]]></Name>
 		<Description><![CDATA[Capacities for Non-Firm ATO per hour of the day ]]></Description>
 		<X>270</X>
-		<Y>200</Y>
+		<Y>210</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -327,7 +303,7 @@
 		<Name><![CDATA[v_nfatoWeekFeedinCapacity_kW]]></Name>
 		<Description><![CDATA[Capacities for Non-Firm ATO per hour of the day ]]></Description>
 		<X>270</X>
-		<Y>180</Y>
+		<Y>190</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -443,7 +419,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1731576190939</Id>
 		<Name><![CDATA[v_activeEnergyCarriers]]></Name>
-		<X>320</X>
+		<X>380</X>
 		<Y>660</Y>
 		<Label>
 			<X>10</X>
@@ -462,7 +438,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1733478609497</Id>
 		<Name><![CDATA[v_activeConsumptionEnergyCarriers]]></Name>
-		<X>330</X>
+		<X>390</X>
 		<Y>700</Y>
 		<Label>
 			<X>10</X>
@@ -481,7 +457,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1733478609500</Id>
 		<Name><![CDATA[v_activeProductionEnergyCarriers]]></Name>
-		<X>330</X>
+		<X>390</X>
 		<Y>680</Y>
 		<Label>
 			<X>10</X>
@@ -519,7 +495,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1741182119260</Id>
 		<Name><![CDATA[v_rapidRunData]]></Name>
-		<X>320</X>
+		<X>390</X>
 		<Y>840</Y>
 		<Label>
 			<X>10</X>
@@ -538,7 +514,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1741182119264</Id>
 		<Name><![CDATA[v_liveData]]></Name>
-		<X>320</X>
+		<X>390</X>
 		<Y>900</Y>
 		<Label>
 			<X>10</X>
@@ -557,7 +533,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1741277722819</Id>
 		<Name><![CDATA[v_previousRunData]]></Name>
-		<X>320</X>
+		<X>390</X>
 		<Y>860</Y>
 		<Label>
 			<X>10</X>
@@ -579,7 +555,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1741871129695</Id>
 		<Name><![CDATA[v_liveAssetsMetaData]]></Name>
-		<X>330</X>
+		<X>400</X>
 		<Y>920</Y>
 		<Label>
 			<X>10</X>
@@ -598,7 +574,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1741942930553</Id>
 		<Name><![CDATA[v_liveConnectionMetaData]]></Name>
-		<X>330</X>
+		<X>400</X>
 		<Y>940</Y>
 		<Label>
 			<X>10</X>
@@ -794,7 +770,7 @@
 		<Id>1668695364192</Id>
 		<Name><![CDATA[p_batteryAsset]]></Name>
 		<X>620</X>
-		<Y>480</Y>
+		<Y>500</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -847,7 +823,7 @@
 		<Id>1676449763319</Id>
 		<Name><![CDATA[p_heatBuffer]]></Name>
 		<X>620</X>
-		<Y>460</Y>
+		<Y>480</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -872,7 +848,7 @@
 		<Id>1684919785784</Id>
 		<Name><![CDATA[p_gasBuffer]]></Name>
 		<X>620</X>
-		<Y>520</Y>
+		<Y>540</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -897,7 +873,7 @@
 		<Id>1692878211840</Id>
 		<Name><![CDATA[p_cookingTracker]]></Name>
 		<X>620</X>
-		<Y>270</Y>
+		<Y>290</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -922,7 +898,7 @@
 		<Id>1692890035894</Id>
 		<Name><![CDATA[p_energyLabel]]></Name>
 		<X>50</X>
-		<Y>450</Y>
+		<Y>460</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -947,7 +923,7 @@
 		<Id>1692973005119</Id>
 		<Name><![CDATA[p_DHWAsset]]></Name>
 		<X>620</X>
-		<Y>210</Y>
+		<Y>230</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -975,7 +951,7 @@
 		<Id>1697021029662</Id>
 		<Name><![CDATA[p_longitude]]></Name>
 		<X>50</X>
-		<Y>295</Y>
+		<Y>315</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1000,7 +976,7 @@
 		<Id>1697021029674</Id>
 		<Name><![CDATA[p_latitude]]></Name>
 		<X>50</X>
-		<Y>315</Y>
+		<Y>335</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1025,7 +1001,7 @@
 		<Id>1698935198538</Id>
 		<Name><![CDATA[p_floorSurfaceArea_m2]]></Name>
 		<X>50</X>
-		<Y>410</Y>
+		<Y>420</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1050,7 +1026,7 @@
 		<Id>1700492967648</Id>
 		<Name><![CDATA[p_GISPoint]]></Name>
 		<X>50</X>
-		<Y>275</Y>
+		<Y>295</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1100,7 +1076,7 @@
 		<Id>1714137460172</Id>
 		<Name><![CDATA[p_roofSurfaceArea_m2]]></Name>
 		<X>50</X>
-		<Y>430</Y>
+		<Y>440</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1125,7 +1101,7 @@
 		<Id>1718887078133</Id>
 		<Name><![CDATA[p_purposeBAG]]></Name>
 		<X>50</X>
-		<Y>389</Y>
+		<Y>399</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1204,7 +1180,7 @@
 		<Name><![CDATA[p_address]]></Name>
 		<Description><![CDATA[A Java class that contains all the relevant information about the grid connection address. The class contains a method .getAddress() which returns a formatted String of the address.]]></Description>
 		<X>50</X>
-		<Y>350</Y>
+		<Y>370</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1304,7 +1280,7 @@
 		<Id>1752752664510</Id>
 		<Name><![CDATA[p_batteryAlgorithm]]></Name>
 		<X>640</X>
-		<Y>500</Y>
+		<Y>520</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1329,7 +1305,7 @@
 		<Id>1753366605959</Id>
 		<Name><![CDATA[v_isActive]]></Name>
 		<X>270</X>
-		<Y>320</Y>
+		<Y>310</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1357,7 +1333,7 @@
 		<Id>1755154851784</Id>
 		<Name><![CDATA[p_chargingManagement]]></Name>
 		<X>640</X>
-		<Y>350</Y>
+		<Y>370</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1403,7 +1379,7 @@
 		<Id>1659962626907</Id>
 		<Name><![CDATA[c_storageAssets]]></Name>
 		<X>600</X>
-		<Y>440</Y>
+		<Y>460</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1421,7 +1397,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>
@@ -1439,7 +1415,7 @@
 		<Id>1659962626911</Id>
 		<Name><![CDATA[c_productionAssets]]></Name>
 		<X>600</X>
-		<Y>230</Y>
+		<Y>250</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1457,7 +1433,7 @@
 		<Id>1659962626913</Id>
 		<Name><![CDATA[c_conversionAssets]]></Name>
 		<X>600</X>
-		<Y>250</Y>
+		<Y>270</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1475,7 +1451,7 @@
 		<Id>1667746389220</Id>
 		<Name><![CDATA[c_vehicleAssets]]></Name>
 		<X>600</X>
-		<Y>290</Y>
+		<Y>310</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1493,7 +1469,7 @@
 		<Id>1669115948280</Id>
 		<Name><![CDATA[c_dieselVehicles]]></Name>
 		<X>620</X>
-		<Y>370</Y>
+		<Y>390</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1511,7 +1487,7 @@
 		<Id>1692864624612</Id>
 		<Name><![CDATA[c_tripTrackers]]></Name>
 		<X>620</X>
-		<Y>310</Y>
+		<Y>330</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1529,7 +1505,7 @@
 		<Id>1700044359363</Id>
 		<Name><![CDATA[c_profileAssets]]></Name>
 		<X>600</X>
-		<Y>168</Y>
+		<Y>188</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1547,7 +1523,7 @@
 		<Id>1704895219414</Id>
 		<Name><![CDATA[c_connectedGISObjects]]></Name>
 		<X>50</X>
-		<Y>480</Y>
+		<Y>490</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1565,7 +1541,7 @@
 		<Id>1711012701187</Id>
 		<Name><![CDATA[c_hydrogenVehicles]]></Name>
 		<X>620</X>
-		<Y>390</Y>
+		<Y>410</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1582,8 +1558,8 @@
 	<Variable Class="CollectionVariable">
 		<Id>1742484728807</Id>
 		<Name><![CDATA[c_parentCoops]]></Name>
-		<X>270</X>
-		<Y>420</Y>
+		<X>50</X>
+		<Y>250</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1601,7 +1577,7 @@
 		<Id>1750258408126</Id>
 		<Name><![CDATA[c_chargers]]></Name>
 		<X>600</X>
-		<Y>416</Y>
+		<Y>436</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1638,7 +1614,7 @@
 		<Id>1754581015887</Id>
 		<Name><![CDATA[c_electricVehicles]]></Name>
 		<X>620</X>
-		<Y>330</Y>
+		<Y>350</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
diff --git a/_alp/Classes/Class.I_AggregatorBatteryManagement.java b/_alp/Classes/Class.I_AggregatorBatteryManagement.java
new file mode 100644
index 00000000..081abbea
--- /dev/null
+++ b/_alp/Classes/Class.I_AggregatorBatteryManagement.java
@@ -0,0 +1,26 @@
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
+@JsonIdentityInfo(generator = ObjectIdGenerators.UUIDGenerator.class, property = "@id")
+
+@JsonTypeInfo(
+	    use = JsonTypeInfo.Id.NAME,
+	    include = JsonTypeInfo.As.PROPERTY,
+	    property = "type"  // 👈 this will be the field name in your JSON 👈
+	)
+@JsonSubTypes({
+    @JsonSubTypes.Type(value = J_AggregatorBatteryManagementOff.class, name = "J_AggregatorBatteryManagementOff"),
+    @JsonSubTypes.Type(value = J_AggregatorBatteryManagementCollectiveSelfConsumption_batterySize.class, name = "J_AggregatorBatteryManagementCollectiveSelfConsumption_batterySize"),
+    @JsonSubTypes.Type(value = J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRate.class, name = "J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRate"),
+    @JsonSubTypes.Type(value = J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRateGH.class, name = "J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRateGH"),
+})
+
+/**
+ * I_AggregatorBatteryManagement
+ */	
+
+public interface I_AggregatorBatteryManagement
+{
+	void manageExternalSetpoints();
+}
\ No newline at end of file
diff --git a/_alp/Classes/Class.I_BatteryManagement.java b/_alp/Classes/Class.I_BatteryManagement.java
index 7dd7eb08..5550c05f 100644
--- a/_alp/Classes/Class.I_BatteryManagement.java
+++ b/_alp/Classes/Class.I_BatteryManagement.java
@@ -16,6 +16,7 @@
     @JsonSubTypes.Type(value = J_BatteryManagementPrice.class, name = "J_BatteryManagementPrice"),
     @JsonSubTypes.Type(value = J_BatteryManagementSelfConsumption.class, name = "J_BatteryManagementSelfConsumption"),
     @JsonSubTypes.Type(value = J_BatteryManagementSelfConsumptionGridNode.class, name = "J_BatteryManagementSelfConsumptionGridNode"),
+    @JsonSubTypes.Type(value = J_BatteryManagementExternalSetpoint.class, name = "J_BatteryManagementExternalSetpoint"),
 })
     
     // Add other known subtypes here if needed
diff --git a/_alp/Classes/Class.I_InterfaceAggragotrBatteryManagement.java b/_alp/Classes/Class.I_InterfaceAggragotrBatteryManagement.java
new file mode 100644
index 00000000..5b105154
--- /dev/null
+++ b/_alp/Classes/Class.I_InterfaceAggragotrBatteryManagement.java
@@ -0,0 +1,8 @@
+/**
+ * I_InterfaceAggragotrBatteryManagement
+ */	
+
+public interface I_InterfaceAggragotrBatteryManagement
+{
+	void updateExternalSetpoints();
+}
\ No newline at end of file
diff --git a/_alp/Classes/Class.J_AggregatorBatteryManagementCollectiveSelfConsumption_batterySize.java b/_alp/Classes/Class.J_AggregatorBatteryManagementCollectiveSelfConsumption_batterySize.java
new file mode 100644
index 00000000..01014192
--- /dev/null
+++ b/_alp/Classes/Class.J_AggregatorBatteryManagementCollectiveSelfConsumption_batterySize.java
@@ -0,0 +1,62 @@
+/**
+ * J_AggregatorBatteryManagementCollectiveSelfConsumption_batterySize
+ */	
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+
+@JsonAutoDetect(
+    fieldVisibility = Visibility.ANY,    // 
+    getterVisibility = Visibility.NONE,
+    isGetterVisibility = Visibility.NONE,
+    setterVisibility = Visibility.NONE,
+    creatorVisibility = Visibility.NONE
+)
+
+public class J_AggregatorBatteryManagementCollectiveSelfConsumption_batterySize implements I_AggregatorBatteryManagement {
+
+	EnergyCoop energyCoop;
+	
+    /**
+     * Default constructor
+     */
+	public J_AggregatorBatteryManagementCollectiveSelfConsumption_batterySize( ) {
+
+    }
+	
+    public J_AggregatorBatteryManagementCollectiveSelfConsumption_batterySize( EnergyCoop energyCoop) {
+    	this.energyCoop = energyCoop;
+    }
+    
+    public void manageExternalSetpoints() {
+    	//Get all members that have a battery that is put on the external setpoint mode
+    	List<GridConnection> memberedGCWithSetpointBatteries = findAll(energyCoop.f_getMemberGridConnectionsCollectionPointer(), GC -> GC instanceof GCUtility && GC.p_batteryAsset != null && GC.p_batteryAlgorithm != null && GC.p_batteryAlgorithm instanceof J_BatteryManagementExternalSetpoint);
+
+		double sumOfBatteryCapacities_kWh = energyCoop.v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh*1000;
+		double collectiveChargeSetpoint_kW = 0;
+		for(GridConnection GC : memberedGCWithSetpointBatteries) {
+			if (GC instanceof GCUtility) {
+				collectiveChargeSetpoint_kW -= GC.fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY);
+			}
+		}
+		// Generate setpoints and 'push' to memberGridConnections for next timestep
+		for(int i = 0; i<memberedGCWithSetpointBatteries.size(); i++) {
+			GridConnection GC = memberedGCWithSetpointBatteries.get(i);
+			if (GC.p_batteryAsset != null) {		
+				((J_BatteryManagementExternalSetpoint)GC.p_batteryAlgorithm).setChargeSetpoint_kW(collectiveChargeSetpoint_kW * (  GC.p_batteryAsset.getStorageCapacity_kWh() / sumOfBatteryCapacities_kWh)); // Divide summed charge-power proportional to battery size on each GC.
+			}
+		}
+    }
+    
+	@Override
+	public String toString() {
+		return super.toString();
+	}
+
+	/**
+	 * This number is here for model snapshot storing purpose<br>
+	 * It needs to be changed when this class gets changed
+	 */ 
+	private static final long serialVersionUID = 1L;
+
+}
\ No newline at end of file
diff --git a/_alp/Classes/Class.J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRate.java b/_alp/Classes/Class.J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRate.java
new file mode 100644
index 00000000..bd642f50
--- /dev/null
+++ b/_alp/Classes/Class.J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRate.java
@@ -0,0 +1,116 @@
+/**
+ * J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRate
+ */	
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+
+@JsonAutoDetect(
+    fieldVisibility = Visibility.ANY,    // 
+    getterVisibility = Visibility.NONE,
+    isGetterVisibility = Visibility.NONE,
+    setterVisibility = Visibility.NONE,
+    creatorVisibility = Visibility.NONE
+)
+
+public class J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRate implements I_AggregatorBatteryManagement {
+
+	EnergyCoop energyCoop;
+	
+    /**
+     * Default constructor
+     */
+	public J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRate() {
+
+	}
+	
+    public J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRate( EnergyCoop energyCoop) {
+    	this.energyCoop = energyCoop;
+    }
+    
+    public void manageExternalSetpoints() {
+    	//Get all members that have a battery that is put on the external setpoint mode
+    	List<GridConnection> memberedGCWithSetpointBatteries = findAll(energyCoop.f_getMemberGridConnectionsCollectionPointer(), GC -> GC instanceof GCUtility && GC.p_batteryAsset != null && GC.p_batteryAlgorithm != null && GC.p_batteryAlgorithm instanceof J_BatteryManagementExternalSetpoint);
+
+		//Determine prefered charge setpoint of the battery, for maximum (collective) selfconsumption (equal to negative or positive balance)
+		double collectiveChargeSetpoint_kW = 0;
+		for(GridConnection GC : memberedGCWithSetpointBatteries) {
+			if (GC instanceof GCUtility) {
+				collectiveChargeSetpoint_kW -= GC.fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY);
+			}
+		}
+
+		//Initialize iterable gc list
+		List<GridConnection> memberedGCWithSetpointBatteries_withFreeCapacity = new ArrayList<GridConnection>();
+
+		//Only add the gc that have the same direction as net coop charge flow to the gc that will use their battery
+		for(GridConnection GC : memberedGCWithSetpointBatteries){
+			double gc_balanceFlow = GC.fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY);
+			if((collectiveChargeSetpoint_kW < 0 && -gc_balanceFlow < 0) || (collectiveChargeSetpoint_kW > 0 && -gc_balanceFlow > 0)){
+				memberedGCWithSetpointBatteries_withFreeCapacity.add(GC);
+			}
+		}
+
+		//Initialize variables
+		double remainingSumOfChargeSetpoints_kW = collectiveChargeSetpoint_kW;
+		double gc_balanceFlowElectricity_kW;
+		double gc_calculatedChargeSetpoint_kW;
+		double gc_actualChargeSetpoint_kW;
+		List<GridConnection> memberedGCWithSetpointBatteries_noCapacity = new ArrayList<GridConnection>();
+
+		//Loop until no gc have battery capacity left or the setpoint is reached
+		while( Math.abs(remainingSumOfChargeSetpoints_kW) > 0.0001 && memberedGCWithSetpointBatteries_withFreeCapacity.size() > 0){
+			memberedGCWithSetpointBatteries_noCapacity.clear();
+			double removedSumOfChargedSetpoints_kW = 0;
+			double totalBalanceFlowRemainingGC_kW = 0;
+			
+			//Calculate the new combined balance flow, to use for distributing the remaining chargeSetpoint
+			for(GridConnection GC : memberedGCWithSetpointBatteries_withFreeCapacity){
+				totalBalanceFlowRemainingGC_kW += GC.fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY);
+			}
+			if (Math.abs(totalBalanceFlowRemainingGC_kW) < 0.0001) {
+		   		traceln("Warning: totalBalanceFlowRemainingGC is zero, cant distribute any further, nr GC left: " + memberedGCWithSetpointBatteries_withFreeCapacity.size());
+		    	break;
+			}
+			
+			//Iterate over the gc that still have space left in their charge capacity or battery storage
+			for(GridConnection GC : memberedGCWithSetpointBatteries_withFreeCapacity){
+				J_BatteryManagementExternalSetpoint gridConnectionBatteryAlgorithm = (J_BatteryManagementExternalSetpoint)GC.p_batteryAlgorithm;
+				double currentBatteryPowerElectric = GC.fm_currentAssetFlows_kW.get(OL_AssetFlowCategories.batteriesChargingPower_kW) - GC.fm_currentAssetFlows_kW.get(OL_AssetFlowCategories.batteriesDischargingPower_kW);
+				
+				gc_balanceFlowElectricity_kW = GC.fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY) - currentBatteryPowerElectric;
+				gc_calculatedChargeSetpoint_kW = gridConnectionBatteryAlgorithm.getChargeSetpoint_kW() + remainingSumOfChargeSetpoints_kW * ( gc_balanceFlowElectricity_kW / totalBalanceFlowRemainingGC_kW);
+				
+				//First remove setpoint from previous iteration again
+				removedSumOfChargedSetpoints_kW -= gridConnectionBatteryAlgorithm.getChargeSetpoint_kW();
+				
+				//Set and get new setpoint
+				gc_actualChargeSetpoint_kW = gridConnectionBatteryAlgorithm.setChargeSetpoint_kW(gc_calculatedChargeSetpoint_kW);
+				
+				//Add new setpoint to removed setpiont total for this iteration again (netto this is increased by the additional amount compared to last iteration)
+				removedSumOfChargedSetpoints_kW += gc_actualChargeSetpoint_kW;
+				
+				//If the actual setpoint that has been returned by the gc is not equal to the required setpoint, it means the gc cant charge/dis charge any further, so remove it from the pool 
+				if(gc_calculatedChargeSetpoint_kW != gc_actualChargeSetpoint_kW){
+					memberedGCWithSetpointBatteries_noCapacity.add(GC);
+				}
+			}
+			//Update the remaining pool of GC and to be distributed setpoint_kW
+			memberedGCWithSetpointBatteries_withFreeCapacity.removeAll(memberedGCWithSetpointBatteries_noCapacity);
+			remainingSumOfChargeSetpoints_kW -= removedSumOfChargedSetpoints_kW;
+		}
+    }
+    
+	@Override
+	public String toString() {
+		return super.toString();
+	}
+
+	/**
+	 * This number is here for model snapshot storing purpose<br>
+	 * It needs to be changed when this class gets changed
+	 */ 
+	private static final long serialVersionUID = 1L;
+
+}
+
diff --git a/_alp/Classes/Class.J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRateGH.java b/_alp/Classes/Class.J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRateGH.java
new file mode 100644
index 00000000..c4fa42e2
--- /dev/null
+++ b/_alp/Classes/Class.J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRateGH.java
@@ -0,0 +1,91 @@
+/**
+ * J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRateGH
+ */	
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+
+@JsonAutoDetect(
+    fieldVisibility = Visibility.ANY,    // 
+    getterVisibility = Visibility.NONE,
+    isGetterVisibility = Visibility.NONE,
+    setterVisibility = Visibility.NONE,
+    creatorVisibility = Visibility.NONE
+)
+
+public class J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRateGH implements I_AggregatorBatteryManagement {
+
+	EnergyCoop energyCoop;
+	
+    /**
+     * Default constructor
+     */
+	public J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRateGH() {
+
+	}
+	
+    public J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRateGH( EnergyCoop energyCoop) {
+    	this.energyCoop = energyCoop;
+    }
+    
+    public void manageExternalSetpoints() {
+    	//Get all members that have a battery that is put on the external setpoint mode
+    	List<GridConnection> memberedGCWithSetpointBatteries = findAll(energyCoop.f_getMemberGridConnectionsCollectionPointer(), GC -> GC instanceof GCUtility && GC.p_batteryAsset != null && GC.p_batteryAlgorithm != null && GC.p_batteryAlgorithm instanceof J_BatteryManagementExternalSetpoint);
+		
+		//Determine prefered charge setpoint of the battery, for maximum (collective) selfconsumption (equal to negative or positive balance)
+		double collectiveChargeSetpoint_kW = 0;
+		double sumOfBatteryCapacities_kWh = 0;
+		for(GridConnection GC : memberedGCWithSetpointBatteries) {
+			if (GC instanceof GCUtility) {
+				collectiveChargeSetpoint_kW -= GC.fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY);
+				sumOfBatteryCapacities_kWh += GC.v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh*1000;
+			}
+		}
+
+		//Only add the gc that have the same direction as net coop charge flow to the gc that will use their battery
+		double totalCurrentFeedin_kW = 0;
+		double totalCurrentDelivery_kW = 0;
+		for (GridConnection GC : memberedGCWithSetpointBatteries) {
+			double currentBatteryPowerElectric = GC.fm_currentAssetFlows_kW.get(OL_AssetFlowCategories.batteriesChargingPower_kW) - GC.fm_currentAssetFlows_kW.get(OL_AssetFlowCategories.batteriesDischargingPower_kW);
+			totalCurrentFeedin_kW+=max(0,-(GC.fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY) - currentBatteryPowerElectric));
+			totalCurrentDelivery_kW+=max(0,(GC.fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY) - currentBatteryPowerElectric));
+		}
+
+		// For all qualifying GCs, make balanceflow zero if possible. Also, distinguish between collective feedin and collective delivery
+		double remainingSumOfChargeSetpoints_kW = collectiveChargeSetpoint_kW;
+
+		// Divide setpoint proportional to feedin power per GC
+		for (GridConnection GC : memberedGCWithSetpointBatteries) {
+			double GC_Setpoint_kW=0;
+			if (collectiveChargeSetpoint_kW > 0) {
+				GC_Setpoint_kW = collectiveChargeSetpoint_kW * max(0,-GC.fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY))/totalCurrentFeedin_kW; // Divide summed charge-power proportional to feedin power on each GC.
+			} else if (collectiveChargeSetpoint_kW < 0){ 
+				GC_Setpoint_kW = collectiveChargeSetpoint_kW * max(0,GC.fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY))/totalCurrentDelivery_kW; // Divide summed charge-power proportional to delivery power on each GC.
+			}
+			remainingSumOfChargeSetpoints_kW -= ((J_BatteryManagementExternalSetpoint)GC.p_batteryAlgorithm).setChargeSetpoint_kW(GC_Setpoint_kW);
+		}
+		
+		// If some of the batteries are full, try distribute remaining charge setpoint over all batteries, proportional to batterysize
+		if (Math.abs(remainingSumOfChargeSetpoints_kW) > 0.01) {
+			//traceln("Dividing positive charge power proportional to battery size");
+			double chargeSetpointToBeDevided_kW = remainingSumOfChargeSetpoints_kW;
+			for (GridConnection GC : memberedGCWithSetpointBatteries) {
+				double GC_addedSetpoint_kW = chargeSetpointToBeDevided_kW * (  GC.p_batteryAsset.getStorageCapacity_kWh() / sumOfBatteryCapacities_kWh); // Divide summed charge-power proportional to battery size on each GC.
+				double GC_currentSetpoint_kW = ((J_BatteryManagementExternalSetpoint)GC.p_batteryAlgorithm).getChargeSetpoint_kW();
+				remainingSumOfChargeSetpoints_kW -= (((J_BatteryManagementExternalSetpoint)GC.p_batteryAlgorithm).setChargeSetpoint_kW(GC_addedSetpoint_kW+GC_currentSetpoint_kW)-GC_currentSetpoint_kW);
+			}
+		}
+    }
+    
+	@Override
+	public String toString() {
+		return super.toString();
+	}
+
+	/**
+	 * This number is here for model snapshot storing purpose<br>
+	 * It needs to be changed when this class gets changed
+	 */ 
+	private static final long serialVersionUID = 1L;
+
+}
diff --git a/_alp/Classes/Class.J_AggregatorBatteryManagementOff.java b/_alp/Classes/Class.J_AggregatorBatteryManagementOff.java
new file mode 100644
index 00000000..fa493b73
--- /dev/null
+++ b/_alp/Classes/Class.J_AggregatorBatteryManagementOff.java
@@ -0,0 +1,47 @@
+
+/**
+ * J_AggregatorBatteryManagementOff
+ */	
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+
+@JsonAutoDetect(
+    fieldVisibility = Visibility.ANY,    // 
+    getterVisibility = Visibility.NONE,
+    isGetterVisibility = Visibility.NONE,
+    setterVisibility = Visibility.NONE,
+    creatorVisibility = Visibility.NONE
+)
+
+public class J_AggregatorBatteryManagementOff implements I_AggregatorBatteryManagement {
+
+	EnergyCoop energyCoop;
+	
+    /**
+     * Default constructor
+     */
+	public J_AggregatorBatteryManagementOff( ) {
+
+    }
+	
+    public J_AggregatorBatteryManagementOff( EnergyCoop energyCoop) {
+    	this.energyCoop = energyCoop;
+    }
+    
+    public void manageExternalSetpoints() {
+    	//Do nothing
+    }
+    
+	@Override
+	public String toString() {
+		return super.toString();
+	}
+
+	/**
+	 * This number is here for model snapshot storing purpose<br>
+	 * It needs to be changed when this class gets changed
+	 */ 
+	private static final long serialVersionUID = 1L;
+
+}
\ No newline at end of file
diff --git a/_alp/Classes/Class.J_BatteryManagementExternalSetpoint.java b/_alp/Classes/Class.J_BatteryManagementExternalSetpoint.java
new file mode 100644
index 00000000..be4b593a
--- /dev/null
+++ b/_alp/Classes/Class.J_BatteryManagementExternalSetpoint.java
@@ -0,0 +1,62 @@
+/**
+ * J_BatteryManagementExternalSetpoint
+ */	
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+
+@JsonAutoDetect(
+    fieldVisibility = Visibility.ANY,    // 
+    getterVisibility = Visibility.NONE,
+    isGetterVisibility = Visibility.NONE,
+    setterVisibility = Visibility.NONE,
+    creatorVisibility = Visibility.NONE
+)
+
+public class J_BatteryManagementExternalSetpoint implements I_BatteryManagement {
+
+	GridConnection gc;
+	private double currentChargeSetpoint_kW = 0;
+    /**
+     * Default constructor
+     */
+	public J_BatteryManagementExternalSetpoint( ) {
+
+    }
+	
+    public J_BatteryManagementExternalSetpoint( GridConnection gc) {
+    	this.gc = gc;
+    }
+    
+    public double setChargeSetpoint_kW(double chargeSetpoint_kW) {
+    	if (gc.p_batteryAsset!=null) {
+    		this.currentChargeSetpoint_kW = max(min(chargeSetpoint_kW, gc.p_batteryAsset.getMaxChargePower_kW()), -gc.p_batteryAsset.getMaxDischargePower_kW());
+    	} else {
+    		this.currentChargeSetpoint_kW = 0.0;
+    	}
+    	return this.currentChargeSetpoint_kW;
+    }
+    
+    public double getChargeSetpoint_kW() {
+    	return this.currentChargeSetpoint_kW;
+    }
+    
+    public void manageBattery() {
+        //Manage the battery with the set charge setpoint
+    	gc.p_batteryAsset.f_updateAllFlows(this.currentChargeSetpoint_kW / gc.p_batteryAsset.getCapacityElectric_kW());
+
+    	//Reset the value again.
+    	this.currentChargeSetpoint_kW = 0;
+    }
+    
+	@Override
+	public String toString() {
+		return "J_BatteryManagementExternalSetpoint with currentChargeSetpoint_kW " + this.currentChargeSetpoint_kW + " kW";
+	}
+
+	/**
+	 * This number is here for model snapshot storing purpose<br>
+	 * It needs to be changed when this class gets changed
+	 */ 
+	private static final long serialVersionUID = 1L;
+
+}
\ No newline at end of file

From 565878d03ff43f0c09aefb27be604645f5dfef27 Mon Sep 17 00:00:00 2001
From: Ate Hempenius <ate@zenmo.com>
Date: Tue, 26 Aug 2025 17:49:23 +0200
Subject: [PATCH 2/4] final fixes

---
 _alp/Agents/EnergyCoop/Code/Functions.java            | 10 ++++++----
 _alp/Agents/EnergyCoop/Code/Functions.xml             |  6 +++---
 _alp/Agents/EnergyCoop/Variables.xml                  |  2 +-
 ...nagementCollectiveSelfConsumption_batterySize.java | 11 ++++++-----
 ...anagementCollectiveSelfConsumption_exportRate.java |  2 +-
 ...agementCollectiveSelfConsumption_exportRateGH.java | 11 +++++------
 _alp/Classes/Class.J_EAStorageElectric.java           |  8 ++++++++
 7 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/_alp/Agents/EnergyCoop/Code/Functions.java b/_alp/Agents/EnergyCoop/Code/Functions.java
index c2fed749..8fdae1f6 100644
--- a/_alp/Agents/EnergyCoop/Code/Functions.java
+++ b/_alp/Agents/EnergyCoop/Code/Functions.java
@@ -1576,19 +1576,21 @@ EnergyCoop f_addAssetFlow(OL_AssetFlowCategories AC)
 
 /*ALCODEEND*/}
 
-List<GridConnection> f_getMemberGridConnectionsCollectionPointer()
+ArrayList<GridConnection> f_getMemberGridConnectionsCollectionPointer()
 {/*ALCODESTART::1754908113703*/
 return this.c_memberGridConnections; // This should NOT be a copy, it should be a pointer!!
 /*ALCODEEND*/}
 
-double f_aggregatorBatteryManagementEnergyCoop()
+double f_aggregatorBatteryManagement_EnergyCoop()
 {/*ALCODESTART::1756207893357*/
-p_aggregatorBatteryManagement.manageExternalSetpoints();
+if(p_aggregatorBatteryManagement != null){
+	p_aggregatorBatteryManagement.manageExternalSetpoints();
+}
 /*ALCODEEND*/}
 
 double f_aggregatorManagement_EnergyCoop()
 {/*ALCODESTART::1756207893363*/
 //Run battery setpoint management
-f_aggregatorBatteryManagementEnergyCoop();
+f_aggregatorBatteryManagement_EnergyCoop();
 /*ALCODEEND*/}
 
diff --git a/_alp/Agents/EnergyCoop/Code/Functions.xml b/_alp/Agents/EnergyCoop/Code/Functions.xml
index 4fb96fb1..7c3d4a08 100644
--- a/_alp/Agents/EnergyCoop/Code/Functions.xml
+++ b/_alp/Agents/EnergyCoop/Code/Functions.xml
@@ -691,7 +691,7 @@
 	</Function>
 	<Function AccessType="public" StaticFunction="false">
 		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
-		<ReturnType>List&lt;GridConnection&gt;</ReturnType>
+		<ReturnType>ArrayList&lt;GridConnection&gt;</ReturnType>
 		<Id>1754908113703</Id>
 		<Name><![CDATA[f_getMemberGridConnectionsCollectionPointer]]></Name>
 		<X>1440</X>
@@ -709,8 +709,8 @@
 		<ReturnModificator>VOID</ReturnModificator>
 		<ReturnType>double</ReturnType>
 		<Id>1756207893357</Id>
-		<Name><![CDATA[f_aggregatorBatteryManagementEnergyCoop]]></Name>
-		<X>660</X>
+		<Name><![CDATA[f_aggregatorBatteryManagement_EnergyCoop]]></Name>
+		<X>670</X>
 		<Y>690</Y>
 		<Label>
 			<X>10</X>
diff --git a/_alp/Agents/EnergyCoop/Variables.xml b/_alp/Agents/EnergyCoop/Variables.xml
index 3eb04235..46803b54 100644
--- a/_alp/Agents/EnergyCoop/Variables.xml
+++ b/_alp/Agents/EnergyCoop/Variables.xml
@@ -1987,7 +1987,7 @@
 	<Variable Class="Parameter">
 		<Id>1756207893367</Id>
 		<Name><![CDATA[p_aggregatorBatteryManagement]]></Name>
-		<X>670</X>
+		<X>690</X>
 		<Y>710</Y>
 		<Label>
 			<X>10</X>
diff --git a/_alp/Classes/Class.J_AggregatorBatteryManagementCollectiveSelfConsumption_batterySize.java b/_alp/Classes/Class.J_AggregatorBatteryManagementCollectiveSelfConsumption_batterySize.java
index 01014192..21b5b2c4 100644
--- a/_alp/Classes/Class.J_AggregatorBatteryManagementCollectiveSelfConsumption_batterySize.java
+++ b/_alp/Classes/Class.J_AggregatorBatteryManagementCollectiveSelfConsumption_batterySize.java
@@ -32,13 +32,14 @@ public void manageExternalSetpoints() {
     	//Get all members that have a battery that is put on the external setpoint mode
     	List<GridConnection> memberedGCWithSetpointBatteries = findAll(energyCoop.f_getMemberGridConnectionsCollectionPointer(), GC -> GC instanceof GCUtility && GC.p_batteryAsset != null && GC.p_batteryAlgorithm != null && GC.p_batteryAlgorithm instanceof J_BatteryManagementExternalSetpoint);
 
-		double sumOfBatteryCapacities_kWh = energyCoop.v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh*1000;
 		double collectiveChargeSetpoint_kW = 0;
-		for(GridConnection GC : memberedGCWithSetpointBatteries) {
-			if (GC instanceof GCUtility) {
-				collectiveChargeSetpoint_kW -= GC.fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY);
-			}
+		for(GridConnection GC : energyCoop.f_getMemberGridConnectionsCollectionPointer()) {
+			collectiveChargeSetpoint_kW -= GC.fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY);
 		}
+		
+		//Get total active usable battery capacity
+		double sumOfBatteryCapacities_kWh = sum(memberedGCWithSetpointBatteries, GC -> GC.v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh*1000);
+		
 		// Generate setpoints and 'push' to memberGridConnections for next timestep
 		for(int i = 0; i<memberedGCWithSetpointBatteries.size(); i++) {
 			GridConnection GC = memberedGCWithSetpointBatteries.get(i);
diff --git a/_alp/Classes/Class.J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRate.java b/_alp/Classes/Class.J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRate.java
index bd642f50..a059075d 100644
--- a/_alp/Classes/Class.J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRate.java
+++ b/_alp/Classes/Class.J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRate.java
@@ -34,7 +34,7 @@ public void manageExternalSetpoints() {
 
 		//Determine prefered charge setpoint of the battery, for maximum (collective) selfconsumption (equal to negative or positive balance)
 		double collectiveChargeSetpoint_kW = 0;
-		for(GridConnection GC : memberedGCWithSetpointBatteries) {
+		for(GridConnection GC : energyCoop.f_getMemberGridConnectionsCollectionPointer()) {
 			if (GC instanceof GCUtility) {
 				collectiveChargeSetpoint_kW -= GC.fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY);
 			}
diff --git a/_alp/Classes/Class.J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRateGH.java b/_alp/Classes/Class.J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRateGH.java
index c4fa42e2..328537bf 100644
--- a/_alp/Classes/Class.J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRateGH.java
+++ b/_alp/Classes/Class.J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRateGH.java
@@ -34,14 +34,13 @@ public void manageExternalSetpoints() {
 		
 		//Determine prefered charge setpoint of the battery, for maximum (collective) selfconsumption (equal to negative or positive balance)
 		double collectiveChargeSetpoint_kW = 0;
-		double sumOfBatteryCapacities_kWh = 0;
-		for(GridConnection GC : memberedGCWithSetpointBatteries) {
-			if (GC instanceof GCUtility) {
+		for(GridConnection GC : energyCoop.f_getMemberGridConnectionsCollectionPointer()) {
 				collectiveChargeSetpoint_kW -= GC.fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY);
-				sumOfBatteryCapacities_kWh += GC.v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh*1000;
-			}
 		}
-
+		
+		//Get total active usable battery capacity
+		double sumOfBatteryCapacities_kWh = sum(memberedGCWithSetpointBatteries, GC -> GC.v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh*1000);
+		
 		//Only add the gc that have the same direction as net coop charge flow to the gc that will use their battery
 		double totalCurrentFeedin_kW = 0;
 		double totalCurrentDelivery_kW = 0;
diff --git a/_alp/Classes/Class.J_EAStorageElectric.java b/_alp/Classes/Class.J_EAStorageElectric.java
index 3fd4b45f..76d0144a 100644
--- a/_alp/Classes/Class.J_EAStorageElectric.java
+++ b/_alp/Classes/Class.J_EAStorageElectric.java
@@ -118,6 +118,14 @@ public double getCapacityAvailable_kW() {
 		return availableCapacity_kW;
 	}
 	
+	public double getMaxChargePower_kW() { // Always a positive number!
+		return min(capacityElectric_kW, (1-stateOfCharge_fr) * storageCapacity_kWh / timestep_h / etaCharge_r);
+	}
+	
+	public double getMaxDischargePower_kW() { // Always a positive number!
+		return min(capacityElectric_kW, stateOfCharge_fr * storageCapacity_kWh / timestep_h * etaDischarge_r);
+	}
+	
 	public double getCapacityElectric_kW() {
 		return this.capacityElectric_kW;
 	}

From 0f925e217384a9ea3418f78423cb984cd2521380 Mon Sep 17 00:00:00 2001
From: Ate Hempenius <ate@zenmo.com>
Date: Wed, 27 Aug 2025 14:22:16 +0200
Subject: [PATCH 3/4] bugfixes in Aggregator battery managements

---
 ...CollectiveSelfConsumption_batterySize.java | 15 ++++++----
 ...tCollectiveSelfConsumption_exportRate.java | 17 +++++++----
 ...ollectiveSelfConsumption_exportRateGH.java | 28 +++++++++----------
 ...s.J_BatteryManagementExternalSetpoint.java |  1 +
 4 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/_alp/Classes/Class.J_AggregatorBatteryManagementCollectiveSelfConsumption_batterySize.java b/_alp/Classes/Class.J_AggregatorBatteryManagementCollectiveSelfConsumption_batterySize.java
index 21b5b2c4..cc83935c 100644
--- a/_alp/Classes/Class.J_AggregatorBatteryManagementCollectiveSelfConsumption_batterySize.java
+++ b/_alp/Classes/Class.J_AggregatorBatteryManagementCollectiveSelfConsumption_batterySize.java
@@ -30,16 +30,21 @@ public J_AggregatorBatteryManagementCollectiveSelfConsumption_batterySize( Energ
     
     public void manageExternalSetpoints() {
     	//Get all members that have a battery that is put on the external setpoint mode
-    	List<GridConnection> memberedGCWithSetpointBatteries = findAll(energyCoop.f_getMemberGridConnectionsCollectionPointer(), GC -> GC instanceof GCUtility && GC.p_batteryAsset != null && GC.p_batteryAlgorithm != null && GC.p_batteryAlgorithm instanceof J_BatteryManagementExternalSetpoint);
+    	List<GridConnection> memberedGCWithSetpointBatteries = findAll(energyCoop.f_getMemberGridConnectionsCollectionPointer(), GC -> GC.p_batteryAsset != null && GC.p_batteryAlgorithm != null && GC.p_batteryAlgorithm instanceof J_BatteryManagementExternalSetpoint);
 
 		double collectiveChargeSetpoint_kW = 0;
+		double sumOfBatteryCapacities_kWh = 0;
 		for(GridConnection GC : energyCoop.f_getMemberGridConnectionsCollectionPointer()) {
-			collectiveChargeSetpoint_kW -= GC.fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY);
+			double currentBatteryPowerElectric = 0;
+			if(memberedGCWithSetpointBatteries.contains(GC)) {
+				currentBatteryPowerElectric = GC.fm_currentAssetFlows_kW.get(OL_AssetFlowCategories.batteriesChargingPower_kW) - GC.fm_currentAssetFlows_kW.get(OL_AssetFlowCategories.batteriesDischargingPower_kW);			
+				
+				//Get total active usable battery capacity
+				sumOfBatteryCapacities_kWh += (GC.v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh*1000);
+			}
+			collectiveChargeSetpoint_kW -= (GC.fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY) - currentBatteryPowerElectric);
 		}
 		
-		//Get total active usable battery capacity
-		double sumOfBatteryCapacities_kWh = sum(memberedGCWithSetpointBatteries, GC -> GC.v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh*1000);
-		
 		// Generate setpoints and 'push' to memberGridConnections for next timestep
 		for(int i = 0; i<memberedGCWithSetpointBatteries.size(); i++) {
 			GridConnection GC = memberedGCWithSetpointBatteries.get(i);
diff --git a/_alp/Classes/Class.J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRate.java b/_alp/Classes/Class.J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRate.java
index a059075d..9c5d9aa0 100644
--- a/_alp/Classes/Class.J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRate.java
+++ b/_alp/Classes/Class.J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRate.java
@@ -30,14 +30,17 @@ public J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRate( Energy
     
     public void manageExternalSetpoints() {
     	//Get all members that have a battery that is put on the external setpoint mode
-    	List<GridConnection> memberedGCWithSetpointBatteries = findAll(energyCoop.f_getMemberGridConnectionsCollectionPointer(), GC -> GC instanceof GCUtility && GC.p_batteryAsset != null && GC.p_batteryAlgorithm != null && GC.p_batteryAlgorithm instanceof J_BatteryManagementExternalSetpoint);
+    	List<GridConnection> memberedGCWithSetpointBatteries = findAll(energyCoop.f_getMemberGridConnectionsCollectionPointer(), GC -> GC.p_batteryAsset != null && GC.p_batteryAlgorithm != null && GC.p_batteryAlgorithm instanceof J_BatteryManagementExternalSetpoint);
 
 		//Determine prefered charge setpoint of the battery, for maximum (collective) selfconsumption (equal to negative or positive balance)
 		double collectiveChargeSetpoint_kW = 0;
 		for(GridConnection GC : energyCoop.f_getMemberGridConnectionsCollectionPointer()) {
-			if (GC instanceof GCUtility) {
-				collectiveChargeSetpoint_kW -= GC.fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY);
+			double currentBatteryPowerElectric = 0;
+			if(memberedGCWithSetpointBatteries.contains(GC)) {
+				currentBatteryPowerElectric = GC.fm_currentAssetFlows_kW.get(OL_AssetFlowCategories.batteriesChargingPower_kW) - GC.fm_currentAssetFlows_kW.get(OL_AssetFlowCategories.batteriesDischargingPower_kW);			
 			}
+			
+			collectiveChargeSetpoint_kW -= (GC.fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY) - currentBatteryPowerElectric);
 		}
 
 		//Initialize iterable gc list
@@ -45,7 +48,10 @@ public void manageExternalSetpoints() {
 
 		//Only add the gc that have the same direction as net coop charge flow to the gc that will use their battery
 		for(GridConnection GC : memberedGCWithSetpointBatteries){
-			double gc_balanceFlow = GC.fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY);
+			
+			double currentBatteryPowerElectric = GC.fm_currentAssetFlows_kW.get(OL_AssetFlowCategories.batteriesChargingPower_kW) - GC.fm_currentAssetFlows_kW.get(OL_AssetFlowCategories.batteriesDischargingPower_kW);
+			
+			double gc_balanceFlow = GC.fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY) - currentBatteryPowerElectric;
 			if((collectiveChargeSetpoint_kW < 0 && -gc_balanceFlow < 0) || (collectiveChargeSetpoint_kW > 0 && -gc_balanceFlow > 0)){
 				memberedGCWithSetpointBatteries_withFreeCapacity.add(GC);
 			}
@@ -66,7 +72,8 @@ public void manageExternalSetpoints() {
 			
 			//Calculate the new combined balance flow, to use for distributing the remaining chargeSetpoint
 			for(GridConnection GC : memberedGCWithSetpointBatteries_withFreeCapacity){
-				totalBalanceFlowRemainingGC_kW += GC.fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY);
+				double currentBatteryPowerElectric = GC.fm_currentAssetFlows_kW.get(OL_AssetFlowCategories.batteriesChargingPower_kW) - GC.fm_currentAssetFlows_kW.get(OL_AssetFlowCategories.batteriesDischargingPower_kW);
+				totalBalanceFlowRemainingGC_kW += (GC.fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY) - currentBatteryPowerElectric);
 			}
 			if (Math.abs(totalBalanceFlowRemainingGC_kW) < 0.0001) {
 		   		traceln("Warning: totalBalanceFlowRemainingGC is zero, cant distribute any further, nr GC left: " + memberedGCWithSetpointBatteries_withFreeCapacity.size());
diff --git a/_alp/Classes/Class.J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRateGH.java b/_alp/Classes/Class.J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRateGH.java
index 328537bf..30a8ea37 100644
--- a/_alp/Classes/Class.J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRateGH.java
+++ b/_alp/Classes/Class.J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRateGH.java
@@ -30,26 +30,26 @@ public J_AggregatorBatteryManagementCollectiveSelfConsumption_exportRateGH( Ener
     
     public void manageExternalSetpoints() {
     	//Get all members that have a battery that is put on the external setpoint mode
-    	List<GridConnection> memberedGCWithSetpointBatteries = findAll(energyCoop.f_getMemberGridConnectionsCollectionPointer(), GC -> GC instanceof GCUtility && GC.p_batteryAsset != null && GC.p_batteryAlgorithm != null && GC.p_batteryAlgorithm instanceof J_BatteryManagementExternalSetpoint);
+    	List<GridConnection> memberedGCWithSetpointBatteries = findAll(energyCoop.f_getMemberGridConnectionsCollectionPointer(), GC -> GC.p_batteryAsset != null && GC.p_batteryAlgorithm != null && GC.p_batteryAlgorithm instanceof J_BatteryManagementExternalSetpoint);
 		
-		//Determine prefered charge setpoint of the battery, for maximum (collective) selfconsumption (equal to negative or positive balance)
+		//Determine prefered charge setpoint of the battery, for maximum (collective) selfconsumption (equal to negative or positive balance) and the total delivery and feedin
 		double collectiveChargeSetpoint_kW = 0;
-		for(GridConnection GC : energyCoop.f_getMemberGridConnectionsCollectionPointer()) {
-				collectiveChargeSetpoint_kW -= GC.fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY);
-		}
-		
-		//Get total active usable battery capacity
-		double sumOfBatteryCapacities_kWh = sum(memberedGCWithSetpointBatteries, GC -> GC.v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh*1000);
-		
-		//Only add the gc that have the same direction as net coop charge flow to the gc that will use their battery
 		double totalCurrentFeedin_kW = 0;
 		double totalCurrentDelivery_kW = 0;
-		for (GridConnection GC : memberedGCWithSetpointBatteries) {
-			double currentBatteryPowerElectric = GC.fm_currentAssetFlows_kW.get(OL_AssetFlowCategories.batteriesChargingPower_kW) - GC.fm_currentAssetFlows_kW.get(OL_AssetFlowCategories.batteriesDischargingPower_kW);
+		double sumOfBatteryCapacities_kWh = 0;
+		for(GridConnection GC : energyCoop.f_getMemberGridConnectionsCollectionPointer()) {
+			double currentBatteryPowerElectric = 0;
+			if(memberedGCWithSetpointBatteries.contains(GC)) {
+				currentBatteryPowerElectric = GC.fm_currentAssetFlows_kW.get(OL_AssetFlowCategories.batteriesChargingPower_kW) - GC.fm_currentAssetFlows_kW.get(OL_AssetFlowCategories.batteriesDischargingPower_kW);
+				
+				//Get total active usable battery capacity
+				sumOfBatteryCapacities_kWh += (GC.v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh*1000);
+			}
+			collectiveChargeSetpoint_kW -= GC.fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY) - currentBatteryPowerElectric;
 			totalCurrentFeedin_kW+=max(0,-(GC.fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY) - currentBatteryPowerElectric));
 			totalCurrentDelivery_kW+=max(0,(GC.fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY) - currentBatteryPowerElectric));
 		}
-
+	
 		// For all qualifying GCs, make balanceflow zero if possible. Also, distinguish between collective feedin and collective delivery
 		double remainingSumOfChargeSetpoints_kW = collectiveChargeSetpoint_kW;
 
@@ -58,7 +58,7 @@ public void manageExternalSetpoints() {
 			double GC_Setpoint_kW=0;
 			if (collectiveChargeSetpoint_kW > 0) {
 				GC_Setpoint_kW = collectiveChargeSetpoint_kW * max(0,-GC.fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY))/totalCurrentFeedin_kW; // Divide summed charge-power proportional to feedin power on each GC.
-			} else if (collectiveChargeSetpoint_kW < 0){ 
+			} else if (collectiveChargeSetpoint_kW < 0){
 				GC_Setpoint_kW = collectiveChargeSetpoint_kW * max(0,GC.fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY))/totalCurrentDelivery_kW; // Divide summed charge-power proportional to delivery power on each GC.
 			}
 			remainingSumOfChargeSetpoints_kW -= ((J_BatteryManagementExternalSetpoint)GC.p_batteryAlgorithm).setChargeSetpoint_kW(GC_Setpoint_kW);
diff --git a/_alp/Classes/Class.J_BatteryManagementExternalSetpoint.java b/_alp/Classes/Class.J_BatteryManagementExternalSetpoint.java
index be4b593a..c324f9e6 100644
--- a/_alp/Classes/Class.J_BatteryManagementExternalSetpoint.java
+++ b/_alp/Classes/Class.J_BatteryManagementExternalSetpoint.java
@@ -41,6 +41,7 @@ public double getChargeSetpoint_kW() {
     }
     
     public void manageBattery() {
+    	
         //Manage the battery with the set charge setpoint
     	gc.p_batteryAsset.f_updateAllFlows(this.currentChargeSetpoint_kW / gc.p_batteryAsset.getCapacityElectric_kW());
 

From de84214dd15d95209846d5cbec0febefe873e8df Mon Sep 17 00:00:00 2001
From: Ate Hempenius <ate@zenmo.com>
Date: Wed, 27 Aug 2025 14:41:58 +0200
Subject: [PATCH 4/4] comments for aggregator location: location is changable,
 because it only works with timestep delay for now.

---
 _alp/Agents/EnergyModel/Code/Functions.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/_alp/Agents/EnergyModel/Code/Functions.java b/_alp/Agents/EnergyModel/Code/Functions.java
index 93a9ba00..f7d44df2 100644
--- a/_alp/Agents/EnergyModel/Code/Functions.java
+++ b/_alp/Agents/EnergyModel/Code/Functions.java
@@ -176,8 +176,7 @@
 	}
 }
 
-//Call aggregator functions
-f_runAggregators();
+//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!
 	
@@ -205,6 +204,9 @@
 	v_currentEnergyExport_kW += max( 0, -netFlow_kW );
 }
 
+//Call aggregator functions (ONLY WORK WITH TIME STEP DELAY FOR NOW) (LOCATION OF THIS CALL IS NOT DETERMINED YET, FOR NOW HERE)
+f_runAggregators();
+
 /*ALCODEEND*/}
 
 double f_initializeForecasts()
@@ -1144,7 +1146,7 @@ List<GridConnection> f_getPausedGridConnectionsCollectionPointer()
 
 double f_runAggregators()
 {/*ALCODESTART::1756207695591*/
-//Function used to perform central management functions (like setpoint battery steering, within a timestep)
+//Function used to perform central management functions (like setpoint battery steering)
 
 //Run energy coop aggrator
 for (EnergyCoop EC : pop_energyCoops) {