diff --git a/_alp/Agents/AVGC_data/Code/Functions.java b/_alp/Agents/AVGC_data/Code/Functions.java
index 68dd820b..f1ebfae5 100644
--- a/_alp/Agents/AVGC_data/Code/Functions.java
+++ b/_alp/Agents/AVGC_data/Code/Functions.java
@@ -37,6 +37,13 @@
 dataAVGC.p_avgCompanyGasConsumption_m3pm2 = p_avgCompanyGasConsumption_m3pm2;
 dataAVGC.p_avgCompanyHeatConsumption_kWhpm2 = p_avgCompanyHeatConsumption_kWhpm2;
 
+//Gridnodes/cables
+dataAVGC.p_maxNominalPowerLVCable_kW = p_maxNominalPowerLVCable_kW;
+dataAVGC.p_maxNominalPowerMVCable_kW = p_maxNominalPowerMVCable_kW;
+dataAVGC.p_minCapacityMVLVStation_kW = p_minCapacityMVLVStation_kW;
+dataAVGC.p_maxCapacityMVLVStation_kW = p_maxCapacityMVLVStation_kW;
+dataAVGC.p_maxCapacityMVMVStation_kW = p_maxCapacityMVMVStation_kW;
+
 //Vehicles
 dataAVGC.p_avgEVMaxChargePowerCar_kW = p_avgEVMaxChargePowerCar_kW;
 dataAVGC.p_avgEVMaxChargePowerVan_kW = p_avgEVMaxChargePowerVan_kW;
@@ -110,6 +117,9 @@
 dataAVGC.p_avgSolarFieldPower_kWppha = p_avgSolarFieldPower_kWppha;
 dataAVGC.p_defaultPVOrientation = p_defaultPVOrientation;
 
+dataAVGC.p_largestWindTurbine_land_MW = p_largestWindTurbine_land_MW;
+dataAVGC.p_largestWindTurbine_sea_MW = p_largestWindTurbine_sea_MW;
+
 //Thermal model parameters
 dataAVGC.p_PBL_HeatingLossFactor_fr = p_PBL_HeatingLossFactor_fr;
 dataAVGC.map_insulationLabel_lossfactorPerFloorSurface_WpKm2 = map_insulationLabel_lossfactorPerFloorSurface_WpKm2;
diff --git a/_alp/Agents/AVGC_data/Levels/Level.level.xml b/_alp/Agents/AVGC_data/Levels/Level.level.xml
index cd714540..790f37ad 100644
--- a/_alp/Agents/AVGC_data/Levels/Level.level.xml
+++ b/_alp/Agents/AVGC_data/Levels/Level.level.xml
@@ -311,7 +311,7 @@
 		<Id>1726584205560</Id>
 		<Name><![CDATA[txt_avgPV]]></Name>
 		<X>510</X>
-		<Y>825</Y>
+		<Y>815</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -336,7 +336,7 @@
 		<Id>1726584205562</Id>
 		<Name><![CDATA[txt_avgBat]]></Name>
 		<X>510</X>
-		<Y>960</Y>
+		<Y>1010</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -689,7 +689,7 @@
 		<Id>1768315329120</Id>
 		<Name><![CDATA[txt_thermalModelParameters]]></Name>
 		<X>510</X>
-		<Y>1030</Y>
+		<Y>1080</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -786,4 +786,54 @@
 		</Font>
 		<Alignment>LEFT</Alignment>
 	</Text>
+	<Text>
+		<Id>1783672835019</Id>
+		<Name><![CDATA[txt_avgWind]]></Name>
+		<X>510</X>
+		<Y>940</Y>
+		<Label>
+			<X>0</X>
+			<Y>-10</Y>
+		</Label>
+		<PublicFlag>true</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>false</ShowLabel>
+		<DrawMode>SHAPE_DRAW_2D</DrawMode>
+		<EmbeddedIcon>false</EmbeddedIcon>
+		<Z>0</Z>
+		<Rotation>0.0</Rotation>
+		<Color>-16777216</Color>
+		<Text><![CDATA[Wind turbines]]></Text>
+		<Font>
+			<Name><![CDATA[SansSerif]]></Name>
+			<Size>12</Size>
+			<Style>0</Style>
+		</Font>
+		<Alignment>LEFT</Alignment>
+	</Text>
+	<Text>
+		<Id>1783673719376</Id>
+		<Name><![CDATA[txt_avgGridNodes]]></Name>
+		<X>40</X>
+		<Y>680</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[Average values for GridNodes/Cables]]></Text>
+		<Font>
+			<Name><![CDATA[SansSerif]]></Name>
+			<Size>12</Size>
+			<Style>0</Style>
+		</Font>
+		<Alignment>LEFT</Alignment>
+	</Text>
 </Presentation>
diff --git a/_alp/Agents/AVGC_data/Variables.xml b/_alp/Agents/AVGC_data/Variables.xml
index 201916b4..f1717274 100644
--- a/_alp/Agents/AVGC_data/Variables.xml
+++ b/_alp/Agents/AVGC_data/Variables.xml
@@ -1233,7 +1233,7 @@ https://nos.nl/artikel/2483604-elektrische-vrachtwagens-blijven-achter-door-comp
 https://www.zonneplan.nl/kenniscentrum/zonnepanelen/vermogen --> 212 W/m2
 https://www.zonnepanelennoord.nl/vermogen-zonnepanelen/ --> 215 W/m2]]></Description>
 		<X>520</X>
-		<Y>855</Y>
+		<Y>845</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1263,7 +1263,7 @@ https://www.zonnepanelennoord.nl/vermogen-zonnepanelen/ --> 215 W/m2]]></Descrip
 		<Description><![CDATA[Average ratio of battery capacity over battery power.
 --> If battery capacity (in kWh) is twice the battery power (in kW) --> ratio = 2.]]></Description>
 		<X>520</X>
-		<Y>985</Y>
+		<Y>1035</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1276,7 +1276,7 @@ https://www.zonnepanelennoord.nl/vermogen-zonnepanelen/ --> 215 W/m2]]></Descrip
 			<UnitType>NONE</UnitType>
 			<SdArray>false</SdArray>
 			<DefaultValue Class="CodeValue">
-				<Code><![CDATA[2]]></Code>
+				<Code><![CDATA[2.0]]></Code>
 			</DefaultValue>
 			<ParameterEditor>
 				<Id>1726584205694</Id>
@@ -1386,7 +1386,7 @@ https://www.zonnepanelennoord.nl/vermogen-zonnepanelen/ --> 215 W/m2]]></Descrip
 		<Name><![CDATA[p_avgRatioRoofPotentialPV]]></Name>
 		<Description><![CDATA[value for the ratio of the avg Usable Roof Area For PV fr]]></Description>
 		<X>520</X>
-		<Y>875</Y>
+		<Y>865</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1720,7 +1720,7 @@ https://www.mdpi.com/1999-4893/18/7/416 -> 100-104 % efficiency, based on gas en
 		<Description><![CDATA[Parameter used to estimate the total solar production in a year in a function like:
 p_avgFullLoadHoursPV_hr * kWp_of_PV_panels = XXX kWh pv production in a year.]]></Description>
 		<X>520</X>
-		<Y>895</Y>
+		<Y>885</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1844,9 +1844,9 @@ to 18 m3 p m2 for label G
 	<Variable Class="Parameter">
 		<Id>1733155392379</Id>
 		<Name><![CDATA[p_avgSolarFieldPower_kWppha]]></Name>
-		<Description><![CDATA[1000]]></Description>
+		<Description><![CDATA[https://www.lokaleenergieoverijssel.nl/wp-content/uploads/2022/06/2022-Factsheet-Zon-PV-Grootschalig.pdf]]></Description>
 		<X>520</X>
-		<Y>915</Y>
+		<Y>905</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2322,7 +2322,7 @@ Voor nu gekozen voor 4185.
 		<Name><![CDATA[p_avgRatioHouseBatteryStorageCapacity_v_PVPower]]></Name>
 		<Description><![CDATA[https://www.essent.nl/thuisbatterij/capaciteit-thuisbatterij : Essent: "Over het algemeen kun je ervan uitgaan dat een thuisbatterij zo'n 1 à 1,5 kWh capaciteit nodig heeft per kWp zonnepanelen vermogen. " ]]></Description>
 		<X>520</X>
-		<Y>1005</Y>
+		<Y>1055</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2652,7 +2652,7 @@ https://warmtepomp-panel.nl/afgiftesysteem.html? -> 35 graden afgifte bij -10 gr
 		<Name><![CDATA[p_PBL_HeatingLossFactor_fr]]></Name>
 		<Description><![CDATA[Manually calibrated value tested on 3 neighborhoods to get the total nbh yearly total to match with the expected outcome.]]></Description>
 		<X>520</X>
-		<Y>1060</Y>
+		<Y>1110</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2680,7 +2680,7 @@ https://warmtepomp-panel.nl/afgiftesysteem.html? -> 35 graden afgifte bij -10 gr
 		<Id>1768314112512</Id>
 		<Name><![CDATA[map_insulationLabel_lossfactorPerFloorSurface_WpKm2]]></Name>
 		<X>520</X>
-		<Y>1080</Y>
+		<Y>1130</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2718,7 +2718,7 @@ OL_GridConnectionInsulationLabel.G, 1.45
 		<Name><![CDATA[p_solarAbsorptionFloorSurfaceScalingFactor_fr]]></Name>
 		<Description><![CDATA[Roughly aligned with data-analysis/fitting by Zin Li (TU/e PhD) based on measured data of 100 houses in Dalenm during DACS-HW project. Increased by a factor ~2 after manual testing/calibration by Gillis and Naud.]]></Description>
 		<X>520</X>
-		<Y>1100</Y>
+		<Y>1150</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2830,7 +2830,7 @@ OL_GridConnectionInsulationLabel.G, 1.45
 		<Id>1768497744964</Id>
 		<Name><![CDATA[p_heatCapacitySizingConstant_JpK]]></Name>
 		<X>520</X>
-		<Y>1150</Y>
+		<Y>1200</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2858,7 +2858,7 @@ OL_GridConnectionInsulationLabel.G, 1.45
 		<Id>1768497744970</Id>
 		<Name><![CDATA[p_heatCapacitySizingSlope_JpKm2]]></Name>
 		<X>520</X>
-		<Y>1170</Y>
+		<Y>1220</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2887,7 +2887,7 @@ OL_GridConnectionInsulationLabel.G, 1.45
 		<Id>1768497744974</Id>
 		<Name><![CDATA[p_heatCapacitySizingFactor_fr]]></Name>
 		<X>520</X>
-		<Y>1190</Y>
+		<Y>1240</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2975,7 +2975,7 @@ The cooldown period is defined as the duration of time before a building  is coo
 
 FIND SOURCE AND CORRECT THE NUMBERS BEFORE USE!]]></Description>
 		<X>520</X>
-		<Y>1130</Y>
+		<Y>1180</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -3016,7 +3016,7 @@ OL_GridConnectionInsulationLabel.G, 4.0
 		<Description><![CDATA[Cooldown timescale as approximately 'measured' on an energy label A, free-standing, wooden house. Modern, terraced and stone houses might have longer cooldown timescale. (meaning it can more effectively buffer heat)]]></Description>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>520</X>
-		<Y>1240</Y>
+		<Y>1260</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -3481,7 +3481,7 @@ OL_GridConnectionInsulationLabel.G, 4.0
 		<Id>1775145927207</Id>
 		<Name><![CDATA[p_defaultPVOrientation]]></Name>
 		<X>520</X>
-		<Y>935</Y>
+		<Y>925</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -3768,4 +3768,243 @@ Definition: In the Netherlands each year every GridConnection that is considered
 			</ParameterEditor>
 		</Properties>
 	</Variable>
+	<Variable Class="Parameter">
+		<Id>1783542712305</Id>
+		<Name><![CDATA[p_maxCapacityMVMVStation_kW]]></Name>
+		<Description><![CDATA[Het vermogen van de buurtbatterij is afhankelijk van de locatie:
+— voor een woonwijk is het vermogen beperkt tot een middenspanningskabel (< 2.000-
+5.000 kW) en/of MS/LS-station (max. 1.500 kW) en/of laagspanningskabel (<100 kW);
+— voor een bedrijventerrein is het vermogen beperkt tot een middenspanningsverdeelstation (<50 MW) en/of middenspanningskabel (<5 MW).
+Voor het vermogen van de buurtbatterij worden twee formaten aangenomen: 200 kW en
+2 MW.
+
+https://ce.nl/wp-content/uploads/2023/12/CE_Delft_WitteveenBos_230315_Thuis-_en_buurtbatterijen_Def.pdf]]></Description>
+		<X>50</X>
+		<Y>800</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
+			<Type><![CDATA[double]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<DefaultValue Class="CodeValue">
+				<Code><![CDATA[50000]]></Code>
+			</DefaultValue>
+			<ParameterEditor>
+				<Id>1783542712303</Id>
+				<Label><![CDATA[p_maxGridBatteryStorageCapacityMVMVBusinesspark_MW]]></Label>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
+	<Variable Class="Parameter">
+		<Id>1783542843312</Id>
+		<Name><![CDATA[p_maxNominalPowerMVCable_kW]]></Name>
+		<Description><![CDATA[Het vermogen van de buurtbatterij is afhankelijk van de locatie:
+— voor een woonwijk is het vermogen beperkt tot een middenspanningskabel (< 2.000-
+5.000 kW) en/of MS/LS-station (max. 1.500 kW) en/of laagspanningskabel (<100 kW);
+— voor een bedrijventerrein is het vermogen beperkt tot een middenspanningsverdeelstation (<50 MW) en/of middenspanningskabel (<5 MW).
+Voor het vermogen van de buurtbatterij worden twee formaten aangenomen: 200 kW en
+2 MW.
+
+https://ce.nl/wp-content/uploads/2023/12/CE_Delft_WitteveenBos_230315_Thuis-_en_buurtbatterijen_Def.pdf]]></Description>
+		<X>50</X>
+		<Y>730</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
+			<Type><![CDATA[double]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<DefaultValue Class="CodeValue">
+				<Code><![CDATA[5000.0]]></Code>
+			</DefaultValue>
+			<ParameterEditor>
+				<Id>1783542843310</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
+	<Variable Class="Parameter">
+		<Id>1783542843330</Id>
+		<Name><![CDATA[p_maxCapacityMVLVStation_kW]]></Name>
+		<Description><![CDATA[Het vermogen van de buurtbatterij is afhankelijk van de locatie:
+— voor een woonwijk is het vermogen beperkt tot een middenspanningskabel (< 2.000-
+5.000 kW) en/of MS/LS-station (max. 1.500 kW) en/of laagspanningskabel (<100 kW);
+— voor een bedrijventerrein is het vermogen beperkt tot een middenspanningsverdeelstation (<50 MW) en/of middenspanningskabel (<5 MW).
+Voor het vermogen van de buurtbatterij worden twee formaten aangenomen: 200 kW en
+2 MW.
+
+https://ce.nl/wp-content/uploads/2023/12/CE_Delft_WitteveenBos_230315_Thuis-_en_buurtbatterijen_Def.pdf]]></Description>
+		<X>50</X>
+		<Y>780</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
+			<Type><![CDATA[double]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<DefaultValue Class="CodeValue">
+				<Code><![CDATA[1500.0]]></Code>
+			</DefaultValue>
+			<ParameterEditor>
+				<Id>1783542843328</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
+	<Variable Class="Parameter">
+		<Id>1783542921570</Id>
+		<Name><![CDATA[p_maxNominalPowerLVCable_kW]]></Name>
+		<Description><![CDATA[Het vermogen van de buurtbatterij is afhankelijk van de locatie:
+— voor een woonwijk is het vermogen beperkt tot een middenspanningskabel (< 2.000-
+5.000 kW) en/of MS/LS-station (max. 1.500 kW) en/of laagspanningskabel (<100 kW);
+— voor een bedrijventerrein is het vermogen beperkt tot een middenspanningsverdeelstation (<50 MW) en/of middenspanningskabel (<5 MW).
+Voor het vermogen van de buurtbatterij worden twee formaten aangenomen: 200 kW en
+2 MW.
+
+https://ce.nl/wp-content/uploads/2023/12/CE_Delft_WitteveenBos_230315_Thuis-_en_buurtbatterijen_Def.pdf]]></Description>
+		<X>50</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[double]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<DefaultValue Class="CodeValue">
+				<Code><![CDATA[100.0]]></Code>
+			</DefaultValue>
+			<ParameterEditor>
+				<Id>1783542921568</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
+	<Variable Class="Parameter">
+		<Id>1783543294238</Id>
+		<Name><![CDATA[p_minCapacityMVLVStation_kW]]></Name>
+		<Description><![CDATA[Het vermogen van de buurtbatterij is afhankelijk van de locatie:
+— voor een woonwijk is het vermogen beperkt tot een middenspanningskabel (< 2.000-
+5.000 kW) en/of MS/LS-station (max. 1.500 kW) en/of laagspanningskabel (<100 kW);
+— voor een bedrijventerrein is het vermogen beperkt tot een middenspanningsverdeelstation (<50 MW) en/of middenspanningskabel (<5 MW).
+Voor het vermogen van de buurtbatterij worden twee formaten aangenomen: 200 kW en
+2 MW.
+
+https://ce.nl/wp-content/uploads/2023/12/CE_Delft_WitteveenBos_230315_Thuis-_en_buurtbatterijen_Def.pdf]]></Description>
+		<X>50</X>
+		<Y>760</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
+			<Type><![CDATA[double]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<DefaultValue Class="CodeValue">
+				<Code><![CDATA[200.0]]></Code>
+			</DefaultValue>
+			<ParameterEditor>
+				<Id>1783543294236</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
+	<Variable Class="Parameter">
+		<Id>1783672840633</Id>
+		<Name><![CDATA[p_largestWindTurbine_land_MW]]></Name>
+		<Description><![CDATA[https://windparkwieringermeer.nl/]]></Description>
+		<X>520</X>
+		<Y>970</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
+			<Type><![CDATA[double]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<DefaultValue Class="CodeValue">
+				<Code><![CDATA[7.5]]></Code>
+			</DefaultValue>
+			<ParameterEditor>
+				<Id>1783672840631</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
+	<Variable Class="Parameter">
+		<Id>1783672903235</Id>
+		<Name><![CDATA[p_largestWindTurbine_sea_MW]]></Name>
+		<Description><![CDATA[https://www.energy-innovation.nl/nl/projecten/haliade-x/]]></Description>
+		<X>520</X>
+		<Y>990</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
+			<Type><![CDATA[double]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<DefaultValue Class="CodeValue">
+				<Code><![CDATA[14]]></Code>
+			</DefaultValue>
+			<ParameterEditor>
+				<Id>1783672903233</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
 </Variables>
diff --git a/_alp/Agents/UI_Tabs/EmbeddedObjects.xml b/_alp/Agents/UI_Tabs/EmbeddedObjects.xml
index 5c313943..16b4ac3d 100644
--- a/_alp/Agents/UI_Tabs/EmbeddedObjects.xml
+++ b/_alp/Agents/UI_Tabs/EmbeddedObjects.xml
@@ -75,13 +75,13 @@
 		</GenericParameterSubstitute>
 		<Parameters>
 			<Parameter>
-				<Name><![CDATA[p_currentPVOnLand_ha]]></Name>
+				<Name><![CDATA[p_initialPVOnLand_ha]]></Name>
 			</Parameter>
 			<Parameter>
-				<Name><![CDATA[p_currentWindTurbines_MW]]></Name>
+				<Name><![CDATA[p_initialWindTurbines_MW]]></Name>
 			</Parameter>
 			<Parameter>
-				<Name><![CDATA[p_currentTotalGridBatteryCapacity_MWh]]></Name>
+				<Name><![CDATA[p_initialTotalGridBatteryCapacity_MWh]]></Name>
 			</Parameter>
 		</Parameters>
 		<ReplicationFlag>true</ReplicationFlag>
diff --git a/_alp/Agents/Zero_Interface/Code/Functions.java b/_alp/Agents/Zero_Interface/Code/Functions.java
index f6aee7fa..7af54732 100644
--- a/_alp/Agents/Zero_Interface/Code/Functions.java
+++ b/_alp/Agents/Zero_Interface/Code/Functions.java
@@ -372,9 +372,20 @@ else if(b.p_annotation != null){
 //Update the resultsUI
 f_updateUIResultsData();
 
+//Update sliders and ranges of customGC
+if (c_selectedGridConnections.size() > 0){
+	if (uI_Tabs.pop_tabElectricity.get(0).c_customSolarfarmGCs.contains(c_selectedGridConnections.get(0))
+		|| uI_Tabs.pop_tabElectricity.get(0).c_customWindfarmGCs.contains(c_selectedGridConnections.get(0))
+		|| uI_Tabs.pop_tabElectricity.get(0).c_customGridBatteryGCs.contains(c_selectedGridConnections.get(0))){
+		uI_Tabs.pop_tabElectricity.get(0).f_updateCustomGCSettings();
+	}
+}
+
 //Set the button for going to the company UI (needs to be at the end of this function!)
 f_setUIButton();
 
+//alle panden met meerdere adressen hebben op dit moment (16-7-24) dezelfde functie(s) voor ieder adres, dus dit is op dit moment zinloos
+//f_listFunctions();
 /*ALCODEEND*/}
 
 double f_deselectPreviousSelect()
@@ -423,6 +434,9 @@ else if (previousClickedObjectType == OL_GISObjectType.BUILDING ||
 		v_customEnergyCoop = null;
 	}
 }
+
+// Notify tabElectricity of deselection so it can remove and hide the custom settings pages
+if (!uI_Tabs.pop_tabElectricity.isEmpty()) uI_Tabs.pop_tabElectricity.get(0).f_updateCustomGCSettings();
 /*ALCODEEND*/}
 
 double f_connectResultsUI()
@@ -1006,8 +1020,7 @@ GISRoute f_createGISLine(double[] GISCoords,OL_GISObjectType objectType)
 			f_filterGridLoops(toBeFilteredGC);
 		}
 		else{
-		
-			f_setForcedClickScreenText("Selecteer een lus");
+			f_setForcedClickScreenMessageText("Selecteer een lus");
 			if(!b_inEnergyHubSelectionMode){
 				f_setForcedClickScreenVisibility(true);
 			}
@@ -1029,7 +1042,7 @@ GISRoute f_createGISLine(double[] GISCoords,OL_GISObjectType objectType)
 			f_filterNeighborhoods(toBeFilteredGC);
 		}
 		else{
-			f_setForcedClickScreenText("Selecteer een buurt");
+			f_setForcedClickScreenMessageText("Selecteer een buurt");
 			if(!b_inEnergyHubSelectionMode){
 				f_setForcedClickScreenVisibility(true);
 			}
@@ -1158,7 +1171,7 @@ else if(c_selectedFilterOptions.contains(selectedFilter)){ // Remove filter
 				}
 			
 				if(gr_forceMapSelection.isVisible()){
-					f_setForcedClickScreenText("");
+					f_setForcedClickScreenMessageText("");
 					if(!b_inEnergyHubSelectionMode){
 						f_setForcedClickScreenVisibility(false);
 					}
@@ -1353,7 +1366,7 @@ else if(c_selectedFilterOptions.contains(selectedFilter)){ // Remove filter
 			}
 
 			if(gr_forceMapSelection.isVisible()){
-				f_setForcedClickScreenText("");
+				f_setForcedClickScreenMessageText("");
 				if(!b_inEnergyHubSelectionMode){
 					f_setForcedClickScreenVisibility(false);
 				}
@@ -1512,15 +1525,14 @@ else if(c_manualFilterDeselectedGC.contains(clickedGC)){
 }
 /*ALCODEEND*/}
 
-double f_setForcedClickScreenText(String forcedClickScreenText)
+double f_setForcedClickScreenMessageText(String forcedClickScreenMessageText)
 {/*ALCODESTART::1742300624199*/
-t_forcedClickMessage.setText(forcedClickScreenText);
+t_forcedClickMessage.setText(forcedClickScreenMessageText);
+gr_ForceMapSelectionMessageText.setVisible(false);
 
-if(t_forcedClickMessage.getText().equals("")){
-	gr_ForceMapSelectionText.setVisible(false);
-}
-else{
-	gr_ForceMapSelectionText.setVisible(true);
+if(!t_forcedClickMessage.getText().equals("")){
+	UIUtil.fitTextInRectangle(t_forcedClickMessage, rect_selectText, 15.0, 15.0, 15.0, 15.0);
+	gr_ForceMapSelectionMessageText.setVisible(true);
 }
 /*ALCODEEND*/}
 
@@ -2704,7 +2716,7 @@ else if (c_selectedFilterOptions.contains(OL_FilterOptionsGC.GRIDTOPOLOGY_SELECT
 b_inEnergyHubMode = true;
 b_inEnergyHubSelectionMode = true;
 
-f_setForcedClickScreenText("");
+f_setForcedClickScreenTextBoxes("Energie Hub Configurator", uI_EnergyHub.p_energyHubBackGroundColor, uI_EnergyHub.p_energyHubLineColor, "", new Color(255, 255, 255), new Color(0, 0, 0));
 f_setForcedClickScreenVisibility(true);
 
 cb_showFilterInterface.setSelected(true, true);
@@ -3027,7 +3039,7 @@ ShapeRadioButtonGroup f_getScenarioButtons()
 b_inEnergyHubMode = false;
 b_inEnergyHubSelectionMode = false;
 
-f_setForcedClickScreenText("");
+f_setForcedClickScreenTextBoxes("", new Color(255, 255, 255), new Color(0, 0, 0), "", new Color(255, 255, 255), new Color(0, 0, 0));
 f_setForcedClickScreenVisibility(false);
 
 cb_showFilterInterface.setSelected(false, true);
@@ -3202,6 +3214,9 @@ else if(project_data.project_type() == OL_ProjectType.RESIDENTIAL){
 
 double f_setScenario_Future()
 {/*ALCODESTART::1761119479231*/
+//First reset specific buttons (Has to be before setting scenario settings)
+f_resetSpecialSlidersAndButtons();
+
 if(c_scenarioMap_Future != null){
 	f_setCompaniesScenario(c_scenarioMap_Future);
 }
@@ -3214,7 +3229,9 @@ else if(project_data.project_type() == OL_ProjectType.RESIDENTIAL){
 
 double f_setScenario_Current()
 {/*ALCODESTART::1761119479233*/
-//if(project_data.project_type() == OL_ProjectType.BUSINESSPARK && c_scenarioMap_Current != null){
+//First reset specific buttons (Has to be before setting scenario settings)
+f_resetSpecialSlidersAndButtons();
+
 if(c_scenarioMap_Current != null){
 	f_setCompaniesScenario(c_scenarioMap_Current);
 }
@@ -3239,6 +3256,12 @@ else if(project_data.project_type() == OL_ProjectType.RESIDENTIAL){
 	}
 }
 
+if(uI_Tabs.pop_tabElectricity.size() > 0){
+	if(uI_Tabs.pop_tabElectricity.size() > 0){
+		uI_Tabs.pop_tabElectricity.get(0).f_deleteAllCustomGCs();
+	}
+}
+
 //Project specific sliders and buttons reset
 f_resetProjectSpecificSlidersAndButtons();
 /*ALCODEEND*/}
@@ -3310,8 +3333,8 @@ else if(project_data.project_type() == OL_ProjectType.RESIDENTIAL){
 tabElec.sl_largeScaleWind_MW.setValue(largeScaleWind_MW, true);
 
 //Gridbatteries
-double averageNeighbourhoodBatterySize_kWh = p_residentialScenario_Current.getAverageNeighbourhoodBatterySize_kWh();
-tabElec.sl_gridBatteries_kWh.setValue(averageNeighbourhoodBatterySize_kWh, true);
+double averageNeighbourhoodBatterySize_MWh = p_residentialScenario_Current.getAverageNeighbourhoodBatterySize_MWh();
+tabElec.sl_gridBatteries_MWh.setValue(averageNeighbourhoodBatterySize_MWh, true);
 
 //Curtailment rooftop PV
 boolean cb_gridCurtailmentActive = p_residentialScenario_Current.getCb_gridCurtailmentActive();
@@ -3432,8 +3455,8 @@ else if(cb_householdLTDistrictHeatingActive){
 	p_residentialScenario_Current.setLargeScaleWind_MW(largeScaleWind_MW);
 	
 	//Grid batteries
-	double averageNeighbourhoodBatterySize_kWh = tabElec.sl_gridBatteries_kWh.getValue();
-	p_residentialScenario_Current.setAverageNeighbourhoodBatterySize_kWh(averageNeighbourhoodBatterySize_kWh);
+	double averageNeighbourhoodBatterySize_MWh = tabElec.sl_gridBatteries_MWh.getValue();
+	p_residentialScenario_Current.setAverageNeighbourhoodBatterySize_MWh(averageNeighbourhoodBatterySize_MWh);
 	
 	//Large-scale grid curtailment EAs
 	boolean cb_gridCurtailmentActive = tabElec.cb_gridCurtailment.isSelected();
@@ -3572,48 +3595,6 @@ String f_getDateString()
 		rb_mapOverlay.setValue(c_loadedMapOverlayTypes.indexOf(OL_MapOverlayTypes.PV_PRODUCTION),true);
 	}
 }
-
-
-
-/*
-//Pause simulation and set loading screen
-pauseSimulation();
-f_setLoadingScreen(true, 0, 0);
-
-new Thread( () -> {
-	
-	//Set selected scenario
-	String selected_scenario = f_setSelectedScenario();		
-	
-	//Set scenario name text to the correct scenario
-	t_scenarioName.setText("Scenario: " + selected_scenario);
-	traceln("Selected scenario: \"" + selected_scenario + "\"");
-	
-	//Deselect the selected building, if selected GC is now paused
-	if(c_selectedGridConnections.size()>0 && !c_selectedGridConnections.get(0).v_isActive){
-		f_clearSelectionAndSelectEnergyModel();
-	}
-	
-	//Set boolean of running main interface scenario true
-	b_runningMainInterfaceScenarios = false;
-	
-	if(!selected_scenario.equals("Custom")){
-		f_resetSettings();
-		
-		f_updateMainInterfaceSliders();
-		
-		//Colour recolor pv map again if it is active
-		if(c_loadedMapOverlayTypes.get(rb_mapOverlay.getValue()) == OL_MapOverlayTypes.PV_PRODUCTION){
-			rb_mapOverlay.setValue(c_loadedMapOverlayTypes.indexOf(OL_MapOverlayTypes.PV_PRODUCTION),true);
-		}
-	}
-	
-	//Resume live simulation and remove loading screen
-	runSimulation();
-	f_setLoadingScreen(false, 0, 0);
-	
-}).start();
-*/
 /*ALCODEEND*/}
 
 double f_setScenarioToCustom()
@@ -3829,7 +3810,16 @@ List<OL_ChartTypes> f_getSelectedChartTypes_Energy()
 
 double f_clickOnMap(double clickx,double clicky)
 {/*ALCODESTART::1777565261922*/
-if(b_inEnergyHubMode ){
+if (!uI_Tabs.pop_tabElectricity.isEmpty() && uI_Tabs.pop_tabElectricity.get(0).b_addCustomGC) {
+	if (!uI_Tabs.pop_tabElectricity.get(0).b_customGCPolygonCreated) {
+		uI_Tabs.pop_tabElectricity.get(0).f_addCustomGCLocationSelection(clickx, clicky);
+	} else {
+		uI_Tabs.pop_tabElectricity.get(0).f_addCustomGCTransformerSelection(clickx, clicky);
+	}
+} else if (!uI_Tabs.pop_tabElectricity.isEmpty() && uI_Tabs.pop_tabElectricity.get(0).b_removeCustomGC) {
+	uI_Tabs.pop_tabElectricity.get(0).f_removeCustomGCSelection(clickx,clicky);
+}
+else if(b_inEnergyHubMode ){
 	if(b_inEnergyHubSelectionMode){
 		f_selectEnergyHubGC(clickx, clicky);
 	}
@@ -3859,6 +3849,7 @@ else if (c_selectedFilterOptions.contains(OL_FilterOptionsGC.GRIDTOPOLOGY_SELECT
 		f_selectGISRegion(clickx, clicky);
 	}
 }
+
 /*ALCODEEND*/}
 
 double f_clearAdditionalGCBuildingSelection()
@@ -3882,3 +3873,52 @@ else if (c_selectedFilterOptions.contains(OL_FilterOptionsGC.GRIDTOPOLOGY_SELECT
 uI_Results.f_updateResultsUI(c_selectedGridConnections.get(0));
 /*ALCODEEND*/}
 
+GIS_Object f_refreshLegend()
+{/*ALCODESTART::1778856248260*/
+// Hide the maximum possible special legend items before rebuilding to prevent UI overlap
+for (int i = 1; i <= 10; i++) {
+    try {
+        Pair<ShapeText, ShapeRectangle> legendShapes = f_getNextSpecialLegendShapes(i);
+        if (legendShapes != null && legendShapes.getFirst() != null && legendShapes.getSecond() != null) {
+            legendShapes.getFirst().setVisible(false);
+            legendShapes.getSecond().setVisible(false);
+        }
+    } catch (Exception e) {
+        break; // Stop if we run out of defined legend shapes in the UI
+    }
+}
+// Rebuild the legend using existing functionality
+f_initializeLegend();
+/*ALCODEEND*/}
+
+double f_setForcedClickScreenTitleText(String forcedClickScreenText)
+{/*ALCODESTART::1781861106301*/
+txt_forcedClickTitle.setText(forcedClickScreenText);
+gr_forcedClickTitleTxt.setVisible(false);
+
+if(!txt_forcedClickTitle.getText().equals("")){
+	UIUtil.fitTextInRectangle(txt_forcedClickTitle, rect_forcedClickTitle, 15.0, 15.0, 15.0, 15.0);
+	gr_forcedClickTitleTxt.setVisible(true);
+}
+/*ALCODEEND*/}
+
+double f_setForcedClickScreenTitleBackgroundColor(Color fillColor,Color lineColor)
+{/*ALCODESTART::1781863042854*/
+rect_forcedClickTitle.setFillColor(fillColor);
+rect_forcedClickTitle.setLineColor(lineColor);
+/*ALCODEEND*/}
+
+double f_setForcedClickScreenTextBoxes(String titleText,Color titleBackgroundFillColor,Color titleBackgroundLineColor,String messageText,Color messageBackgroundFillColor,Color messageBackgroundLineColor)
+{/*ALCODESTART::1782123595562*/
+f_setForcedClickScreenTitleText(titleText);
+f_setForcedClickScreenTitleBackgroundColor(titleBackgroundFillColor, titleBackgroundLineColor);
+f_setForcedClickScreenMessageText(messageText);
+f_setForcedClickScreenMessageBackgroundColor(messageBackgroundFillColor, messageBackgroundLineColor);
+/*ALCODEEND*/}
+
+double f_setForcedClickScreenMessageBackgroundColor(Color fillColor,Color lineColor)
+{/*ALCODESTART::1782123808280*/
+rect_selectText.setFillColor(fillColor);
+rect_selectText.setLineColor(lineColor);
+/*ALCODEEND*/}
+
diff --git a/_alp/Agents/Zero_Interface/Code/Functions.xml b/_alp/Agents/Zero_Interface/Code/Functions.xml
index fc67cf6f..20a74e75 100644
--- a/_alp/Agents/Zero_Interface/Code/Functions.xml
+++ b/_alp/Agents/Zero_Interface/Code/Functions.xml
@@ -1118,9 +1118,9 @@
 		<ReturnModificator>VOID</ReturnModificator>
 		<ReturnType>double</ReturnType>
 		<Id>1742300624199</Id>
-		<Name><![CDATA[f_setForcedClickScreenText]]></Name>
-		<X>140</X>
-		<Y>-880</Y>
+		<Name><![CDATA[f_setForcedClickScreenMessageText]]></Name>
+		<X>160</X>
+		<Y>-2240</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1129,7 +1129,7 @@
 		<PresentationFlag>true</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
 		<Parameter>
-			<Name><![CDATA[forcedClickScreenText]]></Name>
+			<Name><![CDATA[forcedClickScreenMessageText]]></Name>
 			<Type><![CDATA[String]]></Type>
 		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
@@ -1857,7 +1857,7 @@
 		<Id>1753445407428</Id>
 		<Name><![CDATA[f_setForcedClickScreenVisibility]]></Name>
 		<X>140</X>
-		<Y>-860</Y>
+		<Y>-2320</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2754,4 +2754,128 @@
 		<ShowLabel>true</ShowLabel>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>GIS_Object</ReturnType>
+		<Id>1778856248260</Id>
+		<Name><![CDATA[f_refreshLegend]]></Name>
+		<X>1540</X>
+		<Y>1550</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="protected" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1781861106301</Id>
+		<Name><![CDATA[f_setForcedClickScreenTitleText]]></Name>
+		<X>160</X>
+		<Y>-2280</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[forcedClickScreenText]]></Name>
+			<Type><![CDATA[String]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="protected" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1781863042854</Id>
+		<Name><![CDATA[f_setForcedClickScreenTitleBackgroundColor]]></Name>
+		<X>160</X>
+		<Y>-2260</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[fillColor]]></Name>
+			<Type><![CDATA[Color]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[lineColor]]></Name>
+			<Type><![CDATA[Color]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="protected" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1782123595562</Id>
+		<Name><![CDATA[f_setForcedClickScreenTextBoxes]]></Name>
+		<X>140</X>
+		<Y>-2300</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[titleText]]></Name>
+			<Type><![CDATA[String]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[titleBackgroundFillColor]]></Name>
+			<Type><![CDATA[Color]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[titleBackgroundLineColor]]></Name>
+			<Type><![CDATA[Color]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[messageText]]></Name>
+			<Type><![CDATA[String]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[messageBackgroundFillColor]]></Name>
+			<Type><![CDATA[Color]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[messageBackgroundLineColor]]></Name>
+			<Type><![CDATA[Color]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="protected" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1782123808280</Id>
+		<Name><![CDATA[f_setForcedClickScreenMessageBackgroundColor]]></Name>
+		<X>160</X>
+		<Y>-2220</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[fillColor]]></Name>
+			<Type><![CDATA[Color]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[lineColor]]></Name>
+			<Type><![CDATA[Color]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
 </Functions>
diff --git a/_alp/Agents/Zero_Interface/Levels/Level.level.xml b/_alp/Agents/Zero_Interface/Levels/Level.level.xml
index dc15993c..d05db398 100644
--- a/_alp/Agents/Zero_Interface/Levels/Level.level.xml
+++ b/_alp/Agents/Zero_Interface/Levels/Level.level.xml
@@ -2215,7 +2215,7 @@ else{
 					<FillColor>-1</FillColor>
 					<TextColor>-16777216</TextColor>
 					<Enabled>true</Enabled>
-					<EnableExpression>!gr_ForceMapSelectionText.isVisible()</EnableExpression>
+					<EnableExpression>!gr_ForceMapSelectionMessageText.isVisible()</EnableExpression>
 					<ActionCode>if(!cb_filterOptions.getValue().equals("-")){
 	f_setFilter(map_UINamesFilterOption.get(cb_filterOptions.getValue()));
 	
@@ -2341,7 +2341,7 @@ if (c_manualFilterSelectedGC.isEmpty() &amp;&amp; c_manualFilterDeselectedGC.isE
 	f_setFilter(OL_FilterOptionsGC.MANUAL_SELECTION);
 }
 
-f_setForcedClickScreenText("");
+f_setForcedClickScreenMessageText("");
 if(!b_inEnergyHubSelectionMode){
 	f_setForcedClickScreenVisibility(false);
 }
@@ -2431,7 +2431,7 @@ traceln("Alle filters zijn verwijderd.");</ActionCode>
 	c_manualFilterSelectedGC.clear();
 	c_manualFilterDeselectedGC.clear();
 	
-	f_setForcedClickScreenText("");
+	f_setForcedClickScreenMessageText("");
 	if(!b_inEnergyHubSelectionMode){
 		f_setForcedClickScreenVisibility(false);
 	}
@@ -2465,12 +2465,13 @@ traceln("Alle filters zijn verwijderd.");</ActionCode>
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<TextColor>-16777216</TextColor>
 					<Enabled>true</Enabled>
-					<EnableExpression>user.GCAccessType == OL_UserGCAccessType.FULL &amp;&amp; (!gr_ForceMapSelectionText.isVisible() || b_inManualFilterSelectionMode)</EnableExpression>
+					<EnableExpression>user.GCAccessType == OL_UserGCAccessType.FULL &amp;&amp; (!gr_ForceMapSelectionMessageText.isVisible() || b_inManualFilterSelectionMode)</EnableExpression>
 					<ActionCode>if(!b_inManualFilterSelectionMode){
 	b_inManualFilterSelectionMode = true;
 	
-	f_setForcedClickScreenText("(De)Selecteer gebouwen");
+	f_setForcedClickScreenMessageText("(De)Selecteer gebouwen");
 	if(!b_inEnergyHubSelectionMode){
+		f_setForcedClickScreenTitleText("");
 		f_setForcedClickScreenVisibility(true);
 	}
 	
@@ -2481,7 +2482,7 @@ traceln("Alle filters zijn verwijderd.");</ActionCode>
 else{ 
 	b_inManualFilterSelectionMode = false;
 	
-	f_setForcedClickScreenText("");
+	f_setForcedClickScreenMessageText("");
 	if(!b_inEnergyHubSelectionMode){
 		f_setForcedClickScreenVisibility(false);
 	}
@@ -3689,7 +3690,7 @@ officia deserunt mollit anim id est laborum."]]></Text>
 			</Rectangle>
 			<Group>
 				<Id>1753446087501</Id>
-				<Name><![CDATA[gr_ForceMapSelectionText]]></Name>
+				<Name><![CDATA[gr_ForceMapSelectionMessageText]]></Name>
 				<X>-40</X>
 				<Y>-320</Y>
 				<Label>
@@ -3748,7 +3749,7 @@ officia deserunt mollit anim id est laborum."]]></Text>
 						<BasicProperties Width="170" Height="50">
 							<EmbeddedIcon>false</EmbeddedIcon>
 							<TextColor>-16777216</TextColor>
-							<VisibleCode>gr_ForceMapSelectionText.isVisible() &amp;&amp; b_inManualFilterSelectionMode </VisibleCode>
+							<VisibleCode>gr_ForceMapSelectionMessageText.isVisible() &amp;&amp; b_inManualFilterSelectionMode </VisibleCode>
 							<Enabled>true</Enabled>
 							<EnableExpression>button_completeManualSelectionMode.isVisible()</EnableExpression>
 							<ActionCode>if(b_inManualFilterSelectionMode){
@@ -3950,10 +3951,10 @@ officia deserunt mollit anim id est laborum."]]></Text>
 						</Presentation>
 					</Group>
 					<Group>
-						<Id>1760015470898</Id>
-						<Name><![CDATA[gr_energieHubConfiguratorTxt]]></Name>
-						<X>-60</X>
-						<Y>-190</Y>
+						<Id>1760015470904</Id>
+						<Name><![CDATA[gr_cancelEnergyHubConfiguration]]></Name>
+						<X>-820</X>
+						<Y>630</Y>
 						<Label>
 							<X>10</X>
 							<Y>0</Y>
@@ -3962,15 +3963,16 @@ officia deserunt mollit anim id est laborum."]]></Text>
 						<PresentationFlag>true</PresentationFlag>
 						<ShowLabel>false</ShowLabel>
 						<DrawMode>SHAPE_DRAW_2D</DrawMode>
+						<OnClickCode>f_cancelEnergyHubConfiguration();</OnClickCode>
 						<EmbeddedIcon>false</EmbeddedIcon>
 						<Z>0</Z>
 						<Rotation>0.0</Rotation>
 						<Presentation>
 							<RoundedRectangle>
-								<Id>1760015470900</Id>
-								<Name><![CDATA[rect_energyHubConfigurator]]></Name>
-								<X>-500</X>
-								<Y>-50</Y>
+								<Id>1760015470906</Id>
+								<Name><![CDATA[button_cancelEnergyHubConfiguration]]></Name>
+								<X>-90</X>
+								<Y>-30</Y>
 								<Label>
 									<X>10</X>
 									<Y>10</Y>
@@ -3982,24 +3984,22 @@ officia deserunt mollit anim id est laborum."]]></Text>
 								<EmbeddedIcon>false</EmbeddedIcon>
 								<Z>0</Z>
 								<ZHeight>10</ZHeight>
-								<LineWidth>2</LineWidth>
-								<LineColor>-16777216</LineColor>
-								<LineColorCode>uI_EnergyHub.p_energyHubLineColor</LineColorCode>
+								<LineWidth>3</LineWidth>
+								<LineColor>-2345659</LineColor>
 								<LineMaterial>null</LineMaterial>
 								<LineStyle>SOLID</LineStyle>
-								<Width>1000</Width>
-								<Height>90</Height>
+								<Width>275</Width>
+								<Height>75</Height>
 								<Rotation>0.0</Rotation>
 								<FillColor>-1</FillColor>
-								<FillColorCode>uI_EnergyHub.p_energyHubBackGroundColor</FillColorCode>
 								<FillMaterial>null</FillMaterial>
 								<ArcRadius>10</ArcRadius>
 							</RoundedRectangle>
 							<Text>
-								<Id>1760015470902</Id>
-								<Name><![CDATA[txt_energyHubConfigurator]]></Name>
-								<X>0</X>
-								<Y>-35</Y>
+								<Id>1760015470908</Id>
+								<Name><![CDATA[txt_cancelEnergyHubConfiguration]]></Name>
+								<X>48</X>
+								<Y>-10</Y>
 								<Label>
 									<X>0</X>
 									<Y>-10</Y>
@@ -4012,19 +4012,39 @@ officia deserunt mollit anim id est laborum."]]></Text>
 								<Z>0</Z>
 								<Rotation>0.0</Rotation>
 								<Color>-16777216</Color>
-								<Text><![CDATA[Energie Hub Configurator]]></Text>
+								<Text><![CDATA[Annuleer]]></Text>
 								<Font>
 									<Name><![CDATA[SansSerif]]></Name>
-									<Size>48</Size>
-									<Style>0</Style>
+									<Size>28</Size>
+									<Style>1</Style>
 								</Font>
 								<Alignment>CENTER</Alignment>
 							</Text>
 						</Presentation>
 					</Group>
+				</Presentation>
+			</Group>
+			<Group>
+				<Id>1777996495548</Id>
+				<Name><![CDATA[gr_addingCustomGCToMapButtons]]></Name>
+				<X>10</X>
+				<Y>-240</Y>
+				<Label>
+					<X>10</X>
+					<Y>0</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D</DrawMode>
+				<VisibleCode>uI_Tabs.pop_tabElectricity.get(0).b_addCustomGC || uI_Tabs.pop_tabElectricity.get(0).b_removeCustomGC</VisibleCode>
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Z>0</Z>
+				<Rotation>0.0</Rotation>
+				<Presentation>
 					<Group>
-						<Id>1760015470904</Id>
-						<Name><![CDATA[gr_cancelEnergyHubConfiguration]]></Name>
+						<Id>1777996495568</Id>
+						<Name><![CDATA[gr_cancelAddingCustomEAToMap]]></Name>
 						<X>-820</X>
 						<Y>630</Y>
 						<Label>
@@ -4035,14 +4055,14 @@ officia deserunt mollit anim id est laborum."]]></Text>
 						<PresentationFlag>true</PresentationFlag>
 						<ShowLabel>false</ShowLabel>
 						<DrawMode>SHAPE_DRAW_2D</DrawMode>
-						<OnClickCode>f_cancelEnergyHubConfiguration();</OnClickCode>
+						<OnClickCode>uI_Tabs.pop_tabElectricity.get(0).f_stopCustomGCCreation();</OnClickCode>
 						<EmbeddedIcon>false</EmbeddedIcon>
 						<Z>0</Z>
 						<Rotation>0.0</Rotation>
 						<Presentation>
 							<RoundedRectangle>
-								<Id>1760015470906</Id>
-								<Name><![CDATA[button_cancelEnergyHubConfiguration]]></Name>
+								<Id>1777996495570</Id>
+								<Name><![CDATA[button_cancelAddingCustomEAToMap]]></Name>
 								<X>-90</X>
 								<Y>-30</Y>
 								<Label>
@@ -4068,8 +4088,8 @@ officia deserunt mollit anim id est laborum."]]></Text>
 								<ArcRadius>10</ArcRadius>
 							</RoundedRectangle>
 							<Text>
-								<Id>1760015470908</Id>
-								<Name><![CDATA[txt_cancelEnergyHubConfiguration]]></Name>
+								<Id>1777996495572</Id>
+								<Name><![CDATA[txt_cancelAddingCustomEAToMap]]></Name>
 								<X>48</X>
 								<Y>-10</Y>
 								<Label>
@@ -4094,6 +4114,156 @@ officia deserunt mollit anim id est laborum."]]></Text>
 							</Text>
 						</Presentation>
 					</Group>
+					<Group>
+						<Id>1781530425858</Id>
+						<Name><![CDATA[gr_completeAddingCustomEAToMap]]></Name>
+						<X>-770</X>
+						<Y>550</Y>
+						<Label>
+							<X>10</X>
+							<Y>0</Y>
+						</Label>
+						<PublicFlag>true</PublicFlag>
+						<PresentationFlag>true</PresentationFlag>
+						<ShowLabel>false</ShowLabel>
+						<DrawMode>SHAPE_DRAW_2D</DrawMode>
+						<VisibleCode>uI_Tabs.pop_tabElectricity.get(0).c_tempSavedPointCoordinatesCustomGC.size()&gt;=3 &amp;&amp; !uI_Tabs.pop_tabElectricity.get(0).b_customGCPolygonCreated</VisibleCode>
+						<OnClickCode>if (GISUtil.arePolygonEdgesSelfIntersecting(uI_Tabs.pop_tabElectricity.get(0).c_tempSavedPointCoordinatesCustomGC)) { // Check if custom drawn polygon is self-intersecting
+    uI_Tabs.pop_tabElectricity.get(0).f_resetCustomGCCreation();
+    f_setForcedClickScreenMessageText("De getekende lijnen mogen elkaar niet snijden! Begin opnieuw.");
+} else {
+	uI_Tabs.pop_tabElectricity.get(0).b_customGCPolygonCreated = true;
+	f_setForcedClickScreenMessageText("Kies een trafo op de kaart");
+}</OnClickCode>
+						<EmbeddedIcon>false</EmbeddedIcon>
+						<Z>0</Z>
+						<Rotation>0.0</Rotation>
+						<Presentation>
+							<RoundedRectangle>
+								<Id>1781530425860</Id>
+								<Name><![CDATA[button_completeAddingCustomEAToMap]]></Name>
+								<X>-140</X>
+								<Y>-40</Y>
+								<Label>
+									<X>10</X>
+									<Y>10</Y>
+								</Label>
+								<PublicFlag>true</PublicFlag>
+								<PresentationFlag>true</PresentationFlag>
+								<ShowLabel>false</ShowLabel>
+								<DrawMode>SHAPE_DRAW_2D</DrawMode>
+								<EmbeddedIcon>false</EmbeddedIcon>
+								<Z>0</Z>
+								<ZHeight>10</ZHeight>
+								<LineWidth>3</LineWidth>
+								<LineColor>-16777216</LineColor>
+								<LineMaterial>null</LineMaterial>
+								<LineStyle>SOLID</LineStyle>
+								<Width>275</Width>
+								<Height>75</Height>
+								<Rotation>0.0</Rotation>
+								<FillColor>-1</FillColor>
+								<FillMaterial>null</FillMaterial>
+								<ArcRadius>10</ArcRadius>
+							</RoundedRectangle>
+							<Text>
+								<Id>1781530425862</Id>
+								<Name><![CDATA[txt_completeAddingCustomEAToMap]]></Name>
+								<X>0</X>
+								<Y>-20</Y>
+								<Label>
+									<X>0</X>
+									<Y>-10</Y>
+								</Label>
+								<PublicFlag>true</PublicFlag>
+								<PresentationFlag>true</PresentationFlag>
+								<ShowLabel>false</ShowLabel>
+								<DrawMode>SHAPE_DRAW_2D</DrawMode>
+								<EmbeddedIcon>false</EmbeddedIcon>
+								<Z>0</Z>
+								<Rotation>0.0</Rotation>
+								<Color>-16777216</Color>
+								<Text><![CDATA[Voltooien]]></Text>
+								<Font>
+									<Name><![CDATA[SansSerif]]></Name>
+									<Size>28</Size>
+									<Style>1</Style>
+								</Font>
+								<Alignment>CENTER</Alignment>
+							</Text>
+						</Presentation>
+					</Group>
+				</Presentation>
+			</Group>
+			<Group>
+				<Id>1760015470898</Id>
+				<Name><![CDATA[gr_forcedClickTitleTxt]]></Name>
+				<X>-50</X>
+				<Y>-430</Y>
+				<Label>
+					<X>10</X>
+					<Y>0</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D</DrawMode>
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Z>0</Z>
+				<Rotation>0.0</Rotation>
+				<Presentation>
+					<RoundedRectangle>
+						<Id>1760015470900</Id>
+						<Name><![CDATA[rect_forcedClickTitle]]></Name>
+						<X>-500</X>
+						<Y>-50</Y>
+						<Label>
+							<X>10</X>
+							<Y>10</Y>
+						</Label>
+						<PublicFlag>true</PublicFlag>
+						<PresentationFlag>true</PresentationFlag>
+						<ShowLabel>false</ShowLabel>
+						<DrawMode>SHAPE_DRAW_2D</DrawMode>
+						<EmbeddedIcon>false</EmbeddedIcon>
+						<Z>0</Z>
+						<ZHeight>10</ZHeight>
+						<LineWidth>2</LineWidth>
+						<LineColor>-16777216</LineColor>
+						<LineMaterial>null</LineMaterial>
+						<LineStyle>SOLID</LineStyle>
+						<Width>1000</Width>
+						<Height>90</Height>
+						<Rotation>0.0</Rotation>
+						<FillColor>-1</FillColor>
+						<FillMaterial>null</FillMaterial>
+						<ArcRadius>10</ArcRadius>
+					</RoundedRectangle>
+					<Text>
+						<Id>1760015470902</Id>
+						<Name><![CDATA[txt_forcedClickTitle]]></Name>
+						<X>0</X>
+						<Y>-35</Y>
+						<Label>
+							<X>0</X>
+							<Y>-10</Y>
+						</Label>
+						<PublicFlag>true</PublicFlag>
+						<PresentationFlag>true</PresentationFlag>
+						<ShowLabel>false</ShowLabel>
+						<DrawMode>SHAPE_DRAW_2D</DrawMode>
+						<EmbeddedIcon>false</EmbeddedIcon>
+						<Z>0</Z>
+						<Rotation>0.0</Rotation>
+						<Color>-16777216</Color>
+						<Text><![CDATA[<txt_forcedClickTitle>]]></Text>
+						<Font>
+							<Name><![CDATA[SansSerif]]></Name>
+							<Size>48</Size>
+							<Style>0</Style>
+						</Font>
+						<Alignment>CENTER</Alignment>
+					</Text>
 				</Presentation>
 			</Group>
 		</Presentation>
diff --git a/_alp/Agents/Zero_Interface/Variables.xml b/_alp/Agents/Zero_Interface/Variables.xml
index 7be6f945..f1235c18 100644
--- a/_alp/Agents/Zero_Interface/Variables.xml
+++ b/_alp/Agents/Zero_Interface/Variables.xml
@@ -1562,8 +1562,8 @@
 	<Variable Class="PlainVariable">
 		<Id>1742298194173</Id>
 		<Name><![CDATA[v_forcedClickScreenColor]]></Name>
-		<X>140</X>
-		<Y>-840</Y>
+		<X>160</X>
+		<Y>-2200</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
diff --git a/_alp/Agents/Zero_Loader/Code/Functions.java b/_alp/Agents/Zero_Loader/Code/Functions.java
index 446c8af3..02dc98e5 100644
--- a/_alp/Agents/Zero_Loader/Code/Functions.java
+++ b/_alp/Agents/Zero_Loader/Code/Functions.java
@@ -722,16 +722,27 @@ else if(RegionCoords.startsWith("LineString")){
 		GISCoords[5]=GN.p_longitude + scaling_factor_gridnode*0.00001*2;
 		GISCoords[7]=GN.p_longitude + scaling_factor_gridnode*0.00001;
 		break;
-	/*
 	case "CIRCLE":
-			// if you want Circle coordinates -->
+		// if you want Circle coordinates -->
 		//x = r * cos(t) + a
 		//y = r * sin(t) + b
 		//t is an angle between 0 and 2π (more steps is more circle points, about 10-12 should suffice. --> adjust nb_GISCoords accordingly
 		// r is the radius: 0.000009 degrees in latitude is about 1 meter 
 		// a and b are latitude and longitude
+		double rLat = scaling_factor_gridnode * 0.000001;
+		double rLon = rLat / Math.cos(Math.toRadians(GN.p_latitude));  // degrees longitude corrected
+		int nPoints = GISCoords.length / 2;
+		
+		for (int i = 0; i < nPoints; i++) {
+
+	        double angle = 2 * Math.PI * i / nPoints;
+	        double lat = GN.p_latitude  + rLat * Math.sin(angle);
+	        double lon = GN.p_longitude + rLon * Math.cos(angle);
+	
+	        GISCoords[2*i] = lat;
+	        GISCoords[2*i+1] = lon;
+	    }
 		break;
-	*/
 }
 
 return GISCoords;
diff --git a/_alp/Agents/Zero_Loader/EmbeddedObjects.xml b/_alp/Agents/Zero_Loader/EmbeddedObjects.xml
index 9c29af05..88953c5e 100644
--- a/_alp/Agents/Zero_Loader/EmbeddedObjects.xml
+++ b/_alp/Agents/Zero_Loader/EmbeddedObjects.xml
@@ -481,6 +481,27 @@
 			<Parameter>
 				<Name><![CDATA[map_avgAssetBaseOPEX_eurpyr]]></Name>
 			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_maxCapacityMVMVStation_kW]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_maxNominalPowerMVCable_kW]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_maxCapacityMVLVStation_kW]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_maxNominalPowerLVCable_kW]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_minCapacityMVLVStation_kW]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_largestWindTurbine_land_MW]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_largestWindTurbine_sea_MW]]></Name>
+			</Parameter>
 		</Parameters>
 		<ReplicationFlag>false</ReplicationFlag>
 		<Replication Class="CodeValue">
diff --git a/_alp/Agents/tabElectricity/Code/AdditionalClassCode.java b/_alp/Agents/tabElectricity/Code/AdditionalClassCode.java
index b66a1be4..a50824ab 100644
--- a/_alp/Agents/tabElectricity/Code/AdditionalClassCode.java
+++ b/_alp/Agents/tabElectricity/Code/AdditionalClassCode.java
@@ -58,5 +58,5 @@ public ShapeSlider getSliderLargeScaleWind(){
 }
 
 public ShapeSlider getSliderGridBatteries(){
-	return this.sl_gridBatteries_kWh;
+	return this.sl_gridBatteries_MWh;
 }
\ No newline at end of file
diff --git a/_alp/Agents/tabElectricity/Code/Functions.java b/_alp/Agents/tabElectricity/Code/Functions.java
index da2e9f5e..84a85651 100644
--- a/_alp/Agents/tabElectricity/Code/Functions.java
+++ b/_alp/Agents/tabElectricity/Code/Functions.java
@@ -1,7 +1,6 @@
 double f_setPVOnLand(double hectare,List<GCEnergyProduction> gcListProduction)
 {/*ALCODESTART::1722256117103*/
-// TODO: Change to work for multiple solar fields in one model.
-// to do so it should probably first calculate the total installed pv in all solar fields
+// Single solarfarm at GridNode T0
 for ( GCEnergyProduction GCEP : gcListProduction) {
 	for(J_EAProduction j_ea : GCEP.c_productionAssets) {
 		if (j_ea.getEAType() == OL_EnergyAssetType.PHOTOVOLTAIC) {
@@ -90,9 +89,7 @@
 
 double f_setWindTurbines(double AllocatedWindPower_MW,List<GCEnergyProduction> gcListProduction)
 {/*ALCODESTART::1722256248965*/
-// TODO: Change to work for multiple wind farms in one model.
-// to do so it should probably first calculate the total installed wind power in all wind farms
-
+// Single windfarm at GridNode T0
 for ( GCEnergyProduction GCEP : gcListProduction) {
 	for(J_EAProduction j_ea : GCEP.c_productionAssets) {
 		if (j_ea.getEAType() == OL_EnergyAssetType.WINDMILL) {
@@ -140,18 +137,18 @@
 zero_Interface.f_resetSettings();
 /*ALCODEEND*/}
 
-double f_getCurrentPVOnLandAndWindturbineValues()
+double f_getInitialPVOnLandAndWindturbineValues()
 {/*ALCODESTART::1745483988251*/
-p_currentPVOnLand_ha = 0;
-p_currentWindTurbines_MW = 0;
+p_initialPVOnLand_ha = 0;
+p_initialWindTurbines_MW = 0;
 for(GCEnergyProduction GCProd : uI_Tabs.f_getAllSliderGridConnections_production()){
-	if(!c_electricityTabEASliderGCs.contains(GCProd) && GCProd.v_isActive){
+	if(!c_electricityTabEASliderGCs.contains(GCProd) && !c_customSolarfarmGCs.contains(GCProd) && !c_customWindfarmGCs.contains(GCProd) && GCProd.v_isActive){
 		for(J_EAProduction ea : GCProd.c_productionAssets){
 			if(ea.getEAType() == OL_EnergyAssetType.PHOTOVOLTAIC){
-				p_currentPVOnLand_ha += ea.getCapacityElectric_kW()/zero_Interface.energyModel.avgc_data.p_avgSolarFieldPower_kWppha;
+				p_initialPVOnLand_ha += ea.getCapacityElectric_kW()/zero_Interface.energyModel.avgc_data.p_avgSolarFieldPower_kWppha;
 			}
 			else if(ea.getEAType() == OL_EnergyAssetType.WINDMILL){
-				p_currentWindTurbines_MW += ea.getCapacityElectric_kW()/1000;
+				p_initialWindTurbines_MW += ea.getCapacityElectric_kW()/1000;
 			}
 		}
 	}
@@ -432,6 +429,15 @@ else if(page == gr_electricitySliders_companies){
 	else if(page == gr_electricitySliders_collective){
 		f_updateElectricitySliders_collective();
 	}
+	else if(page == gr_customGCSolarfarmSettings){
+		f_updateCustomGCSolarfarmSettings();
+	}
+	else if(page == gr_customGCWindfarmSettings){
+		f_updateCustomGCWindfarmSettings();
+	}
+	else if(page == gr_customGCGridBatterySettings){
+		f_updateCustomGCGridBatterySettings();
+	}
 	else{
 		f_updateElectricitySliders_custom(); 
 	}
@@ -488,7 +494,6 @@ else if(page == gr_electricitySliders_collective){
 
 double electricityDemandIncrease_pct = totalBaseConsumption_kWh > 0 ? ( (- totalSavedConsumption_kWh)/totalBaseConsumption_kWh * 100) : 0;
 sl_householdElectricityDemandIncrease_pct.setValue(roundToInt(electricityDemandIncrease_pct), false);
-
 /*ALCODEEND*/}
 
 double f_updateElectricitySliders_companies()
@@ -561,18 +566,18 @@ else if(page == gr_electricitySliders_collective){
 c_electricityTabEASliderGCs.clear();
 c_electricityTabEASliderGCs.addAll(electricityTabEASliderGCs);
 
-f_getCurrentPVOnLandAndWindturbineValues();
-f_getCurrentGridBatterySize();
+f_getInitialPVOnLandAndWindturbineValues();
+f_getInitialGridBatterySize();
 
 f_initializeElectricityPages();
 /*ALCODEEND*/}
 
-double f_getCurrentGridBatterySize()
+double f_getInitialGridBatterySize()
 {/*ALCODESTART::1765276703854*/
-p_currentTotalGridBatteryCapacity_MWh = 0;
+p_initialTotalGridBatteryCapacity_MWh = 0;
 for(GCGridBattery GCBat : uI_Tabs.f_getAllSliderGridConnections_gridBatteries()){
-	if(!c_electricityTabEASliderGCs.contains(GCBat) && GCBat.v_isActive){
-		p_currentTotalGridBatteryCapacity_MWh += (GCBat.p_batteryAsset.getStorageCapacity_kWh()/1000.0);
+	if(!c_electricityTabEASliderGCs.contains(GCBat) && !c_customGridBatteryGCs.contains(GCBat) && GCBat.v_isActive){
+		p_initialTotalGridBatteryCapacity_MWh += (GCBat.p_batteryAsset.getStorageCapacity_kWh()/1000.0);
 	}
 }
 /*ALCODEEND*/}
@@ -607,6 +612,7 @@ ShapeGroup f_goToPage(int pageIndex)
 
 if (c_loadedPageGroups.isEmpty()) return;
 
+v_previousPageIndex = v_currentPageIndex;
 v_currentPageIndex = pageIndex;
 c_loadedPageGroups.get(v_currentPageIndex).setVisible(true); // Show the selected page group
 f_updatePageIndicator(); // Update the page indicator text
@@ -638,12 +644,12 @@ ShapeGroup f_updatePageIndicator()
 List<GridConnection> productionGridConnections = new ArrayList<>(uI_Tabs.f_getAllSliderGridConnections_production());
 
 //Large scale EA production systems (PV/Wind on land)
-f_getCurrentPVOnLandAndWindturbineValues(); // Used for slider minimum: non adjustable GCProductions
+f_getInitialPVOnLandAndWindturbineValues(); // Used for slider minimum: non adjustable GCProductions
 
 double totalPVOnLand_kW = 0; // Of movable slider GC
 double totalWind_kW = 0; // Of movable slider GC
 
-for(GridConnection productionGC : c_electricityTabEASliderGCs){
+for(GridConnection productionGC : c_electricityTabEASliderGCs){ // Default slider solarfarm/windfarm collection
 	if(productionGC instanceof GCEnergyProduction && productionGC.v_isActive){
 		for(J_EAProduction productionEA : productionGC.c_productionAssets){
 			if(productionEA.getEAType() == OL_EnergyAssetType.PHOTOVOLTAIC){
@@ -657,25 +663,61 @@ else if(productionEA.getEAType() == OL_EnergyAssetType.WINDMILL){
 		}
 	}
 }
-sl_largeScalePV_ha.setRange(0, 1000); // Needed to prevent anylogic range bug
-sl_largeScalePV_ha.setValue((totalPVOnLand_kW/zero_Interface.energyModel.avgc_data.p_avgSolarFieldPower_kWppha) + p_currentPVOnLand_ha, false);
-sl_largeScaleWind_MW.setRange(0, 1000); // Needed to prevent anylogic range bug
-sl_largeScaleWind_MW.setValue((totalWind_kW/1000) + p_currentWindTurbines_MW, false);
+
+double totalCustomPVOnLand_kW = 0;
+for(GridConnection customSF : c_customSolarfarmGCs){
+    if(customSF.v_isActive){
+        for(J_EAProduction ea : customSF.c_productionAssets){
+            if(ea.getEAType() == OL_EnergyAssetType.PHOTOVOLTAIC){
+                totalCustomPVOnLand_kW += ea.getCapacityElectric_kW();
+            }
+        }
+    }
+}
+
+double totalCustomWind_kW = 0;
+for(GridConnection customWF : c_customWindfarmGCs){
+    if(customWF.v_isActive){
+        for(J_EAProduction ea : customWF.c_productionAssets){
+            if(ea.getEAType() == OL_EnergyAssetType.WINDMILL){
+                totalCustomWind_kW += ea.getCapacityElectric_kW();
+            }
+        }
+    }
+}
+
+double minSliderPVOnLand_ha = p_initialPVOnLand_ha + totalCustomPVOnLand_kW/zero_Interface.energyModel.avgc_data.p_avgSolarFieldPower_kWppha;
+double maxSliderPVOnLand_ha = minSliderPVOnLand_ha + 50;
+sl_largeScalePV_ha.setRange(minSliderPVOnLand_ha, maxSliderPVOnLand_ha);
+sl_largeScalePV_ha.setValue((totalPVOnLand_kW/zero_Interface.energyModel.avgc_data.p_avgSolarFieldPower_kWppha) + minSliderPVOnLand_ha, false);
+
+double minSliderWind_MW = p_initialWindTurbines_MW + totalCustomWind_kW/1000;
+double maxSliderWind_MW = minSliderWind_MW + 20;
+sl_largeScaleWind_MW.setRange(minSliderWind_MW, maxSliderWind_MW);
+sl_largeScaleWind_MW.setValue((totalWind_kW/1000) + minSliderWind_MW, false);
 
 
 //Grid batteries
-List<GCGridBattery> sliderGridBatteryGridConnections = new ArrayList<>();
-for(GridConnection sliderGC : c_electricityTabEASliderGCs){
+f_getInitialGridBatterySize(); // Used for slider minimum: non adjustable GCGridBatteries
+
+double totalDefaultBatteryCapacity_MWh = 0;
+for(GridConnection sliderGC : c_electricityTabEASliderGCs){ // Default slider battery collection
 	if(sliderGC.v_isActive && sliderGC instanceof GCGridBattery sliderGridBattery){
-		sliderGridBatteryGridConnections.add(sliderGridBattery);
+		totalDefaultBatteryCapacity_MWh += sliderGridBattery.p_batteryAsset.getStorageCapacity_kWh()/1000;
 	}
 }
 
-double averageNeighbourhoodBatterySize_kWh = 0;
-for (GCGridBattery gc : sliderGridBatteryGridConnections) {
-	averageNeighbourhoodBatterySize_kWh += gc.p_batteryAsset.getStorageCapacity_kWh()/sliderGridBatteryGridConnections.size();
+double totalCustomBatteryCapacity_MWh = 0;
+for(GridConnection customGB : c_customGridBatteryGCs){
+	if(customGB.v_isActive && customGB.p_batteryAsset != null){
+		totalCustomBatteryCapacity_MWh += customGB.p_batteryAsset.getStorageCapacity_kWh()/1000;
+	}
 }
-sl_gridBatteries_kWh.setValue(averageNeighbourhoodBatterySize_kWh, false);
+
+double minSliderGridBattery_MWh = p_initialTotalGridBatteryCapacity_MWh + totalCustomBatteryCapacity_MWh;
+double maxSliderGridBattery_MWh = minSliderGridBattery_MWh + 20;
+sl_gridBatteries_MWh.setRange(minSliderGridBattery_MWh, maxSliderGridBattery_MWh);
+sl_gridBatteries_MWh.setValue(totalDefaultBatteryCapacity_MWh + minSliderGridBattery_MWh, false);
 
 //Curtailment large scale PV and wind
 boolean curtailment = true;
@@ -713,10 +755,9 @@ else if(productionEA.getEAType() == OL_EnergyAssetType.WINDMILL){
 } else {
     gr_pageIndicator.setVisible(true);
 }
+
 // Navigate to the first page
-if (!c_loadedPageGroups.isEmpty()) {
-    f_goToPage(0);
-}
+f_goToPage(0);
 /*ALCODEEND*/}
 
 double f_addCustomPage()
@@ -725,3 +766,558 @@ else if(productionEA.getEAType() == OL_EnergyAssetType.WINDMILL){
 //c_loadedPageGroups.add(gr_electricitySliders_custom);
 /*ALCODEEND*/}
 
+double f_updateCustomGCSolarfarmSettings()
+{/*ALCODESTART::1783088206556*/
+if (zero_Interface.c_selectedGridConnections.isEmpty()) {
+    return;
+}
+
+GridConnection selectedGC = zero_Interface.c_selectedGridConnections.get(0);
+if (!(selectedGC instanceof GCEnergyProduction) || !c_customSolarfarmGCs.contains(selectedGC)) {
+    return;
+}
+
+GCEnergyProduction gc = (GCEnergyProduction) selectedGC;
+J_EAProduction pvAsset = (J_EAProduction) gc.c_productionAssets.get(0);
+
+// Installed capacity per hectare
+double currentCapacity_kW = pvAsset.getCapacityElectric_kW();
+double area_m2 = gc.c_connectedGISObjects.get(0).gisRegion.area();
+double area_ha = area_m2 / 10000.0;
+double currentCapacity_kWpha = currentCapacity_kW / area_ha;
+
+sl_customGCSolarfarmInstalledCapacity_kWpha.setRange((int)(0.8*zero_Interface.energyModel.avgc_data.p_avgSolarFieldPower_kWppha), (int)(1.2*zero_Interface.energyModel.avgc_data.p_avgSolarFieldPower_kWppha));
+sl_customGCSolarfarmInstalledCapacity_kWpha.setValue(currentCapacity_kWpha, false);
+
+// PV Orientation
+J_ProfilePointer currentProfile = pvAsset.getProfilePointer();
+String currentOrientationLabel = "Zuid (15°)"; // Default
+if (currentProfile == zero_Interface.energyModel.pp_PVProduction15DegEastWest_fr) {
+    currentOrientationLabel = "Oost/West (35°)";
+}
+cb_customGCSolarfarmPVOrientation.setValue(currentOrientationLabel, false);
+
+// Curtailment
+boolean hasCurtailment = gc.f_isAssetManagementActive(I_CurtailManagement.class);
+cb_customGCSolarfarmCurtailment.setSelected(hasCurtailment, false);
+
+// Contracted capacity limit
+double maxContractedCapacity_kW = ceil(currentCapacity_kW / 10.0) * 10.0;
+
+sl_customGCSolarfarmContractedCapacity_kW.setRange(0, maxContractedCapacity_kW);
+sl_customGCSolarfarmContractedCapacity_kW.setValue(gc.v_liveConnectionMetaData.getContractedFeedinCapacity_kW(), false);
+
+/*ALCODEEND*/}
+
+double f_updateCustomGCWindfarmSettings()
+{/*ALCODESTART::1783088206569*/
+if (zero_Interface.c_selectedGridConnections.isEmpty()) { 
+    return;
+}
+
+GridConnection selectedGC = zero_Interface.c_selectedGridConnections.get(0);
+if (!(selectedGC instanceof GCEnergyProduction) || !c_customWindfarmGCs.contains(selectedGC)) {
+    return;
+}
+
+GCEnergyProduction gc = (GCEnergyProduction) selectedGC;
+J_EAProduction windAsset = (J_EAProduction) gc.c_productionAssets.get(0);
+
+// Installed capacity
+double currentCapacity_MW = windAsset.getCapacityElectric_kW()/1000;
+
+sl_customGCWindfarmInstalledCapacity_MW.setRange(0.1, zero_Interface.energyModel.avgc_data.p_largestWindTurbine_land_MW);
+sl_customGCWindfarmInstalledCapacity_MW.setValue(currentCapacity_MW, false); // false prevents triggering ActionCode
+
+// Curtailment
+boolean hasCurtailment = gc.f_isAssetManagementActive(I_CurtailManagement.class);
+cb_customGCWindfarmCurtailment.setSelected(hasCurtailment, false);
+
+// Contracted capacity limit
+double anylogicSliderBinaryFloatingPointErrorCompensation = 1E-10; // Anylogic sliders dont round to int, but floor the numbers, -> Due to floating point error Slider range doesnt become what it should be. -> Adding this fixes it.
+sl_customGCWindfarmContractedCapacity_MW.setRange(0, currentCapacity_MW + anylogicSliderBinaryFloatingPointErrorCompensation);
+sl_customGCWindfarmContractedCapacity_MW.setValue(gc.v_liveConnectionMetaData.getContractedFeedinCapacity_kW()/1000, false);
+/*ALCODEEND*/}
+
+double f_updateCustomGCGridBatterySettings()
+{/*ALCODESTART::1783088206581*/
+if (zero_Interface.c_selectedGridConnections.isEmpty()) {
+    return;
+}
+
+GridConnection selectedGC = zero_Interface.c_selectedGridConnections.get(0);
+if (!(selectedGC instanceof GCGridBattery) || !c_customGridBatteryGCs.contains(selectedGC)) {
+    return;
+}
+
+GCGridBattery gc = (GCGridBattery) selectedGC;
+J_EAStorageElectric batteryAsset = (J_EAStorageElectric)gc.c_storageAssets.get(0);
+
+// Installed capacity
+double currentCapacity_MWh = batteryAsset.getStorageCapacity_kWh() / 1000;
+double currentCapacity_MW = batteryAsset.getCapacityElectric_kW() / 1000;
+
+//Minimum of slider battery storage capacity has to be 0.2, to prevent bugs in charge capacity slider;
+double minSliderBatteryStorageCapacity_MWh = 0.2;
+double minSliderBatteryChargeCapacity_MW = minSliderBatteryStorageCapacity_MWh/zero_Interface.energyModel.avgc_data.p_avgRatioBatteryCapacity_v_Power/2; // -> Divided by two, cause otherwise, at storage capacity minimum, the charge slider can not slide -> anylogic error.
+double maxSliderBatteryStorageCapacity_MWh = 20;
+double anylogicSliderBinaryFloatingPointErrorCompensation = 1E-10; // Anylogic sliders dont round to int, but floor the numbers, -> Due to floating point error Slider range doesnt become what it should be. -> Adding this fixes it.
+
+sl_customGCGridBatteryInstalledCapacity_MWh.setRange(minSliderBatteryStorageCapacity_MWh, maxSliderBatteryStorageCapacity_MWh);
+sl_customGCGridBatteryInstalledCapacity_MWh.setValue(currentCapacity_MWh, false);
+
+sl_customGCGridBatteryInstalledCapacity_MW.setRange(minSliderBatteryChargeCapacity_MW, currentCapacity_MWh / zero_Interface.energyModel.avgc_data.p_avgRatioBatteryCapacity_v_Power + anylogicSliderBinaryFloatingPointErrorCompensation);
+sl_customGCGridBatteryInstalledCapacity_MW.setValue(currentCapacity_MW, false);
+
+// Battery management selection
+I_BatteryManagement currentBatteryManagement = gc.f_getBatteryManagement();
+String currentBMS_str = "Zelfverbruik"; // Default fallback
+
+if (currentBatteryManagement instanceof J_BatteryManagementSelfConsumptionGridNode) {
+    currentBMS_str = "Zelfverbruik";
+} else if (currentBatteryManagement instanceof J_BatteryManagementPeakShaving) {
+    currentBMS_str = "Peak shaving";
+} else if (currentBatteryManagement instanceof J_BatteryManagementPrice) {
+    currentBMS_str = "Prijssturing";
+}
+cb_customGCGridBatteryAlgorithm.setValue(currentBMS_str, false);
+/*ALCODEEND*/}
+
+double f_updateCustomGCSettings()
+{/*ALCODESTART::1783088235401*/
+boolean hasCustomGCSelected = false;
+ShapeGroup expectedPage = null;
+if (!zero_Interface.c_selectedGridConnections.isEmpty()) {
+    GridConnection selectedGC = zero_Interface.c_selectedGridConnections.get(0);
+    if (c_customSolarfarmGCs.contains(selectedGC)) {
+        hasCustomGCSelected = true;
+        expectedPage = gr_customGCSolarfarmSettings;
+        f_updateCustomGCSolarfarmSettings();
+    } else if (c_customWindfarmGCs.contains(selectedGC)) {
+        hasCustomGCSelected = true;
+        expectedPage = gr_customGCWindfarmSettings;
+        f_updateCustomGCWindfarmSettings();
+    } else if (c_customGridBatteryGCs.contains(selectedGC)) {
+        hasCustomGCSelected = true;
+        expectedPage = gr_customGCGridBatterySettings;
+        f_updateCustomGCGridBatterySettings();
+    }
+}
+boolean isExpectedPageLoaded = (expectedPage != null && c_loadedPageGroups.contains(expectedPage));
+boolean hasCustomPageLoaded = c_loadedPageGroups.contains(gr_customGCSolarfarmSettings) || 
+                              c_loadedPageGroups.contains(gr_customGCWindfarmSettings) || 
+                              c_loadedPageGroups.contains(gr_customGCGridBatterySettings);
+// Reinitialize pages only if selection transitioned into or out of a custom GC
+if ((hasCustomGCSelected && !isExpectedPageLoaded) || (!hasCustomGCSelected && hasCustomPageLoaded)) {
+    f_addCustomGCSettingsPage();
+}
+/*ALCODEEND*/}
+
+double f_addCustomSolarfarmGC(GridNode gn)
+{/*ALCODESTART::1783089962320*/
+v_customSolarfarmGCCounter++;
+String id = "Custom_Solarfarm_" + v_customSolarfarmGCCounter;
+
+// 1. Initialize GridConnection
+GridConnection solarpark = zero_Interface.energyModel.f_createGridConnectionDuringRuntime(GCEnergyProduction.class, id, zero_Interface.p_defaultMainSliderGCName_solarfarm, gn.p_gridNodeID, null);
+
+// 2. Create the GIS Object to calculate installed capacity
+GIS_Object area = f_createAndLinkGISObjectCustomGC(solarpark, id, OL_GISObjectType.SOLARFARM, zero_Interface.v_solarParkColor, zero_Interface.v_solarParkLineColor);
+double area_ha = area.gisRegion.area() / 10000;
+double installedCapacity_kW = area_ha * zero_Interface.energyModel.avgc_data.p_avgSolarFieldPower_kWppha;
+double maxContractedCapacity_kW = ceil(installedCapacity_kW / 10.0) * 10.0;
+
+// 3. Update GridConnection data
+solarpark.v_liveConnectionMetaData.setCapacities_kW(0.0, maxContractedCapacity_kW, maxContractedCapacity_kW);
+solarpark.v_liveConnectionMetaData.setCapacitiesKnown(true, true, true);
+solarpark.v_liveAssetsMetaData.PVOrientation = OL_PVOrientation.SOUTH;
+
+// 4. Create the energy asset
+J_EAProduction pvAsset = new J_EAProduction(solarpark, OL_EnergyAssetType.PHOTOVOLTAIC, "Custom PV", OL_EnergyCarriers.ELECTRICITY, installedCapacity_kW, zero_Interface.energyModel.p_timeParameters, zero_Interface.energyModel.pp_PVProduction35DegSouth_fr);
+
+// 6. Update collections, sliders and legend
+c_customSolarfarmGCs.add(solarpark);
+if (!zero_Interface.c_modelActiveSpecialGISObjects.contains(area.p_GISObjectType)) {
+    zero_Interface.c_modelActiveSpecialGISObjects.add(area.p_GISObjectType);
+}
+f_updateSliders_Electricity();
+zero_Interface.f_refreshLegend();
+
+// 7. Select the newly created asset immediately to update and set settings panel sliders
+ArrayList<GIS_Object> selectedList = new ArrayList<>();
+selectedList.add(area);
+zero_Interface.f_selectBuilding(area, selectedList);
+/*ALCODEEND*/}
+
+double f_removeCustomGC(GridConnection gc)
+{/*ALCODESTART::1783089962332*/
+gc.f_setActive(false, zero_Interface.energyModel.p_timeParameters, zero_Interface.energyModel.p_timeVariables);
+
+// 1. Remove energy assets
+for(J_EA ea : new ArrayList<>(gc.c_energyAssets)) {
+    ea.removeEnergyAsset();
+}
+
+// 2. Remove GIS Object
+OL_GISObjectType removedGISType = null;
+for (GIS_Object obj : new ArrayList<>(gc.c_connectedGISObjects)) {
+	removedGISType = obj.p_GISObjectType;
+    obj.gisRegion.setVisible(false);
+    zero_Interface.energyModel.remove_pop_GIS_Objects(obj);
+}
+
+// 3. Remove from collections
+zero_Interface.energyModel.c_pausedGridConnections.remove(gc);
+if (gc instanceof GCEnergyProduction) {
+	zero_Interface.energyModel.remove_EnergyProductionSites((GCEnergyProduction)gc);
+	if(c_customSolarfarmGCs.contains((GCEnergyProduction)gc)){
+		c_customSolarfarmGCs.remove(gc);
+	}
+	else if(c_customWindfarmGCs.contains((GCEnergyProduction)gc)){
+		c_customWindfarmGCs.remove(gc);
+	}
+} else if (gc instanceof GCGridBattery) {
+    zero_Interface.energyModel.remove_GridBatteries((GCGridBattery)gc);
+    c_customGridBatteryGCs.remove((GCGridBattery)gc);
+}
+
+// 4. Refresh slider + legend to account for changes
+if (removedGISType != null) {
+    boolean typeExists = false;
+    // Verify if any assets of this type still exist in the simulation
+    for (GIS_Object obj : zero_Interface.energyModel.pop_GIS_Objects) {
+        if (obj.p_GISObjectType == removedGISType && obj.gisRegion != null && obj.gisRegion.isVisible()) {
+            typeExists = true;
+            break;
+        }
+    }
+    if (!typeExists) {
+        zero_Interface.c_modelActiveSpecialGISObjects.remove(removedGISType);
+    }
+}
+
+f_updateSliders_Electricity();
+zero_Interface.f_refreshLegend();
+zero_Interface.f_clearSelectionAndSelectEnergyModel();
+/*ALCODEEND*/}
+
+double f_addCustomWindfarmGC(GridNode gn)
+{/*ALCODESTART::1783089962343*/
+v_customWindfarmGCCounter++;
+String id = "Custom_Windfarm_" + v_customWindfarmGCCounter;
+
+// 1. Initialize GridConnection
+GridConnection windpark = zero_Interface.energyModel.f_createGridConnectionDuringRuntime(GCEnergyProduction.class, id, zero_Interface.p_defaultMainSliderGCName_windfarm, gn.p_gridNodeID, null);
+
+// 2. Set capacity
+double defaultCapacity_kW = 1000;
+windpark.v_liveConnectionMetaData.setCapacities_kW(0.0, defaultCapacity_kW, defaultCapacity_kW);
+windpark.v_liveConnectionMetaData.setCapacitiesKnown(true, true, true);
+
+// 3. Create the Energy Asset
+J_EAProduction windAsset = new J_EAProduction(windpark, OL_EnergyAssetType.WINDMILL, "Custom Windpark", OL_EnergyCarriers.ELECTRICITY, defaultCapacity_kW, zero_Interface.energyModel.p_timeParameters, zero_Interface.energyModel.pp_windProduction_fr);
+
+// 4. Create the GIS Object
+GIS_Object area = f_createAndLinkGISObjectCustomGC(windpark, id, OL_GISObjectType.WINDFARM, zero_Interface.v_windFarmColor, zero_Interface.v_windFarmLineColor);
+
+// 5. Update collections, sliders and legend
+c_customWindfarmGCs.add(windpark);
+if (!zero_Interface.c_modelActiveSpecialGISObjects.contains(area.p_GISObjectType)) {
+    zero_Interface.c_modelActiveSpecialGISObjects.add(area.p_GISObjectType);
+}
+f_updateSliders_Electricity();
+zero_Interface.f_refreshLegend();
+
+// 6. Select the newly created asset immediately to update and set settings panel sliders
+ArrayList<GIS_Object> selectedList = new ArrayList<>();
+selectedList.add(area);
+zero_Interface.f_selectBuilding(area, selectedList);
+/*ALCODEEND*/}
+
+double f_addCustomGridBatteryGC(GridNode gn)
+{/*ALCODESTART::1783089962354*/
+v_customGridBatteryGCCounter++;
+String id = "Custom_Grid_Battery_" + v_customGridBatteryGCCounter;
+
+// 1. Initialize GridConnection
+GridConnection battery = zero_Interface.energyModel.f_createGridConnectionDuringRuntime(GCGridBattery.class, id, zero_Interface.p_defaultMainSliderGCName_battery, gn.p_gridNodeID, null);
+
+// 2. Set capacity
+double defaultCapacity_kW = 1000;
+double defaultStorageCapacity_kWh = zero_Interface.energyModel.avgc_data.p_avgRatioBatteryCapacity_v_Power*defaultCapacity_kW;
+battery.v_liveConnectionMetaData.setCapacities_kW(defaultCapacity_kW, defaultCapacity_kW, defaultCapacity_kW);
+battery.v_liveConnectionMetaData.setCapacitiesKnown(true, true, true);
+
+// 3. Create the energy asset + pick default operation mode management class
+J_EAStorageElectric batteryAsset = new J_EAStorageElectric(battery, defaultCapacity_kW, defaultStorageCapacity_kWh, 0.5, zero_Interface.energyModel.p_timeParameters);
+I_BatteryManagement batteryAlgorithm = new J_BatteryManagementSelfConsumptionGridNode(battery, zero_Interface.energyModel.p_timeParameters);
+battery.f_setBatteryManagement(batteryAlgorithm);
+		
+// 4. Create GIS Object 
+GIS_Object area = f_createAndLinkGISObjectCustomGC(battery, id, OL_GISObjectType.BATTERY, zero_Interface.v_batteryColor, zero_Interface.v_batteryLineColor);
+
+// 5. Update collections, sliders and legend
+c_customGridBatteryGCs.add(battery);
+if (!zero_Interface.c_modelActiveSpecialGISObjects.contains(area.p_GISObjectType)) {
+    zero_Interface.c_modelActiveSpecialGISObjects.add(area.p_GISObjectType);
+}
+f_updateSliders_Electricity();
+zero_Interface.f_refreshLegend();
+
+// 6. Select the newly created asset immediately to update and set settings panel sliders
+ArrayList<GIS_Object> selectedList = new ArrayList<>();
+selectedList.add(area);
+zero_Interface.f_selectBuilding(area, selectedList);
+/*ALCODEEND*/}
+
+GIS_Object f_createAndLinkGISObjectCustomGC(GridConnection gc,String id,OL_GISObjectType gisType,Color fillColor,Color lineColor)
+{/*ALCODESTART::1783089962365*/
+GIS_Object area = zero_Interface.energyModel.add_pop_GIS_Objects();
+area.p_id = id;
+area.p_GISObjectType = gisType;
+area.p_latitude = c_tempSavedPointCoordinatesCustomGC.get(0).getX();
+area.p_longitude = c_tempSavedPointCoordinatesCustomGC.get(0).getY();
+
+// 2. Generate coordinates (circular for windfarm, square for others) and assign to region
+double[] polyCoords;
+if (gisType == OL_GISObjectType.WINDFARM) {
+	double area_m2 = 1000; // Rule-of-Thumb windfarm: 1 hectare per 5 MW (5000 kW) capacity
+	polyCoords = GISUtil.calculateCircleCoordinates(area.p_latitude, area.p_longitude, area_m2);
+	area.p_annotation = "Windpark " + v_customWindfarmGCCounter;
+} else if (gisType == OL_GISObjectType.BATTERY) {
+	double area_m2 = 400; // Rule-of-Thumb grid battery: 1 hectare per 100 MWh storage capacity (100 m2 per MWh)
+	polyCoords = GISUtil.calculateSquareCoordinates(area.p_latitude, area.p_longitude, area_m2);
+	area.p_annotation = "Buurtbatterij " + v_customGridBatteryGCCounter;
+} else {
+	polyCoords = GISUtil.convertCoordinatePointsToLatLonArray(c_tempSavedPointCoordinatesCustomGC);
+	area.p_annotation = "Zonnepark " + v_customSolarfarmGCCounter;
+}
+area.gisRegion = zero_Interface.f_createGISObject(polyCoords);
+
+// 3. Add to collections
+area.c_containedGridConnections.add(gc);
+gc.c_connectedGISObjects.add(area);
+
+// 4. Apply styling
+area.p_defaultFillColor = fillColor;
+area.p_defaultLineColor = lineColor;
+area.p_defaultLineWidth = zero_Interface.v_energyAssetLineWidth;
+zero_Interface.f_styleAreas(area);
+
+return area;
+/*ALCODEEND*/}
+
+double f_addCustomGCLocationSelection(double clickx,double clicky)
+{/*ALCODESTART::1783089962376*/
+// --- PHASE 1: Drawing Polygon Vertices ---
+
+// Add a vertex to the coordinates list
+Point clickedCoord = new Point(clickx, clicky);
+c_tempSavedPointCoordinatesCustomGC.add(clickedCoord);
+
+// Place a small square dot on the map representing this vertex
+double[] polyCoords = GISUtil.calculateSquareCoordinates(clickx, clicky, 25);
+GISRegion dot = zero_Interface.f_createGISObject(polyCoords);
+dot.setFillColor(Color.RED);
+dot.setLineColor(Color.WHITE);
+dot.setLineWidth(1.0);
+c_tempSavedDotGISRegionsCustomGC.add(dot);
+
+if (v_addCustomGCType == OL_EnergyAssetType.WINDMILL || v_addCustomGCType == OL_EnergyAssetType.STORAGE_ELECTRIC){
+	b_customGCPolygonCreated = true;
+	zero_Interface.f_setForcedClickScreenMessageText("Kies een trafo op de kaart");
+} else {
+	// Update instruction text
+	int minNbRequiredVertices = 3;
+	int currentNbOfSavedCoordinates = c_tempSavedPointCoordinatesCustomGC.size();
+	if(minNbRequiredVertices - currentNbOfSavedCoordinates > 1){
+		zero_Interface.f_setForcedClickScreenMessageText("Teken je locatie op de kaart. Kies nog minimaal " + (minNbRequiredVertices - currentNbOfSavedCoordinates) + " hoekpunten.");
+	}
+	else if(minNbRequiredVertices - currentNbOfSavedCoordinates == 1){
+		zero_Interface.f_setForcedClickScreenMessageText("Teken je locatie op de kaart. Kies nog minimaal " + (minNbRequiredVertices - currentNbOfSavedCoordinates) + " hoekpunt.");
+	} else {
+		if (previewGISRegionCustomGC != null) {
+	        previewGISRegionCustomGC.remove();
+	    }
+	    double[] previewCoords = GISUtil.convertCoordinatePointsToLatLonArray(c_tempSavedPointCoordinatesCustomGC);
+	    previewGISRegionCustomGC = zero_Interface.f_createGISObject(previewCoords);
+	    previewGISRegionCustomGC.setFillColor(new Color(255, 0, 0, 50)); // Semi-transparent red
+	    previewGISRegionCustomGC.setLineColor(Color.RED);
+	    previewGISRegionCustomGC.setLineWidth(1.0);
+		zero_Interface.f_setForcedClickScreenMessageText("Huidig aantal hoekpunten: " + currentNbOfSavedCoordinates + ". Klik op 'Voltooien' om te bevestigen.");
+	}
+}
+
+zero_Interface.f_deselectPreviousSelect();
+/*ALCODEEND*/}
+
+double f_addCustomGCTransformerSelection(double clickx,double clicky)
+{/*ALCODESTART::1783089962387*/
+// --- PHASE 2: Choose transformer to connect to ---
+GridNode clickedGN = null;
+for (GridNode GN : zero_Interface.energyModel.pop_gridNodes) {
+    if (GN.gisRegion != null && GN.gisRegion.contains(clickx, clicky) && GN.gisRegion.isVisible()) {
+        clickedGN = GN;
+        break;
+    }
+}
+
+if (clickedGN != null) {    
+	if (v_addCustomGCType == OL_EnergyAssetType.PHOTOVOLTAIC){
+    	f_addCustomSolarfarmGC(clickedGN);
+    } else if (v_addCustomGCType == OL_EnergyAssetType.WINDMILL){
+    	f_addCustomWindfarmGC(clickedGN);
+    } else if (v_addCustomGCType == OL_EnergyAssetType.STORAGE_ELECTRIC){
+    	f_addCustomGridBatteryGC(clickedGN);
+    }
+    // Clean up coordinate temporary dots, state variables, lists
+    f_stopCustomGCCreation();
+    
+    if (!zero_Interface.b_runningMainInterfaceScenarios) zero_Interface.f_setScenarioToCustom();
+	zero_Interface.f_resetSettings();
+}
+/*ALCODEEND*/}
+
+double f_removeCustomGCSelection(double clickx,double clicky)
+{/*ALCODESTART::1783089962397*/
+// Group all GIS objects to check for the click
+List<GIS_Object> allGISObjects = new ArrayList<>();
+for(GIS_Building b : zero_Interface.energyModel.pop_GIS_Buildings) {
+	allGISObjects.add(b);
+}
+for(GIS_Object object : zero_Interface.energyModel.pop_GIS_Objects){
+	allGISObjects.add(object);
+}
+for (GIS_Object GISObject : allGISObjects) {
+    if (GISObject.gisRegion != null && GISObject.gisRegion.contains(clickx, clicky) && GISObject.gisRegion.isVisible()) {
+        if (GISObject.c_containedGridConnections.size() > 0) {
+            GridConnection gc = GISObject.c_containedGridConnections.get(0);
+            // Only allow deletion of custom created GCs
+            if (c_customSolarfarmGCs.contains(gc) || c_customWindfarmGCs.contains(gc) || c_customGridBatteryGCs.contains(gc)) {
+                f_removeCustomGC(gc);
+                f_stopCustomGCCreation();
+                return;
+            }
+        }
+    }
+}
+// If the user clicks elsewhere, cancel the deletion mode
+f_stopCustomGCCreation();
+/*ALCODEEND*/}
+
+double f_stopCustomGCCreation()
+{/*ALCODESTART::1783089962419*/
+// Clean up temporary dot markers, preview polygon, and coordinates list
+f_resetCustomGCCreation();
+
+// Reset state variables
+b_customGCPolygonCreated = false;
+b_addCustomGC = false;
+v_addCustomGCType = null;
+b_removeCustomGC = false;
+
+// Hide forced click screen, if needed
+zero_Interface.f_setForcedClickScreenVisibility(false);
+zero_Interface.f_setForcedClickScreenTextBoxes("", new Color(255, 255, 255), new Color(0, 0, 0), "", new Color(255, 255, 255), new Color(0, 0, 0));
+/*ALCODEEND*/}
+
+double f_resetCustomGCCreation()
+{/*ALCODESTART::1783089962430*/
+// Clean up temporary dot markers
+for (GISRegion dot : c_tempSavedDotGISRegionsCustomGC) {
+    if (dot != null) {
+        dot.remove();
+    }
+}
+c_tempSavedDotGISRegionsCustomGC.clear();
+
+// Clean up preview polygon
+if (previewGISRegionCustomGC != null) {
+    previewGISRegionCustomGC.remove();
+    previewGISRegionCustomGC = null;
+}
+
+// Clear coordinates list
+c_tempSavedPointCoordinatesCustomGC.clear();
+/*ALCODEEND*/}
+
+double f_addCustomGCSettingsPage()
+{/*ALCODESTART::1783101013511*/
+// Identify the active page group before removing custom settings pages
+ShapeGroup activePageGroup = null;
+if (v_currentPageIndex >= 0 && v_currentPageIndex < c_loadedPageGroups.size()) {
+    activePageGroup = c_loadedPageGroups.get(v_currentPageIndex);
+}
+
+// Hide custom settings pages by default so they are not visible when deselected
+gr_customGCSolarfarmSettings.setVisible(false);
+gr_customGCWindfarmSettings.setVisible(false);
+gr_customGCGridBatterySettings.setVisible(false);
+c_loadedPageGroups.remove(gr_customGCSolarfarmSettings);
+c_loadedPageGroups.remove(gr_customGCWindfarmSettings);
+c_loadedPageGroups.remove(gr_customGCGridBatterySettings);
+
+boolean customGCAdded = false;
+int targetPage = 0;
+if (!zero_Interface.c_selectedGridConnections.isEmpty()) {
+    GridConnection selectedGC = zero_Interface.c_selectedGridConnections.get(0);
+    if (c_customSolarfarmGCs.contains(selectedGC)) {
+        c_loadedPageGroups.add(gr_customGCSolarfarmSettings);
+        targetPage = c_loadedPageGroups.indexOf(gr_customGCSolarfarmSettings);
+        customGCAdded = true;
+    } else if (c_customWindfarmGCs.contains(selectedGC)) {
+        c_loadedPageGroups.add(gr_customGCWindfarmSettings);
+        targetPage = c_loadedPageGroups.indexOf(gr_customGCWindfarmSettings);
+        customGCAdded = true;
+    } else if (c_customGridBatteryGCs.contains(selectedGC)) {
+        c_loadedPageGroups.add(gr_customGCGridBatterySettings);
+        targetPage = c_loadedPageGroups.indexOf(gr_customGCGridBatterySettings);
+        customGCAdded = true;
+    }
+}
+
+// Show/hide page indicator based on number of active pages
+if (c_loadedPageGroups.size() <= 1) {
+    gr_pageIndicator.setVisible(false);
+} else {
+    gr_pageIndicator.setVisible(true);
+}
+
+// Navigate to the correct page: the selected custom settings page, stay on the current page, or go to previous/default page
+if (customGCAdded) { // Custom GC is selected
+	zero_Interface.uI_Tabs.f_setTab(OL_CustomScenarioTabs.ELECTRICITY);
+    f_goToPage(targetPage);
+} else { // Custom GC is deselected
+    int newPageIndex = -1;
+    if (activePageGroup != null) {
+        newPageIndex = c_loadedPageGroups.indexOf(activePageGroup);
+    }
+    
+    if (newPageIndex >= 0) { // Stay on the current page
+        f_goToPage(newPageIndex);
+    } else { // Go to previously shown page if settings page was currently shown 
+        int fallbackPageIndex = 0;
+        if (v_previousPageIndex >= 0 && v_previousPageIndex < c_loadedPageGroups.size()) {
+        	ShapeGroup prevGroup = c_loadedPageGroups.get(v_previousPageIndex);
+            if (prevGroup != gr_customGCSolarfarmSettings && prevGroup != gr_customGCWindfarmSettings && prevGroup != gr_customGCGridBatterySettings) {
+                fallbackPageIndex = v_previousPageIndex;
+            }
+        }
+        f_goToPage(fallbackPageIndex);
+    }
+}
+/*ALCODEEND*/}
+
+double f_deleteAllCustomGCs()
+{/*ALCODESTART::1783676210934*/
+while (!c_customSolarfarmGCs.isEmpty()) {
+	f_removeCustomGC(c_customSolarfarmGCs.get(0));
+}
+while (!c_customWindfarmGCs.isEmpty()) {
+	f_removeCustomGC(c_customWindfarmGCs.get(0));
+}
+while (!c_customGridBatteryGCs.isEmpty()) {
+	f_removeCustomGC(c_customGridBatteryGCs.get(0));
+}
+/*ALCODEEND*/}
+
diff --git a/_alp/Agents/tabElectricity/Code/Functions.xml b/_alp/Agents/tabElectricity/Code/Functions.xml
index 50ab0e9e..27e5d4e1 100644
--- a/_alp/Agents/tabElectricity/Code/Functions.xml
+++ b/_alp/Agents/tabElectricity/Code/Functions.xml
@@ -105,7 +105,7 @@
 		<ReturnModificator>VOID</ReturnModificator>
 		<ReturnType>double</ReturnType>
 		<Id>1745483988251</Id>
-		<Name><![CDATA[f_getCurrentPVOnLandAndWindturbineValues]]></Name>
+		<Name><![CDATA[f_getInitialPVOnLandAndWindturbineValues]]></Name>
 		<X>30</X>
 		<Y>1250</Y>
 		<Label>
@@ -315,7 +315,7 @@
 		<Id>1754926103683</Id>
 		<Name><![CDATA[f_updateSliders_Electricity]]></Name>
 		<X>-350</X>
-		<Y>290</Y>
+		<Y>330</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -331,7 +331,7 @@
 		<Id>1754926103687</Id>
 		<Name><![CDATA[f_updateElectricitySliders_households]]></Name>
 		<X>-330</X>
-		<Y>310</Y>
+		<Y>350</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -347,7 +347,7 @@
 		<Id>1754926103689</Id>
 		<Name><![CDATA[f_updateElectricitySliders_companies]]></Name>
 		<X>-330</X>
-		<Y>330</Y>
+		<Y>370</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -363,7 +363,7 @@
 		<Id>1754926103691</Id>
 		<Name><![CDATA[f_updateElectricitySliders_custom]]></Name>
 		<X>-330</X>
-		<Y>370</Y>
+		<Y>410</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -421,7 +421,7 @@
 		<ReturnModificator>VOID</ReturnModificator>
 		<ReturnType>double</ReturnType>
 		<Id>1765276703854</Id>
-		<Name><![CDATA[f_getCurrentGridBatterySize]]></Name>
+		<Name><![CDATA[f_getInitialGridBatterySize]]></Name>
 		<X>30</X>
 		<Y>1320</Y>
 		<Label>
@@ -463,7 +463,7 @@
 		<Id>1777552836057</Id>
 		<Name><![CDATA[f_goToPage]]></Name>
 		<X>-330</X>
-		<Y>190</Y>
+		<Y>220</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -483,7 +483,7 @@
 		<Id>1777552936318</Id>
 		<Name><![CDATA[f_nextPage]]></Name>
 		<X>-330</X>
-		<Y>210</Y>
+		<Y>240</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -499,7 +499,7 @@
 		<Id>1777553025667</Id>
 		<Name><![CDATA[f_previousPage]]></Name>
 		<X>-330</X>
-		<Y>230</Y>
+		<Y>260</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -515,7 +515,7 @@
 		<Id>1777553071510</Id>
 		<Name><![CDATA[f_updatePageIndicator]]></Name>
 		<X>-330</X>
-		<Y>250</Y>
+		<Y>280</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -531,7 +531,7 @@
 		<Id>1777579296267</Id>
 		<Name><![CDATA[f_updateElectricitySliders_collective]]></Name>
 		<X>-330</X>
-		<Y>350</Y>
+		<Y>390</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -547,7 +547,7 @@
 		<Id>1777985169528</Id>
 		<Name><![CDATA[f_initializeElectricityPages]]></Name>
 		<X>-350</X>
-		<Y>150</Y>
+		<Y>180</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -563,7 +563,323 @@
 		<Id>1778055837807</Id>
 		<Name><![CDATA[f_addCustomPage]]></Name>
 		<X>-330</X>
-		<Y>170</Y>
+		<Y>200</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1783088206556</Id>
+		<Name><![CDATA[f_updateCustomGCSolarfarmSettings]]></Name>
+		<X>-780</X>
+		<Y>590</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>1783088206569</Id>
+		<Name><![CDATA[f_updateCustomGCWindfarmSettings]]></Name>
+		<X>-780</X>
+		<Y>610</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>1783088206581</Id>
+		<Name><![CDATA[f_updateCustomGCGridBatterySettings]]></Name>
+		<X>-780</X>
+		<Y>630</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>1783088235401</Id>
+		<Name><![CDATA[f_updateCustomGCSettings]]></Name>
+		<X>-800</X>
+		<Y>570</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>1783089962320</Id>
+		<Name><![CDATA[f_addCustomSolarfarmGC]]></Name>
+		<X>-780</X>
+		<Y>400</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gn]]></Name>
+			<Type><![CDATA[GridNode]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1783089962332</Id>
+		<Name><![CDATA[f_removeCustomGC]]></Name>
+		<X>-780</X>
+		<Y>540</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gc]]></Name>
+			<Type><![CDATA[GridConnection]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1783089962343</Id>
+		<Name><![CDATA[f_addCustomWindfarmGC]]></Name>
+		<X>-780</X>
+		<Y>420</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gn]]></Name>
+			<Type><![CDATA[GridNode]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1783089962354</Id>
+		<Name><![CDATA[f_addCustomGridBatteryGC]]></Name>
+		<X>-780</X>
+		<Y>440</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gn]]></Name>
+			<Type><![CDATA[GridNode]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
+		<ReturnType>GIS_Object</ReturnType>
+		<Id>1783089962365</Id>
+		<Name><![CDATA[f_createAndLinkGISObjectCustomGC]]></Name>
+		<X>-760</X>
+		<Y>460</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gc]]></Name>
+			<Type><![CDATA[GridConnection]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[id]]></Name>
+			<Type><![CDATA[String]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[gisType]]></Name>
+			<Type><![CDATA[OL_GISObjectType]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[fillColor]]></Name>
+			<Type><![CDATA[Color]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[lineColor]]></Name>
+			<Type><![CDATA[Color]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1783089962376</Id>
+		<Name><![CDATA[f_addCustomGCLocationSelection]]></Name>
+		<X>-800</X>
+		<Y>300</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[clickx]]></Name>
+			<Type><![CDATA[double]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[clicky]]></Name>
+			<Type><![CDATA[double]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1783089962387</Id>
+		<Name><![CDATA[f_addCustomGCTransformerSelection]]></Name>
+		<X>-800</X>
+		<Y>380</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[clickx]]></Name>
+			<Type><![CDATA[double]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[clicky]]></Name>
+			<Type><![CDATA[double]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1783089962397</Id>
+		<Name><![CDATA[f_removeCustomGCSelection]]></Name>
+		<X>-800</X>
+		<Y>520</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[clickx]]></Name>
+			<Type><![CDATA[double]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[clicky]]></Name>
+			<Type><![CDATA[double]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1783089962419</Id>
+		<Name><![CDATA[f_stopCustomGCCreation]]></Name>
+		<X>-800</X>
+		<Y>480</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>1783089962430</Id>
+		<Name><![CDATA[f_resetCustomGCCreation]]></Name>
+		<X>-780</X>
+		<Y>500</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="protected" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1783101013511</Id>
+		<Name><![CDATA[f_addCustomGCSettingsPage]]></Name>
+		<X>-800</X>
+		<Y>660</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>1783676210934</Id>
+		<Name><![CDATA[f_deleteAllCustomGCs]]></Name>
+		<X>-800</X>
+		<Y>690</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
diff --git a/_alp/Agents/tabElectricity/Levels/Level.level.xml b/_alp/Agents/tabElectricity/Levels/Level.level.xml
index 459ba8d9..eafa6d7c 100644
--- a/_alp/Agents/tabElectricity/Levels/Level.level.xml
+++ b/_alp/Agents/tabElectricity/Levels/Level.level.xml
@@ -1,5 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Presentation>
+	<Rectangle>
+		<Id>1783113239411</Id>
+		<Name><![CDATA[rect_customGCFunctions]]></Name>
+		<X>-850</X>
+		<Y>0</Y>
+		<Label>
+			<X>10</X>
+			<Y>10</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>3</LineWidth>
+		<LineColor>-16777216</LineColor>
+		<LineMaterial>null</LineMaterial>
+		<LineStyle>SOLID</LineStyle>
+		<Width>400</Width>
+		<Height>750</Height>
+		<Rotation>0.0</Rotation>
+		<FillColor>-1</FillColor>
+		<FillMaterial>null</FillMaterial>
+	</Rectangle>
 	<Rectangle>
 		<Id>1722349953637</Id>
 		<Name><![CDATA[rect_genericFunctions]]></Name>
@@ -1634,9 +1660,9 @@ zero_Interface.f_setSelectedGNText();
 			<Control Type="Slider">
 				<EmbeddedIcon>false</EmbeddedIcon>
 				<Id>1750063382243</Id>
-				<Name><![CDATA[sl_gridBatteries_kWh]]></Name>
+				<Name><![CDATA[sl_gridBatteries_MWh]]></Name>
 				<X>260</X>
-				<Y>115</Y>
+				<Y>135</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -1655,18 +1681,19 @@ for(GridConnection gc : c_electricityTabEASliderGCs){
 	}
 }
 
-if(gcListGridBatteries.size() == 0){
-	throw new IllegalStateException("Model does not contain any GCGridBattery agent");
+double totalCustomBatteryCapacity_MWh = 0;
+for(GridConnection customGB : c_customGridBatteryGCs){
+	if(customGB.v_isActive &amp;&amp; customGB.p_batteryAsset != null){
+		totalCustomBatteryCapacity_MWh += customGB.p_batteryAsset.getStorageCapacity_kWh()/1000;
+	}
 }
 
-f_setGridBatteries(sl_gridBatteries_kWh.getValue(), gcListGridBatteries);</ActionCode>
+f_setGridBatteries((sl_gridBatteries_MWh.getValue() - totalCustomBatteryCapacity_MWh - p_initialTotalGridBatteryCapacity_MWh)*1000.0, gcListGridBatteries);</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
 					<Orientation>HORIZONTAL</Orientation>
-					<MinValue>0</MinValue>
-					<MaxValue>1000</MaxValue>
-					<Step>10</Step>
+					<Step>0.1</Step>
 					<LinkTo>false</LinkTo>
 				</ExtendedProperties>
 			</Control>
@@ -1674,7 +1701,7 @@ f_setGridBatteries(sl_gridBatteries_kWh.getValue(), gcListGridBatteries);</Actio
 				<Id>1750063382245</Id>
 				<Name><![CDATA[txt_gridBatteriesDescription]]></Name>
 				<X>20</X>
-				<Y>120</Y>
+				<Y>140</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -1683,12 +1710,12 @@ f_setGridBatteries(sl_gridBatteries_kWh.getValue(), gcListGridBatteries);</Actio
 				<PresentationFlag>true</PresentationFlag>
 				<ShowLabel>false</ShowLabel>
 				<DrawMode>SHAPE_DRAW_2D</DrawMode>
-				<VisibleCode>sl_gridBatteries_kWh.isVisible()</VisibleCode>
+				<VisibleCode>sl_gridBatteries_MWh.isVisible()</VisibleCode>
 				<EmbeddedIcon>false</EmbeddedIcon>
 				<Z>0</Z>
 				<Rotation>0.0</Rotation>
 				<Color>-16777216</Color>
-				<Text><![CDATA[Trafo batterij capaciteit]]></Text>
+				<Text><![CDATA[Buurtbatterij capaciteit]]></Text>
 				<Font>
 					<Name><![CDATA[Dialog]]></Name>
 					<Size>12</Size>
@@ -1698,9 +1725,9 @@ f_setGridBatteries(sl_gridBatteries_kWh.getValue(), gcListGridBatteries);</Actio
 			</Text>
 			<Text>
 				<Id>1750063382247</Id>
-				<Name><![CDATA[txt_gridBatteries_kWh]]></Name>
+				<Name><![CDATA[txt_gridBatteries_MWh]]></Name>
 				<X>245</X>
-				<Y>120</Y>
+				<Y>140</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -1709,13 +1736,13 @@ f_setGridBatteries(sl_gridBatteries_kWh.getValue(), gcListGridBatteries);</Actio
 				<PresentationFlag>true</PresentationFlag>
 				<ShowLabel>false</ShowLabel>
 				<DrawMode>SHAPE_DRAW_2D</DrawMode>
-				<VisibleCode>sl_gridBatteries_kWh.isVisible()</VisibleCode>
+				<VisibleCode>sl_gridBatteries_MWh.isVisible()</VisibleCode>
 				<EmbeddedIcon>false</EmbeddedIcon>
 				<Z>0</Z>
 				<Rotation>0.0</Rotation>
 				<Color>-16777216</Color>
-				<Text><![CDATA[0 kWh]]></Text>
-				<TextCode>sl_gridBatteries_kWh.getIntValue() + " kWh"</TextCode>
+				<Text><![CDATA[0 MWh]]></Text>
+				<TextCode>sl_gridBatteries_MWh.getValue() + " MWh"</TextCode>
 				<Font>
 					<Name><![CDATA[Dialog]]></Name>
 					<Size>12</Size>
@@ -1727,7 +1754,7 @@ f_setGridBatteries(sl_gridBatteries_kWh.getValue(), gcListGridBatteries);</Actio
 				<Id>1752232850473</Id>
 				<Name><![CDATA[i_gridBatteries]]></Name>
 				<X>165</X>
-				<Y>118</Y>
+				<Y>138</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -1736,7 +1763,7 @@ f_setGridBatteries(sl_gridBatteries_kWh.getValue(), gcListGridBatteries);</Actio
 				<PresentationFlag>true</PresentationFlag>
 				<ShowLabel>false</ShowLabel>
 				<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
-				<VisibleCode>sl_gridBatteries_kWh.isVisible()</VisibleCode>
+				<VisibleCode>sl_gridBatteries_MWh.isVisible()</VisibleCode>
 				<OnClickCode>zero_Interface.f_setInfoText(i_gridBatteries, zero_Interface.v_infoText.gridBattery_residential, i_gridBatteries.getX() + uI_Tabs.v_presentationXOffset, i_gridBatteries.getY() + uI_Tabs.v_presentationYOffset);</OnClickCode>
 				<EmbeddedIcon>false</EmbeddedIcon>
 				<Z>0</Z>
@@ -1755,7 +1782,7 @@ f_setGridBatteries(sl_gridBatteries_kWh.getValue(), gcListGridBatteries);</Actio
 				<Id>1770118893494</Id>
 				<Name><![CDATA[txt_largeScalePV_ha]]></Name>
 				<X>245</X>
-				<Y>60</Y>
+				<Y>80</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -1769,7 +1796,7 @@ f_setGridBatteries(sl_gridBatteries_kWh.getValue(), gcListGridBatteries);</Actio
 				<Rotation>0.0</Rotation>
 				<Color>-16777216</Color>
 				<Text><![CDATA[0 ha]]></Text>
-				<TextCode>sl_largeScalePV_ha.getValue() + " ha"</TextCode>
+				<TextCode>(round(sl_largeScalePV_ha.getValue() * 10.0) / 10.0) + " ha"</TextCode>
 				<Font>
 					<Name><![CDATA[Dialog]]></Name>
 					<Size>12</Size>
@@ -1782,7 +1809,7 @@ f_setGridBatteries(sl_gridBatteries_kWh.getValue(), gcListGridBatteries);</Actio
 				<Id>1770118893505</Id>
 				<Name><![CDATA[sl_largeScalePV_ha]]></Name>
 				<X>260</X>
-				<Y>55</Y>
+				<Y>75</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -1794,7 +1821,8 @@ f_setGridBatteries(sl_gridBatteries_kWh.getValue(), gcListGridBatteries);</Actio
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>List&lt;GCEnergyProduction&gt; sliderPVFarmGCList = new ArrayList&lt;&gt;();
+					<ActionCode>// 1. Construct list containing ONLY the default global solarfarms (excluding custom ones)
+List&lt;GCEnergyProduction&gt; sliderPVFarmGCList = new ArrayList&lt;&gt;();
 for(GridConnection gc : c_electricityTabEASliderGCs){
 	if(gc instanceof GCEnergyProduction energyProductionSite){
 		for(J_EAProduction j_ea : energyProductionSite.c_productionAssets) {
@@ -1810,14 +1838,23 @@ if(sliderPVFarmGCList.size() == 0){
 	throw new IllegalStateException("Model does not contain any PVFarmSliderGC agent");
 }
 
+// 2. Calculate sum of active custom solarfarms capacity
+double totalCustomPVOnLand_kW = 0;
+for(GridConnection customSF : c_customSolarfarmGCs){
+    if(customSF.v_isActive){
+        for(J_EAProduction ea : customSF.c_productionAssets){
+            if(ea.getEAType() == OL_EnergyAssetType.PHOTOVOLTAIC){
+                totalCustomPVOnLand_kW += ea.getCapacityElectric_kW();
+            }
+        }
+    }
+}
 
-f_setPVOnLand(sl_largeScalePV_ha.getValue() - p_currentPVOnLand_ha, sliderPVFarmGCList);</ActionCode>
+f_setPVOnLand(sl_largeScalePV_ha.getValue() - p_initialPVOnLand_ha - totalCustomPVOnLand_kW/zero_Interface.energyModel.avgc_data.p_avgSolarFieldPower_kWppha, sliderPVFarmGCList);</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
 					<Orientation>HORIZONTAL</Orientation>
-					<MinValue>p_currentPVOnLand_ha</MinValue>
-					<MaxValue>p_currentPVOnLand_ha + 50</MaxValue>
 					<Step>0.1</Step>
 					<LinkTo>false</LinkTo>
 				</ExtendedProperties>
@@ -1826,7 +1863,7 @@ f_setPVOnLand(sl_largeScalePV_ha.getValue() - p_currentPVOnLand_ha, sliderPVFarm
 				<Id>1770118893516</Id>
 				<Name><![CDATA[txt_largeScalePVDescription]]></Name>
 				<X>20</X>
-				<Y>60</Y>
+				<Y>80</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -1852,7 +1889,7 @@ f_setPVOnLand(sl_largeScalePV_ha.getValue() - p_currentPVOnLand_ha, sliderPVFarm
 				<Id>1770118893524</Id>
 				<Name><![CDATA[sl_largeScaleWind_MW]]></Name>
 				<X>260</X>
-				<Y>85</Y>
+				<Y>105</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -1864,7 +1901,8 @@ f_setPVOnLand(sl_largeScalePV_ha.getValue() - p_currentPVOnLand_ha, sliderPVFarm
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>List&lt;GCEnergyProduction&gt; sliderWindFarmGCList = new ArrayList&lt;&gt;();
+					<ActionCode>// 1. Construct list containing ONLY the default global windfarms (excluding custom ones)
+List&lt;GCEnergyProduction&gt; sliderWindFarmGCList = new ArrayList&lt;&gt;();
 for(GridConnection gc : c_electricityTabEASliderGCs){
 	if(gc instanceof GCEnergyProduction energyProductionSite){
 		for(J_EAProduction j_ea : energyProductionSite.c_productionAssets) {
@@ -1880,13 +1918,23 @@ if(sliderWindFarmGCList.size() == 0){
 	throw new IllegalStateException("Model does not contain any sliderWindFarmGC agent");
 }
 
-f_setWindTurbines( sl_largeScaleWind_MW.getValue() - p_currentWindTurbines_MW, sliderWindFarmGCList);</ActionCode>
+// 2. Calculate sum of active custom solarfarms capacity
+double totalCustomWind_kW = 0;
+for(GridConnection customWF : c_customWindfarmGCs){
+    if(customWF.v_isActive){
+        for(J_EAProduction ea : customWF.c_productionAssets){
+            if(ea.getEAType() == OL_EnergyAssetType.WINDMILL){
+                totalCustomWind_kW += ea.getCapacityElectric_kW();
+            }
+        }
+    }
+}
+
+f_setWindTurbines( sl_largeScaleWind_MW.getValue() - p_initialWindTurbines_MW - totalCustomWind_kW/1000, sliderWindFarmGCList);</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
 					<Orientation>HORIZONTAL</Orientation>
-					<MinValue>p_currentWindTurbines_MW</MinValue>
-					<MaxValue>p_currentWindTurbines_MW + 10</MaxValue>
 					<Step>0.1</Step>
 					<LinkTo>false</LinkTo>
 				</ExtendedProperties>
@@ -1895,7 +1943,7 @@ f_setWindTurbines( sl_largeScaleWind_MW.getValue() - p_currentWindTurbines_MW, s
 				<Id>1770118893533</Id>
 				<Name><![CDATA[txt_largeScaleWindDescription]]></Name>
 				<X>20</X>
-				<Y>90</Y>
+				<Y>110</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -1920,7 +1968,7 @@ f_setWindTurbines( sl_largeScaleWind_MW.getValue() - p_currentWindTurbines_MW, s
 				<Id>1770118893541</Id>
 				<Name><![CDATA[txt_largeScaleWind_MW]]></Name>
 				<X>245</X>
-				<Y>90</Y>
+				<Y>110</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -1946,7 +1994,7 @@ f_setWindTurbines( sl_largeScaleWind_MW.getValue() - p_currentWindTurbines_MW, s
 				<Id>1770118893549</Id>
 				<Name><![CDATA[i_largeScalePV]]></Name>
 				<X>165</X>
-				<Y>58</Y>
+				<Y>78</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -1973,7 +2021,7 @@ f_setWindTurbines( sl_largeScaleWind_MW.getValue() - p_currentWindTurbines_MW, s
 				<Id>1770118893567</Id>
 				<Name><![CDATA[i_largeScaleWind]]></Name>
 				<X>165</X>
-				<Y>88</Y>
+				<Y>108</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -2000,7 +2048,7 @@ f_setWindTurbines( sl_largeScaleWind_MW.getValue() - p_currentWindTurbines_MW, s
 				<Id>1777620991223</Id>
 				<Name><![CDATA[txt_gridCurtailmentDescription]]></Name>
 				<X>20</X>
-				<Y>150</Y>
+				<Y>170</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -2026,7 +2074,7 @@ f_setWindTurbines( sl_largeScaleWind_MW.getValue() - p_currentWindTurbines_MW, s
 				<Id>1777620991268</Id>
 				<Name><![CDATA[cb_gridCurtailment]]></Name>
 				<X>302</X>
-				<Y>142</Y>
+				<Y>162</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -2051,7 +2099,7 @@ f_setWindTurbines( sl_largeScaleWind_MW.getValue() - p_currentWindTurbines_MW, s
 				<Id>1777620991324</Id>
 				<Name><![CDATA[i_gridCurtailment]]></Name>
 				<X>165</X>
-				<Y>148</Y>
+				<Y>168</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -2074,6 +2122,204 @@ f_setWindTurbines( sl_largeScaleWind_MW.getValue() - p_currentWindTurbines_MW, s
 				</ImageFiles>
 				<OriginalSize>false</OriginalSize>
 			</Image>
+			<Text>
+				<Id>1777995324604</Id>
+				<Name><![CDATA[txt_addIndividualEA]]></Name>
+				<X>20</X>
+				<Y>200</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D</DrawMode>
+				<VisibleCode>!zero_Interface.b_inEnergyHubMode</VisibleCode>
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Z>0</Z>
+				<Rotation>0.0</Rotation>
+				<Color>-16777216</Color>
+				<Text><![CDATA[Lokaal niveau — Individuele assets toevoegen]]></Text>
+				<Font>
+					<Name><![CDATA[Dialog]]></Name>
+					<Size>12</Size>
+					<Style>1</Style>
+				</Font>
+				<Alignment>LEFT</Alignment>
+			</Text>
+			<Control Type="Button">
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Id>1777995277264</Id>
+				<Name><![CDATA[button_AddCustomSolarfarmGC]]></Name>
+				<X>20</X>
+				<Y>220</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
+				<BasicProperties Width="110" Height="30">
+					<EmbeddedIcon>false</EmbeddedIcon>
+					<TextColor>-16777216</TextColor>
+					<VisibleCode>!zero_Interface.b_inEnergyHubMode</VisibleCode>
+					<Enabled>true</Enabled>
+					<ActionCode>b_addCustomGC = true;
+v_addCustomGCType = OL_EnergyAssetType.PHOTOVOLTAIC;
+zero_Interface.f_setForcedClickScreenTextBoxes("Energieassets toevoegen", new Color(255, 255, 255), new Color(0, 0, 0), "Teken je locatie op de kaart. Kies nog minimaal 3 hoekpunten.", new Color(255, 255, 255), new Color(0, 0, 0));
+zero_Interface.f_setForcedClickScreenVisibility(true);</ActionCode>
+				</BasicProperties>
+				<ExtendedProperties>
+					<Font Name="Dialog" Size="11" Style="0"/>
+					<LabelText>Zonnepark</LabelText>
+				</ExtendedProperties>
+			</Control>
+			<Control Type="Button">
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Id>1777995277266</Id>
+				<Name><![CDATA[button_AddCustomGridBattery]]></Name>
+				<X>20</X>
+				<Y>280</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
+				<BasicProperties Width="110" Height="30">
+					<EmbeddedIcon>false</EmbeddedIcon>
+					<TextColor>-16777216</TextColor>
+					<VisibleCode>!zero_Interface.b_inEnergyHubMode</VisibleCode>
+					<Enabled>true</Enabled>
+					<ActionCode>b_addCustomGC = true;
+v_addCustomGCType = OL_EnergyAssetType.STORAGE_ELECTRIC;
+zero_Interface.f_setForcedClickScreenTextBoxes("Energieassets toevoegen", new Color(255, 255, 255), new Color(0, 0, 0), "Kies een locatie op de kaart", new Color(255, 255, 255), new Color(0, 0, 0));
+zero_Interface.f_setForcedClickScreenVisibility(true);</ActionCode>
+				</BasicProperties>
+				<ExtendedProperties>
+					<Font Name="Dialog" Size="11" Style="0"/>
+					<LabelText>Buurtbatterij</LabelText>
+				</ExtendedProperties>
+			</Control>
+			<Control Type="Button">
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Id>1777995277268</Id>
+				<Name><![CDATA[button_AddCustomWindparkGC]]></Name>
+				<X>20</X>
+				<Y>250</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
+				<BasicProperties Width="110" Height="30">
+					<EmbeddedIcon>false</EmbeddedIcon>
+					<TextColor>-16777216</TextColor>
+					<VisibleCode>!zero_Interface.b_inEnergyHubMode</VisibleCode>
+					<Enabled>true</Enabled>
+					<ActionCode>b_addCustomGC = true;
+v_addCustomGCType = OL_EnergyAssetType.WINDMILL;
+zero_Interface.f_setForcedClickScreenTextBoxes("Energieassets toevoegen", new Color(255, 255, 255), new Color(0, 0, 0), "Kies een locatie op de kaart", new Color(255, 255, 255), new Color(0, 0, 0));
+zero_Interface.f_setForcedClickScreenVisibility(true);</ActionCode>
+				</BasicProperties>
+				<ExtendedProperties>
+					<Font Name="Dialog" Size="11" Style="0"/>
+					<LabelText>Windpark</LabelText>
+				</ExtendedProperties>
+			</Control>
+			<Control Type="Button">
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Id>1777995277270</Id>
+				<Name><![CDATA[button_DeleteCustomGC]]></Name>
+				<X>250</X>
+				<Y>220</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
+				<BasicProperties Width="110" Height="30">
+					<EmbeddedIcon>false</EmbeddedIcon>
+					<TextColor>-16777216</TextColor>
+					<VisibleCode>!zero_Interface.b_inEnergyHubMode</VisibleCode>
+					<Enabled>true</Enabled>
+					<EnableExpression>!c_customSolarfarmGCs.isEmpty() || !c_customWindfarmGCs.isEmpty() || !c_customGridBatteryGCs.isEmpty()</EnableExpression>
+					<ActionCode>if(!c_customSolarfarmGCs.isEmpty() || !c_customWindfarmGCs.isEmpty() || !c_customGridBatteryGCs.isEmpty()) {
+	b_removeCustomGC = true;
+	zero_Interface.f_setForcedClickScreenTextBoxes("Energieassets verwijderen", new Color(255, 255, 255), new Color(0, 0, 0), "Kies een energieasset op de kaart", new Color(255, 255, 255), new Color(0, 0, 0));
+	zero_Interface.f_setForcedClickScreenVisibility(true);
+} else {
+	throw new RuntimeException("There is no custom energy asset loaded in.");
+}</ActionCode>
+				</BasicProperties>
+				<ExtendedProperties>
+					<Font Name="Dialog" Size="11" Style="0"/>
+					<LabelText>Verwijderen...</LabelText>
+				</ExtendedProperties>
+			</Control>
+			<Control Type="Button">
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Id>1777995277272</Id>
+				<Name><![CDATA[button_DeleteAllCustomGCs]]></Name>
+				<X>250</X>
+				<Y>250</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
+				<BasicProperties Width="110" Height="30">
+					<EmbeddedIcon>false</EmbeddedIcon>
+					<TextColor>-16777216</TextColor>
+					<VisibleCode>!zero_Interface.b_inEnergyHubMode</VisibleCode>
+					<Enabled>true</Enabled>
+					<EnableExpression>!c_customSolarfarmGCs.isEmpty() || !c_customWindfarmGCs.isEmpty() || !c_customGridBatteryGCs.isEmpty()</EnableExpression>
+					<ActionCode>f_deleteAllCustomGCs();</ActionCode>
+				</BasicProperties>
+				<ExtendedProperties>
+					<Font Name="Dialog" Size="11" Style="0"/>
+					<LabelText>Verwijder alles</LabelText>
+				</ExtendedProperties>
+			</Control>
+			<Text>
+				<Id>1778953362982</Id>
+				<Name><![CDATA[txt_addIndividualEA1]]></Name>
+				<X>20</X>
+				<Y>60</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D</DrawMode>
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Z>0</Z>
+				<Rotation>0.0</Rotation>
+				<Color>-16777216</Color>
+				<Text><![CDATA[Regionaal niveau]]></Text>
+				<Font>
+					<Name><![CDATA[Dialog]]></Name>
+					<Size>12</Size>
+					<Style>1</Style>
+				</Font>
+				<Alignment>LEFT</Alignment>
+			</Text>
 		</Presentation>
 	</Group>
 	<Group>
@@ -2175,4 +2421,1252 @@ f_setWindTurbines( sl_largeScaleWind_MW.getValue() - p_currentWindTurbines_MW, s
 			</Text>
 		</Presentation>
 	</Group>
+	<Group>
+		<Id>1783088125058</Id>
+		<Name><![CDATA[gr_customGCSolarfarmSettings]]></Name>
+		<X>1600</X>
+		<Y>0</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>true</PublicFlag>
+		<PresentationFlag>false</PresentationFlag>
+		<ShowLabel>false</ShowLabel>
+		<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
+		<XCode>0</XCode>
+		<YCode>0</YCode>
+		<EmbeddedIcon>false</EmbeddedIcon>
+		<Z>0</Z>
+		<Rotation>0.0</Rotation>
+		<Presentation>
+			<Rectangle>
+				<Id>1783088125060</Id>
+				<Name><![CDATA[rect_customEASolarfarmSettings]]></Name>
+				<X>0</X>
+				<Y>0</Y>
+				<Label>
+					<X>10</X>
+					<Y>10</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>3</LineWidth>
+				<LineColor/>
+				<LineMaterial>null</LineMaterial>
+				<LineStyle>SOLID</LineStyle>
+				<Width>370</Width>
+				<Height>350</Height>
+				<Rotation>0.0</Rotation>
+				<FillColor>-32</FillColor>
+				<FillMaterial>null</FillMaterial>
+			</Rectangle>
+			<Text>
+				<Id>1783088125062</Id>
+				<Name><![CDATA[txt_customGCSettingsSolarfarm]]></Name>
+				<X>20</X>
+				<Y>20</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D</DrawMode>
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Z>0</Z>
+				<Rotation>0.0</Rotation>
+				<Color>-16777216</Color>
+				<Text><![CDATA[Instellingen - Zonnepark]]></Text>
+				<Font>
+					<Name><![CDATA[Dialog]]></Name>
+					<Size>22</Size>
+					<Style>1</Style>
+				</Font>
+				<Alignment>LEFT</Alignment>
+			</Text>
+			<Text>
+				<Id>1783088125064</Id>
+				<Name><![CDATA[txt_customGCSettingsSolarfarmInstalledCapacity_ha]]></Name>
+				<X>20</X>
+				<Y>150</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D</DrawMode>
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Z>0</Z>
+				<Rotation>0.0</Rotation>
+				<Color>-16777216</Color>
+				<Text><![CDATA[Geïnstalleerd vermogen]]></Text>
+				<Font>
+					<Name><![CDATA[Dialog]]></Name>
+					<Size>12</Size>
+					<Style>0</Style>
+				</Font>
+				<Alignment>LEFT</Alignment>
+			</Text>
+			<Text>
+				<Id>1783088125066</Id>
+				<Name><![CDATA[txt_customGCSolarfarmTotalSolarfarmArea_ha]]></Name>
+				<X>245</X>
+				<Y>120</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D</DrawMode>
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Z>0</Z>
+				<Rotation>0.0</Rotation>
+				<Color>-16777216</Color>
+				<Text><![CDATA[0 ha]]></Text>
+				<TextCode>zero_Interface.c_selectedGridConnections.isEmpty() ? "" : (round((zero_Interface.c_selectedGridConnections.get(0).c_connectedGISObjects.get(0).gisRegion.area() / 10000.0) * 10.0) / 10.0) + " ha"</TextCode>
+				<Font>
+					<Name><![CDATA[Dialog]]></Name>
+					<Size>12</Size>
+					<Style>0</Style>
+				</Font>
+				<Alignment>RIGHT</Alignment>
+			</Text>
+			<Control Type="Slider">
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Id>1783088125068</Id>
+				<Name><![CDATA[sl_customGCSolarfarmInstalledCapacity_kWpha]]></Name>
+				<X>260</X>
+				<Y>85</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
+				<BasicProperties Width="100" Height="30">
+					<EmbeddedIcon>false</EmbeddedIcon>
+					<Enabled>true</Enabled>
+					<ActionCode>double installedCapacity_kWpha = sl_customGCSolarfarmInstalledCapacity_kWpha.getValue();
+
+GCEnergyProduction gc = (GCEnergyProduction) (zero_Interface.c_selectedGridConnections).get(0);
+J_EAProduction pvAsset = (J_EAProduction)gc.c_productionAssets.get(0);
+
+// Calculate new installed capacity solarfarm and update text objects
+double area_m2 = gc.c_connectedGISObjects.get(0).gisRegion.area();
+double area_ha = area_m2 / 10000.0;
+double installedCapacity_kW = installedCapacity_kWpha * area_ha;
+
+// Calculate max contracted range to be the next multiple of 10 kW above installed capacity
+double maxContractedCapacity_kW = ceil(installedCapacity_kW / 10.0) * 10.0;
+
+// Dynamically clamp the range of the contracted capacity slider
+sl_customGCSolarfarmContractedCapacity_kW.setRange(0, maxContractedCapacity_kW);
+sl_customGCSolarfarmContractedCapacity_kW.setValue(maxContractedCapacity_kW, false);
+
+// Update backend
+pvAsset.setCapacityElectric_kW(installedCapacity_kW, gc);
+gc.v_liveConnectionMetaData.setCapacities_kW(0, maxContractedCapacity_kW, maxContractedCapacity_kW);
+
+// Update the active instance of tabElectricity sliders
+f_updateSliders_Electricity();
+
+if (!zero_Interface.b_runningMainInterfaceScenarios) zero_Interface.f_setScenarioToCustom();
+zero_Interface.f_resetSettings();</ActionCode>
+				</BasicProperties>
+				<ExtendedProperties>
+					<DefaultValueCode>0</DefaultValueCode>
+					<Orientation>HORIZONTAL</Orientation>
+					<Step>10</Step>
+					<LinkTo>false</LinkTo>
+				</ExtendedProperties>
+			</Control>
+			<Text>
+				<Id>1783088125070</Id>
+				<Name><![CDATA[txt_customGCSettingsSolarfarmName]]></Name>
+				<X>20</X>
+				<Y>60</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D</DrawMode>
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Z>0</Z>
+				<Rotation>0.0</Rotation>
+				<Color>-16777216</Color>
+				<Text><![CDATA[Naam: ]]></Text>
+				<TextCode>zero_Interface.c_selectedGridConnections.isEmpty() || zero_Interface.c_selectedGridConnections.get(0).c_connectedGISObjects.isEmpty()  ? "" : "Naam: " + zero_Interface.c_selectedGridConnections.get(0).c_connectedGISObjects.get(0).p_annotation</TextCode>
+				<Font>
+					<Name><![CDATA[Dialog]]></Name>
+					<Size>12</Size>
+					<Style>0</Style>
+				</Font>
+				<Alignment>LEFT</Alignment>
+			</Text>
+			<Text>
+				<Id>1783088125072</Id>
+				<Name><![CDATA[txt_customGCSolarfarmInstalledCapacity_kW]]></Name>
+				<X>245</X>
+				<Y>150</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D</DrawMode>
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Z>0</Z>
+				<Rotation>0.0</Rotation>
+				<Color>-16777216</Color>
+				<Text><![CDATA[0 kW]]></Text>
+				<TextCode>zero_Interface.c_selectedGridConnections.isEmpty() ? "" : (round(zero_Interface.c_selectedGridConnections.get(0).c_productionAssets.get(0).getCapacityElectric_kW() * 10.0) / 10.0) + " kW"</TextCode>
+				<Font>
+					<Name><![CDATA[Dialog]]></Name>
+					<Size>12</Size>
+					<Style>0</Style>
+				</Font>
+				<Alignment>RIGHT</Alignment>
+			</Text>
+			<Text>
+				<Id>1783088125074</Id>
+				<Name><![CDATA[txt_customGCSettingsSolarfarmContractedCapacity_kW]]></Name>
+				<X>20</X>
+				<Y>240</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D</DrawMode>
+				<VisibleCode>cb_customGCSolarfarmCurtailment.isSelected()</VisibleCode>
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Z>0</Z>
+				<Rotation>0.0</Rotation>
+				<Color>-16777216</Color>
+				<Text><![CDATA[Gecontracteerd vermogen]]></Text>
+				<Font>
+					<Name><![CDATA[Dialog]]></Name>
+					<Size>12</Size>
+					<Style>0</Style>
+				</Font>
+				<Alignment>LEFT</Alignment>
+			</Text>
+			<Text>
+				<Id>1783088125076</Id>
+				<Name><![CDATA[txt_customGCSettingsSolarfarmCurtailment]]></Name>
+				<X>20</X>
+				<Y>210</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D</DrawMode>
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Z>0</Z>
+				<Rotation>0.0</Rotation>
+				<Color>-16777216</Color>
+				<Text><![CDATA[Curtailment]]></Text>
+				<Font>
+					<Name><![CDATA[Dialog]]></Name>
+					<Size>12</Size>
+					<Style>0</Style>
+				</Font>
+				<Alignment>LEFT</Alignment>
+			</Text>
+			<Text>
+				<Id>1783088125078</Id>
+				<Name><![CDATA[txt_customEASolarfarmContractedCapacity_kW]]></Name>
+				<X>245</X>
+				<Y>240</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D</DrawMode>
+				<VisibleCode>cb_customGCSolarfarmCurtailment.isSelected()</VisibleCode>
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Z>0</Z>
+				<Rotation>0.0</Rotation>
+				<Color>-16777216</Color>
+				<Text><![CDATA[0 kW]]></Text>
+				<TextCode>sl_customGCSolarfarmContractedCapacity_kW.getValue() + " kW"</TextCode>
+				<Font>
+					<Name><![CDATA[Dialog]]></Name>
+					<Size>12</Size>
+					<Style>0</Style>
+				</Font>
+				<Alignment>RIGHT</Alignment>
+			</Text>
+			<Control Type="CheckBox">
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Id>1783088125080</Id>
+				<Name><![CDATA[cb_customGCSolarfarmCurtailment]]></Name>
+				<X>302</X>
+				<Y>202</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
+				<BasicProperties Width="40" Height="30">
+					<EmbeddedIcon>false</EmbeddedIcon>
+					<TextColor>-16777216</TextColor>
+					<Enabled>true</Enabled>
+					<ActionCode>GCEnergyProduction gc = (GCEnergyProduction) (zero_Interface.c_selectedGridConnections).get(0);
+if (cb_customGCSolarfarmCurtailment.isSelected()) {
+    gc.f_setExternalAssetManagement(new J_CurtailManagementContractCapacity(gc, zero_Interface.energyModel.p_timeParameters));
+} else {
+    gc.f_removeExternalAssetManagement(I_CurtailManagement.class);
+}
+
+if (!zero_Interface.b_runningMainInterfaceScenarios) zero_Interface.f_setScenarioToCustom();
+zero_Interface.f_resetSettings();</ActionCode>
+				</BasicProperties>
+				<ExtendedProperties>
+					<Font Name="Dialog" Size="11" Style="0"/>
+					<LabelText/>
+					<LinkTo>false</LinkTo>
+				</ExtendedProperties>
+			</Control>
+			<Control Type="Slider">
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Id>1783088125082</Id>
+				<Name><![CDATA[sl_customGCSolarfarmContractedCapacity_kW]]></Name>
+				<X>260</X>
+				<Y>235</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
+				<BasicProperties Width="100" Height="30">
+					<EmbeddedIcon>false</EmbeddedIcon>
+					<VisibleCode>cb_customGCSolarfarmCurtailment.isSelected()</VisibleCode>
+					<Enabled>true</Enabled>
+					<ActionCode>GCEnergyProduction gc = (GCEnergyProduction) (zero_Interface.c_selectedGridConnections).get(0);
+double physicalCapacity_kW = gc.v_liveConnectionMetaData.getPhysicalCapacity_kW();
+
+double contractedCapacity_kW = sl_customGCSolarfarmContractedCapacity_kW.getValue();
+
+gc.v_liveConnectionMetaData.setCapacities_kW(0, contractedCapacity_kW, physicalCapacity_kW);
+
+if (!zero_Interface.b_runningMainInterfaceScenarios) zero_Interface.f_setScenarioToCustom();
+zero_Interface.f_resetSettings();</ActionCode>
+				</BasicProperties>
+				<ExtendedProperties>
+					<DefaultValueCode>0</DefaultValueCode>
+					<Orientation>HORIZONTAL</Orientation>
+					<Step>10</Step>
+					<LinkTo>false</LinkTo>
+				</ExtendedProperties>
+			</Control>
+			<Text>
+				<Id>1783088125084</Id>
+				<Name><![CDATA[txt_customGCSettingsSolarfarmInstalledCapacityPerHectare_kWpha]]></Name>
+				<X>20</X>
+				<Y>90</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D</DrawMode>
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Z>0</Z>
+				<Rotation>0.0</Rotation>
+				<Color>-16777216</Color>
+				<Text><![CDATA[Vermogen per hectare]]></Text>
+				<Font>
+					<Name><![CDATA[Dialog]]></Name>
+					<Size>12</Size>
+					<Style>0</Style>
+				</Font>
+				<Alignment>LEFT</Alignment>
+			</Text>
+			<Text>
+				<Id>1783088125086</Id>
+				<Name><![CDATA[txt_customGCSettingsSolarfarmInstalledCapacityPerHectare_kWpha1]]></Name>
+				<X>20</X>
+				<Y>120</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D</DrawMode>
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Z>0</Z>
+				<Rotation>0.0</Rotation>
+				<Color>-16777216</Color>
+				<Text><![CDATA[Totaal oppervlak]]></Text>
+				<Font>
+					<Name><![CDATA[Dialog]]></Name>
+					<Size>12</Size>
+					<Style>0</Style>
+				</Font>
+				<Alignment>LEFT</Alignment>
+			</Text>
+			<Text>
+				<Id>1783088125088</Id>
+				<Name><![CDATA[txt_customGCSolarfarmInstalledCapacity_kWpha]]></Name>
+				<X>245</X>
+				<Y>90</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D</DrawMode>
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Z>0</Z>
+				<Rotation>0.0</Rotation>
+				<Color>-16777216</Color>
+				<Text><![CDATA[0 kW/ha]]></Text>
+				<TextCode>(round(sl_customGCSolarfarmInstalledCapacity_kWpha.getValue() * 10.0) / 10.0) + " kW/ha"</TextCode>
+				<Font>
+					<Name><![CDATA[Dialog]]></Name>
+					<Size>12</Size>
+					<Style>0</Style>
+				</Font>
+				<Alignment>RIGHT</Alignment>
+			</Text>
+			<Control Type="ComboBox">
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Id>1783088125090</Id>
+				<Name><![CDATA[cb_customGCSolarfarmPVOrientation]]></Name>
+				<X>220</X>
+				<Y>180</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
+				<BasicProperties Width="140" Height="20">
+					<EmbeddedIcon>false</EmbeddedIcon>
+					<FillColor>-1</FillColor>
+					<TextColor>-16777216</TextColor>
+					<Enabled>true</Enabled>
+					<ActionCode>GCEnergyProduction solarpark = (GCEnergyProduction) (zero_Interface.c_selectedGridConnections).get(0);
+J_EAProduction pvAsset = (J_EAProduction) solarpark.c_productionAssets.get(0);
+J_ProfilePointer profile;
+OL_PVOrientation pvOrientation;
+
+switch(cb_customGCSolarfarmPVOrientation.getValue()){
+	case "Zuid (15°)":
+    	profile = zero_Interface.energyModel.pp_PVProduction35DegSouth_fr;
+        pvOrientation = OL_PVOrientation.SOUTH;
+		break;
+	case "Oost/West (35°)":
+    	profile = zero_Interface.energyModel.pp_PVProduction15DegEastWest_fr;
+        pvOrientation = OL_PVOrientation.EASTWEST;
+        break;
+    default:
+        return;
+}
+
+double installedCapacity_kW = pvAsset.getCapacityElectric_kW();
+pvAsset.removeEnergyAsset();
+new J_EAProduction(solarpark, OL_EnergyAssetType.PHOTOVOLTAIC, "Custom PV", OL_EnergyCarriers.ELECTRICITY, installedCapacity_kW, zero_Interface.energyModel.p_timeParameters, profile);
+solarpark.v_liveAssetsMetaData.PVOrientation = pvOrientation;
+
+if (!zero_Interface.b_runningMainInterfaceScenarios) zero_Interface.f_setScenarioToCustom();
+zero_Interface.f_resetSettings();</ActionCode>
+				</BasicProperties>
+				<ExtendedProperties>
+					<Font Name="Dialog" Size="11" Style="0"/>
+					<Editable>false</Editable>
+					<Button>Zuid (15°)</Button>
+					<Button>Oost/West (35°)</Button>
+					<LinkTo>false</LinkTo>
+				</ExtendedProperties>
+			</Control>
+			<Text>
+				<Id>1783088125092</Id>
+				<Name><![CDATA[txt_customGCSettingsSolarfarmPVOrientation]]></Name>
+				<X>20</X>
+				<Y>180</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D</DrawMode>
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Z>0</Z>
+				<Rotation>0.0</Rotation>
+				<Color>-16777216</Color>
+				<Text><![CDATA[Oriëntatie]]></Text>
+				<Font>
+					<Name><![CDATA[Dialog]]></Name>
+					<Size>12</Size>
+					<Style>0</Style>
+				</Font>
+				<Alignment>LEFT</Alignment>
+			</Text>
+		</Presentation>
+	</Group>
+	<Group>
+		<Id>1783088125272</Id>
+		<Name><![CDATA[gr_customGCWindfarmSettings]]></Name>
+		<X>2000</X>
+		<Y>0</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>true</PublicFlag>
+		<PresentationFlag>false</PresentationFlag>
+		<ShowLabel>false</ShowLabel>
+		<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
+		<XCode>0</XCode>
+		<YCode>0</YCode>
+		<EmbeddedIcon>false</EmbeddedIcon>
+		<Z>0</Z>
+		<Rotation>0.0</Rotation>
+		<Presentation>
+			<Rectangle>
+				<Id>1783088125274</Id>
+				<Name><![CDATA[rect_customEAWindfarmSettings]]></Name>
+				<X>0</X>
+				<Y>0</Y>
+				<Label>
+					<X>10</X>
+					<Y>10</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>3</LineWidth>
+				<LineColor/>
+				<LineMaterial>null</LineMaterial>
+				<LineStyle>SOLID</LineStyle>
+				<Width>370</Width>
+				<Height>350</Height>
+				<Rotation>0.0</Rotation>
+				<FillColor>-32</FillColor>
+				<FillMaterial>null</FillMaterial>
+			</Rectangle>
+			<Text>
+				<Id>1783088125276</Id>
+				<Name><![CDATA[txt_customGCSettingsWindfarm]]></Name>
+				<X>20</X>
+				<Y>20</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D</DrawMode>
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Z>0</Z>
+				<Rotation>0.0</Rotation>
+				<Color>-16777216</Color>
+				<Text><![CDATA[Instellingen - Windpark]]></Text>
+				<Font>
+					<Name><![CDATA[Dialog]]></Name>
+					<Size>22</Size>
+					<Style>1</Style>
+				</Font>
+				<Alignment>LEFT</Alignment>
+			</Text>
+			<Text>
+				<Id>1783088125278</Id>
+				<Name><![CDATA[txt_customGCSettingsWindfarmInstalledCapacity_MW]]></Name>
+				<X>20</X>
+				<Y>90</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D</DrawMode>
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Z>0</Z>
+				<Rotation>0.0</Rotation>
+				<Color>-16777216</Color>
+				<Text><![CDATA[Geïnstalleerd vermogen]]></Text>
+				<Font>
+					<Name><![CDATA[Dialog]]></Name>
+					<Size>12</Size>
+					<Style>0</Style>
+				</Font>
+				<Alignment>LEFT</Alignment>
+			</Text>
+			<Text>
+				<Id>1783088125280</Id>
+				<Name><![CDATA[txt_customGCWindfarmInstalledCapacity_MW]]></Name>
+				<X>245</X>
+				<Y>90</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D</DrawMode>
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Z>0</Z>
+				<Rotation>0.0</Rotation>
+				<Color>-16777216</Color>
+				<Text><![CDATA[0 MW]]></Text>
+				<TextCode>sl_customGCWindfarmInstalledCapacity_MW.getValue() + " MW"</TextCode>
+				<Font>
+					<Name><![CDATA[Dialog]]></Name>
+					<Size>12</Size>
+					<Style>0</Style>
+				</Font>
+				<Alignment>RIGHT</Alignment>
+			</Text>
+			<Control Type="Slider">
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Id>1783088125282</Id>
+				<Name><![CDATA[sl_customGCWindfarmInstalledCapacity_MW]]></Name>
+				<X>260</X>
+				<Y>85</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
+				<BasicProperties Width="100" Height="30">
+					<EmbeddedIcon>false</EmbeddedIcon>
+					<Enabled>true</Enabled>
+					<ActionCode>double installedCapacity_MW = sl_customGCWindfarmInstalledCapacity_MW.getValue();
+
+GCEnergyProduction gc = (GCEnergyProduction)(zero_Interface.c_selectedGridConnections).get(0);
+J_EAProduction windAsset = (J_EAProduction)gc.c_productionAssets.get(0);
+
+// Dynamically clamp the range of the contracted capacity slider
+sl_customGCWindfarmContractedCapacity_MW.setRange(0, installedCapacity_MW + 1E-10);
+sl_customGCWindfarmContractedCapacity_MW.setValue(installedCapacity_MW, false);
+
+// Update backend
+windAsset.setCapacityElectric_kW(installedCapacity_MW*1000, gc);
+gc.v_liveConnectionMetaData.setCapacities_kW(0, installedCapacity_MW*1000, installedCapacity_MW*1000);
+
+// Update the active instance of tabElectricity sliders
+f_updateSliders_Electricity();
+
+if (!zero_Interface.b_runningMainInterfaceScenarios) zero_Interface.f_setScenarioToCustom();
+zero_Interface.f_resetSettings();</ActionCode>
+				</BasicProperties>
+				<ExtendedProperties>
+					<DefaultValueCode>0</DefaultValueCode>
+					<Orientation>HORIZONTAL</Orientation>
+					<Step>0.1</Step>
+					<LinkTo>false</LinkTo>
+				</ExtendedProperties>
+			</Control>
+			<Text>
+				<Id>1783088125284</Id>
+				<Name><![CDATA[txt_customGCSettingsWindfarmName]]></Name>
+				<X>20</X>
+				<Y>60</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D</DrawMode>
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Z>0</Z>
+				<Rotation>0.0</Rotation>
+				<Color>-16777216</Color>
+				<Text><![CDATA[Naam: ]]></Text>
+				<TextCode>zero_Interface.c_selectedGridConnections.isEmpty() || zero_Interface.c_selectedGridConnections.get(0).c_connectedGISObjects.isEmpty()  ? "" : "Naam: " + zero_Interface.c_selectedGridConnections.get(0).c_connectedGISObjects.get(0).p_annotation</TextCode>
+				<Font>
+					<Name><![CDATA[Dialog]]></Name>
+					<Size>12</Size>
+					<Style>0</Style>
+				</Font>
+				<Alignment>LEFT</Alignment>
+			</Text>
+			<Text>
+				<Id>1783088125286</Id>
+				<Name><![CDATA[txt_customGCSettingsWindfarmContractedCapacity_MW]]></Name>
+				<X>20</X>
+				<Y>150</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D</DrawMode>
+				<VisibleCode>cb_customGCWindfarmCurtailment.isSelected()</VisibleCode>
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Z>0</Z>
+				<Rotation>0.0</Rotation>
+				<Color>-16777216</Color>
+				<Text><![CDATA[Gecontracteerd vermogen]]></Text>
+				<Font>
+					<Name><![CDATA[Dialog]]></Name>
+					<Size>12</Size>
+					<Style>0</Style>
+				</Font>
+				<Alignment>LEFT</Alignment>
+			</Text>
+			<Text>
+				<Id>1783088125288</Id>
+				<Name><![CDATA[txt_customGCSettingsWindfarmCurtailment]]></Name>
+				<X>20</X>
+				<Y>120</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D</DrawMode>
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Z>0</Z>
+				<Rotation>0.0</Rotation>
+				<Color>-16777216</Color>
+				<Text><![CDATA[Curtailment]]></Text>
+				<Font>
+					<Name><![CDATA[Dialog]]></Name>
+					<Size>12</Size>
+					<Style>0</Style>
+				</Font>
+				<Alignment>LEFT</Alignment>
+			</Text>
+			<Text>
+				<Id>1783088125290</Id>
+				<Name><![CDATA[txt_customGCWindfarmContractedCapacity_MW]]></Name>
+				<X>245</X>
+				<Y>150</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D</DrawMode>
+				<VisibleCode>cb_customGCWindfarmCurtailment.isSelected()</VisibleCode>
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Z>0</Z>
+				<Rotation>0.0</Rotation>
+				<Color>-16777216</Color>
+				<Text><![CDATA[0 MW]]></Text>
+				<TextCode>sl_customGCWindfarmContractedCapacity_MW.getValue() + " MW"</TextCode>
+				<Font>
+					<Name><![CDATA[Dialog]]></Name>
+					<Size>12</Size>
+					<Style>0</Style>
+				</Font>
+				<Alignment>RIGHT</Alignment>
+			</Text>
+			<Control Type="CheckBox">
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Id>1783088125292</Id>
+				<Name><![CDATA[cb_customGCWindfarmCurtailment]]></Name>
+				<X>302</X>
+				<Y>112</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
+				<BasicProperties Width="40" Height="30">
+					<EmbeddedIcon>false</EmbeddedIcon>
+					<TextColor>-16777216</TextColor>
+					<Enabled>true</Enabled>
+					<ActionCode>GCEnergyProduction gc = (GCEnergyProduction) (zero_Interface.c_selectedGridConnections).get(0);
+if (cb_customGCWindfarmCurtailment.isSelected()) {
+    gc.f_setExternalAssetManagement(new J_CurtailManagementContractCapacity(gc, zero_Interface.energyModel.p_timeParameters));
+} else {
+    gc.f_removeExternalAssetManagement(I_CurtailManagement.class);
+}
+
+if (!zero_Interface.b_runningMainInterfaceScenarios) zero_Interface.f_setScenarioToCustom();
+zero_Interface.f_resetSettings();</ActionCode>
+				</BasicProperties>
+				<ExtendedProperties>
+					<Font Name="Dialog" Size="11" Style="0"/>
+					<LabelText/>
+					<LinkTo>false</LinkTo>
+				</ExtendedProperties>
+			</Control>
+			<Control Type="Slider">
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Id>1783088125294</Id>
+				<Name><![CDATA[sl_customGCWindfarmContractedCapacity_MW]]></Name>
+				<X>260</X>
+				<Y>145</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
+				<BasicProperties Width="100" Height="30">
+					<EmbeddedIcon>false</EmbeddedIcon>
+					<VisibleCode>cb_customGCWindfarmCurtailment.isSelected()</VisibleCode>
+					<Enabled>true</Enabled>
+					<ActionCode>double contractedCapacity_MW = sl_customGCWindfarmContractedCapacity_MW.getValue();
+
+// Update backend
+GCEnergyProduction gc = (GCEnergyProduction) (zero_Interface.c_selectedGridConnections).get(0);
+gc.v_liveConnectionMetaData.setCapacities_kW(0, contractedCapacity_MW*1000, gc.v_liveConnectionMetaData.getPhysicalCapacity_kW());
+
+if (!zero_Interface.b_runningMainInterfaceScenarios) zero_Interface.f_setScenarioToCustom();
+zero_Interface.f_resetSettings();</ActionCode>
+				</BasicProperties>
+				<ExtendedProperties>
+					<DefaultValueCode>0</DefaultValueCode>
+					<Orientation>HORIZONTAL</Orientation>
+					<Step>0.1</Step>
+					<LinkTo>false</LinkTo>
+				</ExtendedProperties>
+			</Control>
+		</Presentation>
+	</Group>
+	<Group>
+		<Id>1783088125399</Id>
+		<Name><![CDATA[gr_customGCGridBatterySettings]]></Name>
+		<X>2400</X>
+		<Y>0</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>true</PublicFlag>
+		<PresentationFlag>false</PresentationFlag>
+		<ShowLabel>false</ShowLabel>
+		<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
+		<XCode>0</XCode>
+		<YCode>0</YCode>
+		<EmbeddedIcon>false</EmbeddedIcon>
+		<Z>0</Z>
+		<Rotation>0.0</Rotation>
+		<Presentation>
+			<Rectangle>
+				<Id>1783088125401</Id>
+				<Name><![CDATA[rect_customEASolarfarmSettings1]]></Name>
+				<X>0</X>
+				<Y>0</Y>
+				<Label>
+					<X>10</X>
+					<Y>10</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>3</LineWidth>
+				<LineColor/>
+				<LineMaterial>null</LineMaterial>
+				<LineStyle>SOLID</LineStyle>
+				<Width>370</Width>
+				<Height>350</Height>
+				<Rotation>0.0</Rotation>
+				<FillColor>-32</FillColor>
+				<FillMaterial>null</FillMaterial>
+			</Rectangle>
+			<Text>
+				<Id>1783088125403</Id>
+				<Name><![CDATA[txt_customGCSettingsGridBattery]]></Name>
+				<X>20</X>
+				<Y>20</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D</DrawMode>
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Z>0</Z>
+				<Rotation>0.0</Rotation>
+				<Color>-16777216</Color>
+				<Text><![CDATA[Instellingen - Buurtbatterij]]></Text>
+				<Font>
+					<Name><![CDATA[Dialog]]></Name>
+					<Size>22</Size>
+					<Style>1</Style>
+				</Font>
+				<Alignment>LEFT</Alignment>
+			</Text>
+			<Text>
+				<Id>1783088125405</Id>
+				<Name><![CDATA[txt_customGCSettingsGridBatteryInstalledCapacity_MWh]]></Name>
+				<X>20</X>
+				<Y>90</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D</DrawMode>
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Z>0</Z>
+				<Rotation>0.0</Rotation>
+				<Color>-16777216</Color>
+				<Text><![CDATA[Opslagcapaciteit]]></Text>
+				<Font>
+					<Name><![CDATA[Dialog]]></Name>
+					<Size>12</Size>
+					<Style>0</Style>
+				</Font>
+				<Alignment>LEFT</Alignment>
+			</Text>
+			<Text>
+				<Id>1783088125407</Id>
+				<Name><![CDATA[txt_customGCGridBatteryInstalledCapacity_MWh]]></Name>
+				<X>245</X>
+				<Y>90</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D</DrawMode>
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Z>0</Z>
+				<Rotation>0.0</Rotation>
+				<Color>-16777216</Color>
+				<Text><![CDATA[0 MWh]]></Text>
+				<TextCode>roundToDecimal(sl_customGCGridBatteryInstalledCapacity_MWh.getValue(), 1) + " MWh"</TextCode>
+				<Font>
+					<Name><![CDATA[Dialog]]></Name>
+					<Size>12</Size>
+					<Style>0</Style>
+				</Font>
+				<Alignment>RIGHT</Alignment>
+			</Text>
+			<Control Type="Slider">
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Id>1783088125409</Id>
+				<Name><![CDATA[sl_customGCGridBatteryInstalledCapacity_MWh]]></Name>
+				<X>260</X>
+				<Y>85</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
+				<BasicProperties Width="100" Height="30">
+					<EmbeddedIcon>false</EmbeddedIcon>
+					<Enabled>true</Enabled>
+					<ActionCode>double installedCapacity_MWh = sl_customGCGridBatteryInstalledCapacity_MWh.getValue();
+double installedCapacity_MW = installedCapacity_MWh / zero_Interface.energyModel.avgc_data.p_avgRatioBatteryCapacity_v_Power;
+
+sl_customGCGridBatteryInstalledCapacity_MW.setRange(0.05, installedCapacity_MW + 1E-10);
+sl_customGCGridBatteryInstalledCapacity_MW.setValue(installedCapacity_MW, false);
+
+GCGridBattery gc = (GCGridBattery)(zero_Interface.c_selectedGridConnections).get(0);
+J_EAStorageElectric batteryAsset = (J_EAStorageElectric)gc.c_storageAssets.get(0);
+
+// Update backend
+batteryAsset.setStorageCapacity_kWh(installedCapacity_MWh * 1000, gc);
+batteryAsset.setCapacityElectric_kW(installedCapacity_MW * 1000);
+gc.v_liveConnectionMetaData.setCapacities_kW(installedCapacity_MW * 1000, installedCapacity_MW * 1000, installedCapacity_MW * 1000);
+
+// Update the active instance of tabElectricity sliders
+f_updateSliders_Electricity();
+
+if (!zero_Interface.b_runningMainInterfaceScenarios) zero_Interface.f_setScenarioToCustom();
+zero_Interface.f_resetSettings();</ActionCode>
+				</BasicProperties>
+				<ExtendedProperties>
+					<DefaultValueCode>0</DefaultValueCode>
+					<Orientation>HORIZONTAL</Orientation>
+					<Step>0.1</Step>
+					<LinkTo>false</LinkTo>
+				</ExtendedProperties>
+			</Control>
+			<Text>
+				<Id>1783088125411</Id>
+				<Name><![CDATA[txt_customGCSettingsGridBatteryName]]></Name>
+				<X>20</X>
+				<Y>60</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D</DrawMode>
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Z>0</Z>
+				<Rotation>0.0</Rotation>
+				<Color>-16777216</Color>
+				<Text><![CDATA[Naam: ]]></Text>
+				<TextCode>zero_Interface.c_selectedGridConnections.isEmpty() || zero_Interface.c_selectedGridConnections.get(0).c_connectedGISObjects.isEmpty()  ? "" : "Naam: " + zero_Interface.c_selectedGridConnections.get(0).c_connectedGISObjects.get(0).p_annotation</TextCode>
+				<Font>
+					<Name><![CDATA[Dialog]]></Name>
+					<Size>12</Size>
+					<Style>0</Style>
+				</Font>
+				<Alignment>LEFT</Alignment>
+			</Text>
+			<Text>
+				<Id>1783088125413</Id>
+				<Name><![CDATA[txt_customGCGridBatteryInstalledCapacity_MW]]></Name>
+				<X>245</X>
+				<Y>120</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D</DrawMode>
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Z>0</Z>
+				<Rotation>0.0</Rotation>
+				<Color>-16777216</Color>
+				<Text><![CDATA[0 MW]]></Text>
+				<TextCode>sl_customGCGridBatteryInstalledCapacity_MW.getValue() + " MW"</TextCode>
+				<Font>
+					<Name><![CDATA[Dialog]]></Name>
+					<Size>12</Size>
+					<Style>0</Style>
+				</Font>
+				<Alignment>RIGHT</Alignment>
+			</Text>
+			<Control Type="Slider">
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Id>1783088125415</Id>
+				<Name><![CDATA[sl_customGCGridBatteryInstalledCapacity_MW]]></Name>
+				<X>260</X>
+				<Y>115</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
+				<BasicProperties Width="100" Height="30">
+					<EmbeddedIcon>false</EmbeddedIcon>
+					<Enabled>true</Enabled>
+					<ActionCode>double installedCapacity_MW = sl_customGCGridBatteryInstalledCapacity_MW.getValue();
+double installedCapacity_kW = installedCapacity_MW * 1000;
+
+GCGridBattery gc = (GCGridBattery)(zero_Interface.c_selectedGridConnections).get(0);
+J_EAStorageElectric batteryAsset = (J_EAStorageElectric)gc.c_storageAssets.get(0);
+
+batteryAsset.setCapacityElectric_kW(installedCapacity_kW);
+gc.v_liveConnectionMetaData.setCapacities_kW(installedCapacity_kW, installedCapacity_kW, installedCapacity_kW);
+
+if (!zero_Interface.b_runningMainInterfaceScenarios) zero_Interface.f_setScenarioToCustom();
+zero_Interface.f_resetSettings();</ActionCode>
+				</BasicProperties>
+				<ExtendedProperties>
+					<DefaultValueCode>0</DefaultValueCode>
+					<Orientation>HORIZONTAL</Orientation>
+					<Step>0.05</Step>
+					<LinkTo>false</LinkTo>
+				</ExtendedProperties>
+			</Control>
+			<Text>
+				<Id>1783088125417</Id>
+				<Name><![CDATA[txt_customGCSettingsGridBatteryAlgorithm]]></Name>
+				<X>20</X>
+				<Y>150</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D</DrawMode>
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Z>0</Z>
+				<Rotation>0.0</Rotation>
+				<Color>-16777216</Color>
+				<Text><![CDATA[Sturing]]></Text>
+				<Font>
+					<Name><![CDATA[Dialog]]></Name>
+					<Size>12</Size>
+					<Style>0</Style>
+				</Font>
+				<Alignment>LEFT</Alignment>
+			</Text>
+			<Text>
+				<Id>1783088125419</Id>
+				<Name><![CDATA[txt_customGCSettingsGridBatteryInstalledCapacity_MW]]></Name>
+				<X>20</X>
+				<Y>120</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D</DrawMode>
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Z>0</Z>
+				<Rotation>0.0</Rotation>
+				<Color>-16777216</Color>
+				<Text><![CDATA[(Ont)laad vermogen]]></Text>
+				<Font>
+					<Name><![CDATA[Dialog]]></Name>
+					<Size>12</Size>
+					<Style>0</Style>
+				</Font>
+				<Alignment>LEFT</Alignment>
+			</Text>
+			<Control Type="ComboBox">
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Id>1783088125421</Id>
+				<Name><![CDATA[cb_customGCGridBatteryAlgorithm]]></Name>
+				<X>220</X>
+				<Y>150</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
+				<BasicProperties Width="140" Height="20">
+					<EmbeddedIcon>false</EmbeddedIcon>
+					<FillColor>-1</FillColor>
+					<TextColor>-16777216</TextColor>
+					<Enabled>true</Enabled>
+					<ActionCode>if (zero_Interface.c_selectedGridConnections.isEmpty() || !(zero_Interface.c_selectedGridConnections.get(0) instanceof GCGridBattery)) {
+    return;
+}
+GCGridBattery gc = (GCGridBattery)(zero_Interface.c_selectedGridConnections).get(0);
+GridNode gn = gc.p_parentNodeElectric;
+I_BatteryManagement batteryAlgorithm = null;
+
+switch(cb_customGCGridBatteryAlgorithm.getValue()){
+	case "Zelfverbruik":
+    	batteryAlgorithm = new J_BatteryManagementSelfConsumptionGridNode(gc, zero_Interface.energyModel.p_timeParameters);
+    	break;
+	case "Peak shaving":
+    	batteryAlgorithm = new J_BatteryManagementPeakShaving(gc, zero_Interface.energyModel.p_timeParameters);
+    	((J_BatteryManagementPeakShaving)batteryAlgorithm).setTarget(gn);
+    	break;
+	case "Prijssturing":
+    	batteryAlgorithm = new J_BatteryManagementPrice(gc, zero_Interface.energyModel.p_timeParameters);
+    	break;
+}
+
+gc.f_setBatteryManagement(batteryAlgorithm);
+
+if (!zero_Interface.b_runningMainInterfaceScenarios) zero_Interface.f_setScenarioToCustom();
+zero_Interface.f_resetSettings();</ActionCode>
+				</BasicProperties>
+				<ExtendedProperties>
+					<Font Name="Dialog" Size="11" Style="0"/>
+					<Editable>false</Editable>
+					<Button>Zelfverbruik</Button>
+					<Button>Peak shaving</Button>
+					<Button>Prijssturing</Button>
+					<LinkTo>false</LinkTo>
+				</ExtendedProperties>
+			</Control>
+		</Presentation>
+	</Group>
+	<Text>
+		<Id>1783113325300</Id>
+		<Name><![CDATA[txt_customGCFunctions]]></Name>
+		<X>-810</X>
+		<Y>30</Y>
+		<Label>
+			<X>0</X>
+			<Y>-10</Y>
+		</Label>
+		<PublicFlag>true</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>false</ShowLabel>
+		<DrawMode>SHAPE_DRAW_2D</DrawMode>
+		<EmbeddedIcon>false</EmbeddedIcon>
+		<Z>0</Z>
+		<Rotation>0.0</Rotation>
+		<Color>-16777216</Color>
+		<Text><![CDATA[Custom GC creation during runtime functions]]></Text>
+		<Font>
+			<Name><![CDATA[SansSerif]]></Name>
+			<Size>14</Size>
+			<Style>1</Style>
+		</Font>
+		<Alignment>LEFT</Alignment>
+	</Text>
 </Presentation>
diff --git a/_alp/Agents/tabElectricity/Variables.xml b/_alp/Agents/tabElectricity/Variables.xml
index cddb7cc8..b705639a 100644
--- a/_alp/Agents/tabElectricity/Variables.xml
+++ b/_alp/Agents/tabElectricity/Variables.xml
@@ -4,6 +4,179 @@
 		<Id>1777551482069</Id>
 		<Name><![CDATA[v_currentPageIndex]]></Name>
 		<X>-350</X>
+		<Y>140</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[int]]></Type>
+			<InitialValue Class="CodeValue">
+				<Code><![CDATA[0]]></Code>
+			</InitialValue>
+		</Properties>
+	</Variable>
+	<Variable Class="PlainVariable">
+		<Id>1783089426576</Id>
+		<Name><![CDATA[v_customSolarfarmGCCounter]]></Name>
+		<X>-800</X>
+		<Y>160</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[int]]></Type>
+			<InitialValue Class="CodeValue">
+				<Code><![CDATA[0]]></Code>
+			</InitialValue>
+		</Properties>
+	</Variable>
+	<Variable Class="PlainVariable">
+		<Id>1783089426588</Id>
+		<Name><![CDATA[v_customWindfarmGCCounter]]></Name>
+		<X>-800</X>
+		<Y>180</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[int]]></Type>
+			<InitialValue Class="CodeValue">
+				<Code><![CDATA[0]]></Code>
+			</InitialValue>
+		</Properties>
+	</Variable>
+	<Variable Class="PlainVariable">
+		<Id>1783089426600</Id>
+		<Name><![CDATA[v_customGridBatteryGCCounter]]></Name>
+		<X>-800</X>
+		<Y>200</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[int]]></Type>
+			<InitialValue Class="CodeValue">
+				<Code><![CDATA[0]]></Code>
+			</InitialValue>
+		</Properties>
+	</Variable>
+	<Variable Class="PlainVariable">
+		<Id>1783089962441</Id>
+		<Name><![CDATA[b_addCustomGC]]></Name>
+		<X>-800</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[boolean]]></Type>
+			<InitialValue Class="CodeValue">
+				<Code><![CDATA[false]]></Code>
+			</InitialValue>
+		</Properties>
+	</Variable>
+	<Variable Class="PlainVariable">
+		<Id>1783089962453</Id>
+		<Name><![CDATA[b_removeCustomGC]]></Name>
+		<X>-800</X>
+		<Y>130</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[boolean]]></Type>
+			<InitialValue Class="CodeValue">
+				<Code><![CDATA[false]]></Code>
+			</InitialValue>
+		</Properties>
+	</Variable>
+	<Variable Class="PlainVariable">
+		<Id>1783089962464</Id>
+		<Name><![CDATA[b_customGCPolygonCreated]]></Name>
+		<X>-800</X>
+		<Y>70</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[boolean]]></Type>
+			<InitialValue Class="CodeValue">
+				<Code><![CDATA[false]]></Code>
+			</InitialValue>
+		</Properties>
+	</Variable>
+	<Variable Class="PlainVariable">
+		<Id>1783089962476</Id>
+		<Name><![CDATA[previewGISRegionCustomGC]]></Name>
+		<X>-780</X>
+		<Y>360</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[GISRegion]]></Type>
+		</Properties>
+	</Variable>
+	<Variable Class="PlainVariable">
+		<Id>1783089962487</Id>
+		<Name><![CDATA[v_addCustomGCType]]></Name>
+		<X>-800</X>
 		<Y>110</Y>
 		<Label>
 			<X>10</X>
@@ -15,6 +188,28 @@
 		<Properties SaveInSnapshot="true"
               Constant="false"
               AccessType="public"
+              StaticVariable="false">
+			<Type><![CDATA[OL_EnergyAssetType]]></Type>
+			<InitialValue Class="CodeValue">
+				<Code><![CDATA[null]]></Code>
+			</InitialValue>
+		</Properties>
+	</Variable>
+	<Variable Class="PlainVariable">
+		<Id>1783332413594</Id>
+		<Name><![CDATA[v_previousPageIndex]]></Name>
+		<X>-350</X>
+		<Y>120</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[int]]></Type>
 			<InitialValue Class="CodeValue">
@@ -24,7 +219,7 @@
 	</Variable>
 	<Variable Class="Parameter">
 		<Id>1745483322704</Id>
-		<Name><![CDATA[p_currentPVOnLand_ha]]></Name>
+		<Name><![CDATA[p_initialPVOnLand_ha]]></Name>
 		<X>50</X>
 		<Y>1270</Y>
 		<Label>
@@ -52,7 +247,7 @@
 	</Variable>
 	<Variable Class="Parameter">
 		<Id>1745483371462</Id>
-		<Name><![CDATA[p_currentWindTurbines_MW]]></Name>
+		<Name><![CDATA[p_initialWindTurbines_MW]]></Name>
 		<X>50</X>
 		<Y>1290</Y>
 		<Label>
@@ -80,7 +275,7 @@
 	</Variable>
 	<Variable Class="Parameter">
 		<Id>1765276731422</Id>
-		<Name><![CDATA[p_currentTotalGridBatteryCapacity_MWh]]></Name>
+		<Name><![CDATA[p_initialTotalGridBatteryCapacity_MWh]]></Name>
 		<X>50</X>
 		<Y>1340</Y>
 		<Label>
@@ -128,7 +323,7 @@
 		<Id>1777551557373</Id>
 		<Name><![CDATA[c_loadedPageGroups]]></Name>
 		<X>-350</X>
-		<Y>130</Y>
+		<Y>160</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -142,4 +337,96 @@
 			<ValueElementClass>String</ValueElementClass>
 		</Properties>
 	</Variable>
+	<Variable Class="CollectionVariable">
+		<Id>1783089426523</Id>
+		<Name><![CDATA[c_customSolarfarmGCs]]></Name>
+		<X>-800</X>
+		<Y>230</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" AccessType="public" StaticVariable="false">
+			<CollectionClass>ArrayList</CollectionClass>
+			<ElementClass>GridConnection</ElementClass>
+			<ValueElementClass>String</ValueElementClass>
+		</Properties>
+	</Variable>
+	<Variable Class="CollectionVariable">
+		<Id>1783089426542</Id>
+		<Name><![CDATA[c_customWindfarmGCs]]></Name>
+		<X>-800</X>
+		<Y>250</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" AccessType="public" StaticVariable="false">
+			<CollectionClass>ArrayList</CollectionClass>
+			<ElementClass>GridConnection</ElementClass>
+			<ValueElementClass>String</ValueElementClass>
+		</Properties>
+	</Variable>
+	<Variable Class="CollectionVariable">
+		<Id>1783089426559</Id>
+		<Name><![CDATA[c_customGridBatteryGCs]]></Name>
+		<X>-800</X>
+		<Y>270</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" AccessType="public" StaticVariable="false">
+			<CollectionClass>ArrayList</CollectionClass>
+			<ElementClass>GridConnection</ElementClass>
+			<ValueElementClass>String</ValueElementClass>
+		</Properties>
+	</Variable>
+	<Variable Class="CollectionVariable">
+		<Id>1783089962285</Id>
+		<Name><![CDATA[c_tempSavedPointCoordinatesCustomGC]]></Name>
+		<Description><![CDATA[Temporary saved Pair list of various latitude/longitude combinations (for creating a custom EA GC GIS region polygon]]></Description>
+		<X>-780</X>
+		<Y>320</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" AccessType="public" StaticVariable="false">
+			<CollectionClass>ArrayList</CollectionClass>
+			<ElementClass>Point</ElementClass>
+			<ValueElementClass>String</ValueElementClass>
+		</Properties>
+	</Variable>
+	<Variable Class="CollectionVariable">
+		<Id>1783089962303</Id>
+		<Name><![CDATA[c_tempSavedDotGISRegionsCustomGC]]></Name>
+		<Description><![CDATA[Temporary saved GIS_Object which represent the latitude/longitude coordinates saved in c_tempSavedCoordinates]]></Description>
+		<X>-780</X>
+		<Y>340</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" AccessType="public" StaticVariable="false">
+			<CollectionClass>ArrayList</CollectionClass>
+			<ElementClass>GISRegion</ElementClass>
+			<ValueElementClass>String</ValueElementClass>
+		</Properties>
+	</Variable>
 </Variables>
diff --git a/_alp/Classes/Class.J_SliderSettings_Residential.java b/_alp/Classes/Class.J_SliderSettings_Residential.java
index 386ba609..c69e5f99 100644
--- a/_alp/Classes/Class.J_SliderSettings_Residential.java
+++ b/_alp/Classes/Class.J_SliderSettings_Residential.java
@@ -11,7 +11,7 @@ public class J_SliderSettings_Residential {
 	private double electricityDemandIncrease_pct;
 	private double largeScalePV_ha;
 	private double largeScaleWind_MW;
-	private double averageNeighbourhoodBatterySize_kWh;
+	private double averageNeighbourhoodBatterySize_MWh;
 	private boolean cb_gridCurtailmentActive;
 
 	////Heating
@@ -73,8 +73,8 @@ public void setLargeScaleWind_MW(double largeScaleWind_MW) {
 	    this.largeScaleWind_MW = largeScaleWind_MW;
 	}
 
-	public void setAverageNeighbourhoodBatterySize_kWh(double averageNeighbourhoodBatterySize_kWh) {
-	    this.averageNeighbourhoodBatterySize_kWh = averageNeighbourhoodBatterySize_kWh;
+	public void setAverageNeighbourhoodBatterySize_MWh(double averageNeighbourhoodBatterySize_MWh) {
+	    this.averageNeighbourhoodBatterySize_MWh = averageNeighbourhoodBatterySize_MWh;
 	}
 	
 	public void setCb_gridCurtailmentActive(boolean cb_gridCurtailmentActive) {
@@ -181,8 +181,8 @@ public double getLargeScaleWind_MW() {
 	    return largeScaleWind_MW;
 	}
 
-	public double getAverageNeighbourhoodBatterySize_kWh() {
-	    return averageNeighbourhoodBatterySize_kWh;
+	public double getAverageNeighbourhoodBatterySize_MWh() {
+	    return averageNeighbourhoodBatterySize_MWh;
 	}
 	
 	public boolean getCb_gridCurtailmentActive() {