From bbcf45a00be5898adec6a10f776647733f4457a2 Mon Sep 17 00:00:00 2001
From: Luc-Sol <luc@solidegroep.nl>
Date: Thu, 15 May 2025 12:17:24 +0200
Subject: [PATCH 1/7] PV sliders

Split collection ordered PV Systems into two, one for houses and one for companies.
Started working on list of GCs as argument to the slider functions.
Added the function that calculates the percentage
---
 .../Agents/Zero_Interface/Code/Functions.java | 30 +++++++++-
 _alp/Agents/Zero_Interface/Variables.xml      | 40 +++++++++----
 .../Agents/tabElectricity/Code/Functions.java | 56 +++++++++++++++----
 _alp/Agents/tabElectricity/Code/Functions.xml | 46 +++++++++++++++
 .../tabElectricity/Levels/Level.level.xml     | 25 +++++++++
 5 files changed, 171 insertions(+), 26 deletions(-)

diff --git a/_alp/Agents/Zero_Interface/Code/Functions.java b/_alp/Agents/Zero_Interface/Code/Functions.java
index 0b0c5d1e..2b07a992 100644
--- a/_alp/Agents/Zero_Interface/Code/Functions.java
+++ b/_alp/Agents/Zero_Interface/Code/Functions.java
@@ -615,6 +615,7 @@ else if (v_previousClickedObjectType == OL_GISObjectType.BUILDING ||
 
 double f_initialPVSystemsOrder()
 {/*ALCODESTART::1714130288661*/
+/*
 // First we make a copy of all the Uitility GridConnections
 List<GridConnection> GCs = new ArrayList<>(energyModel.f_getGridConnections());
 List<GridConnection> GCs_detailedCompanies = new ArrayList<>(energyModel.f_getGridConnections());
@@ -643,6 +644,29 @@ else if (v_previousClickedObjectType == OL_GISObjectType.BUILDING ||
 
 c_orderedPVSystems = otherGCs;
 c_orderedPVSystems.addAll(datailedCompanyGCsnoPV);
+*/
+
+List<GCHouse> houses = new ArrayList<GCHouse>(energyModel.Houses.findAll( x -> true));
+List<GCHouse> housesWithoutPV = houses.stream().filter( gc -> !gc.v_hasPV ).collect(Collectors.toList());
+List<GCHouse> housesWithPV = new ArrayList<>(houses);
+housesWithPV.removeAll(housesWithoutPV);
+
+c_orderedPVSystemsHouses = new ArrayList<>(housesWithoutPV);
+c_orderedPVSystemsHouses.addAll(housesWithPV);
+
+
+List<GCUtility> companies = new ArrayList<GCUtility>(energyModel.UtilityConnections.findAll( x -> true));
+List<GCUtility> companiesWithoutPV = companies.stream().filter( gc -> !gc.v_hasPV ).collect(Collectors.toList());
+List<GCUtility> companiesWithPV = companies.stream().filter( gc -> gc.v_hasPV ).collect(Collectors.toList());
+List<GCUtility> detailedCompaniesWithPV = companiesWithPV.stream().filter( gc -> gc.p_owner != null && gc.p_owner.p_detailedCompany ).collect(Collectors.toList());
+List<GCUtility> genericCompaniesWithPV = new ArrayList<>(companiesWithPV);
+genericCompaniesWithPV.removeAll(detailedCompaniesWithPV);
+
+c_orderedPVSystemsCompanies = new ArrayList<>(companiesWithoutPV);
+c_orderedPVSystemsCompanies.addAll(genericCompaniesWithPV);
+c_orderedPVSystemsCompanies.addAll(detailedCompaniesWithPV);
+
+
 /*ALCODEEND*/}
 
 double f_initialElectricVehiclesOrder()
@@ -1021,7 +1045,7 @@ else if (vehicle instanceof J_EAHydrogenVehicle && vehicle.getEAType() == OL_Ene
 double f_setColorsBasedOnGridTopology_objects(GIS_Object gis_area)
 {/*ALCODESTART::1718566260603*/
 if (gis_area.c_containedGridConnections.size() > 0) {
-	Color c = gis_area.c_containedGridConnections.get(0).l_parentNodeElectric.getConnectedAgent().p_uniqueColor;
+	Color c = gis_area.c_containedGridConnections.get(0).p_parentNodeElectric.p_uniqueColor;
 	gis_area.f_style(c, black, 1.0, null);
 }
 /*ALCODEEND*/}
@@ -1614,7 +1638,7 @@ else if(c_selectedFilterOptions.contains(selectedFilter_OL)){ // Remove filter
 		if (b.gisRegion.isVisible()) { //only allow us to click on visible objects
 			if (b.c_containedGridConnections.size() > 0 ) { // only allow buildings with gridconnections
 				GridConnection clickedGridConnection = b.c_containedGridConnections.get(0); // Find buildings powered by the same GC as the clicked building
-				GridNode clickedGridConnectionConnectedGridNode = clickedGridConnection.l_parentNodeElectric.getConnectedAgent();
+				GridNode clickedGridConnectionConnectedGridNode = clickedGridConnection.p_parentNodeElectric;
 				ArrayList<GridNode> allGridNodes = new ArrayList<GridNode>(energyModel.f_getGridNodesTopLevel());
 				allGridNodes.addAll(energyModel.f_getGridNodesNotTopLevel());
 				
@@ -1626,7 +1650,7 @@ else if(c_selectedFilterOptions.contains(selectedFilter_OL)){ // Remove filter
 						clickedGridConnectionConnectedGridNode = findFirst(allGridNodes, GN -> GN.p_gridNodeID.equals(parentNodeName));
 					}
 					else{ // At top node --> select the directly attached grid node instead, and break out of while loop.
-						clickedGridConnectionConnectedGridNode = clickedGridConnection.l_parentNodeElectric.getConnectedAgent();
+						clickedGridConnectionConnectedGridNode = clickedGridConnection.p_parentNodeElectric;
 						break;
 					}
 				}	
diff --git a/_alp/Agents/Zero_Interface/Variables.xml b/_alp/Agents/Zero_Interface/Variables.xml
index 6c12cb15..033b1208 100644
--- a/_alp/Agents/Zero_Interface/Variables.xml
+++ b/_alp/Agents/Zero_Interface/Variables.xml
@@ -2411,7 +2411,7 @@
 		<Id>1715178022675</Id>
 		<Name><![CDATA[c_orderedVehicles]]></Name>
 		<X>68</X>
-		<Y>-550</Y>
+		<Y>-535</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2429,7 +2429,7 @@
 		<Id>1715183417595</Id>
 		<Name><![CDATA[c_orderedHeatingSystemsCompanies]]></Name>
 		<X>68</X>
-		<Y>-525</Y>
+		<Y>-510</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2445,9 +2445,9 @@
 	</Variable>
 	<Variable Class="CollectionVariable">
 		<Id>1715183423011</Id>
-		<Name><![CDATA[c_orderedPVSystems]]></Name>
+		<Name><![CDATA[c_orderedPVSystemsCompanies]]></Name>
 		<X>68</X>
-		<Y>-570</Y>
+		<Y>-575</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2457,7 +2457,7 @@
 		<ShowLabel>true</ShowLabel>
 		<Properties SaveInSnapshot="true" AccessType="public" StaticVariable="false">
 			<CollectionClass>ArrayList</CollectionClass>
-			<ElementClass>GridConnection</ElementClass>
+			<ElementClass>GCUtility</ElementClass>
 			<ValueElementClass>String</ValueElementClass>
 		</Properties>
 	</Variable>
@@ -2465,7 +2465,7 @@
 		<Id>1719176257019</Id>
 		<Name><![CDATA[c_orderedHeatingSystemsHouses]]></Name>
 		<X>68</X>
-		<Y>-505</Y>
+		<Y>-490</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2483,7 +2483,7 @@
 		<Id>1720174179054</Id>
 		<Name><![CDATA[c_orderedHousesPrivateParking]]></Name>
 		<X>70</X>
-		<Y>-470</Y>
+		<Y>-455</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2501,7 +2501,7 @@
 		<Id>1720174197464</Id>
 		<Name><![CDATA[c_orderedHousesPublicParking]]></Name>
 		<X>70</X>
-		<Y>-450</Y>
+		<Y>-435</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2519,7 +2519,7 @@
 		<Id>1720376141906</Id>
 		<Name><![CDATA[c_activePublicChargers]]></Name>
 		<X>70</X>
-		<Y>-380</Y>
+		<Y>-365</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2537,7 +2537,7 @@
 		<Id>1720376165741</Id>
 		<Name><![CDATA[c_inactivePublicChargers]]></Name>
 		<X>70</X>
-		<Y>-360</Y>
+		<Y>-345</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2555,7 +2555,7 @@
 		<Id>1720376624239</Id>
 		<Name><![CDATA[c_fixedPublicChargers]]></Name>
 		<X>70</X>
-		<Y>-400</Y>
+		<Y>-385</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2805,4 +2805,22 @@
 			<ValueElementClass>String</ValueElementClass>
 		</Properties>
 	</Variable>
+	<Variable Class="CollectionVariable">
+		<Id>1747300275742</Id>
+		<Name><![CDATA[c_orderedPVSystemsHouses]]></Name>
+		<X>68</X>
+		<Y>-555</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>GCHouse</ElementClass>
+			<ValueElementClass>String</ValueElementClass>
+		</Properties>
+	</Variable>
 </Variables>
diff --git a/_alp/Agents/tabElectricity/Code/Functions.java b/_alp/Agents/tabElectricity/Code/Functions.java
index 3c33ee53..724289c2 100644
--- a/_alp/Agents/tabElectricity/Code/Functions.java
+++ b/_alp/Agents/tabElectricity/Code/Functions.java
@@ -10,7 +10,7 @@
 
 if( PV_pct/100.0 < PVsystems/totalActiveUtilityConnections ){
 	while ( PV_pct/100.0*totalActiveUtilityConnections < PVsystems) { // remove excess PV systems
-		GridConnection gc = findFirst(zero_Interface.c_orderedPVSystems, x->x.v_hasPV==true);
+		GCUtility gc = findFirst(zero_Interface.c_orderedPVSystemsCompanies, x->x.v_hasPV==true);
 		
 		if(gc != null){
 			// update UI company
@@ -31,8 +31,8 @@
 			//traceln("Found PV system: " + pvAsset);
 			if (pvAsset!=null) {
 				pvAsset.removeEnergyAsset();
-				zero_Interface.c_orderedPVSystems.remove(gc);
-				zero_Interface.c_orderedPVSystems.add(0, gc);
+				zero_Interface.c_orderedPVSystemsCompanies.remove(gc);
+				zero_Interface.c_orderedPVSystemsCompanies.add(0, gc);
 				//traceln("Removing PV from GridConnection:" + h.p_gridConnectionID);
 			}
 			else{
@@ -58,7 +58,7 @@
 else {
 	while ( PV_pct/100.0 > PVsystems/totalActiveUtilityConnections) {
 
-		GridConnection gc = findFirst(zero_Interface.c_orderedPVSystems, x->x.v_hasPV==false);
+		GCUtility gc = findFirst(zero_Interface.c_orderedPVSystemsCompanies, x->x.v_hasPV==false);
 		if (gc == null){
 			traceln("No gridconnection without PV panels found! Current PVsystems count: %s", PVsystems);
 			break;
@@ -77,8 +77,8 @@
 			J_EAProduction productionAsset = new J_EAProduction ( gc, assetType, assetName, capacityElectricity_kW, capacityHeat_kW, yearlyProductionMethane_kWh, yearlyProductionHydrogen_kWh, zero_Interface.energyModel.p_timeStep_h, outputTemperature_degC, zero_Interface.energyModel.pp_solarPVproduction );
 			
 			//Add GC to top of the orderd pv systems so it will be found first when removing.
-			zero_Interface.c_orderedPVSystems.remove(gc);
-			zero_Interface.c_orderedPVSystems.add(0, gc);
+			zero_Interface.c_orderedPVSystemsCompanies.remove(gc);
+			zero_Interface.c_orderedPVSystemsCompanies.add(0, gc);
 		
 			PVsystems++;
 			//traceln("Added PV to GridConnection: " + gc.p_gridConnectionID + "With capacity [kW]: " + capacityElectricity_kW);
@@ -151,12 +151,12 @@
 
 if( PV_pct /100.0 < nbHousesWithPV / zero_Interface.energyModel.Houses.size() ){
 	while ( PV_pct / 100.0 * zero_Interface.energyModel.Houses.size() < nbHousesWithPV ) { // remove excess PV systems
-		GridConnection house = findFirst(zero_Interface.c_orderedPVSystems, x -> x.v_hasPV == true);		
+		GCHouse house = findFirst(zero_Interface.c_orderedPVSystemsHouses, x -> x.v_hasPV == true);	
 		J_EA pvAsset = findFirst(house.c_productionAssets, p -> p.energyAssetType == OL_EnergyAssetType.PHOTOVOLTAIC );
 		if (pvAsset != null) {
 			pvAsset.removeEnergyAsset();
-			zero_Interface.c_orderedPVSystems.remove( house) ;
-			zero_Interface.c_orderedPVSystems.add(0, house) ;
+			zero_Interface.c_orderedPVSystemsHouses.remove( house) ;
+			zero_Interface.c_orderedPVSystemsHouses.add(0, house) ;
 			nbHousesWithPV --; 
 		}
 		else {
@@ -167,7 +167,7 @@
 }
 else {
 	while ( PV_pct / 100.0 > nbHousesWithPV / zero_Interface.energyModel.Houses.size()) {
-		GridConnection house = findFirst(zero_Interface.c_orderedPVSystems, x -> x.v_hasPV == false);
+		GCHouse house = findFirst(zero_Interface.c_orderedPVSystemsHouses, x -> x.v_hasPV == false);
 		if (house == null){
 			traceln("No gridconnection without PV panels found! Current PVsystems count: %s", nbHousesWithPV);
 			break;
@@ -181,8 +181,8 @@
 			double installedPVCapacity_kW = uniform(3,6);
 
 			J_EAProduction productionAsset = new J_EAProduction ( house, OL_EnergyAssetType.PHOTOVOLTAIC, assetName, installedPVCapacity_kW, capacityHeat_kW, yearlyProductionMethane_kWh, yearlyProductionHydrogen_kWh, zero_Interface.energyModel.p_timeStep_h, outputTemperature_degC, zero_Interface.energyModel.pp_solarPVproduction );
-			zero_Interface.c_orderedPVSystems.remove(house);
-			zero_Interface.c_orderedPVSystems.add(0, house);
+			zero_Interface.c_orderedPVSystemsHouses.remove(house);
+			zero_Interface.c_orderedPVSystemsHouses.add(0, house);
 			nbHousesWithPV ++;	
 		}
 	}
@@ -506,3 +506,35 @@ else if(ea.energyAssetType == OL_EnergyAssetType.WINDMILL){
 }
 /*ALCODEEND*/}
 
+double f_getPVSystemPercentage(List<GridConnection> gcList)
+{/*ALCODESTART::1747294812333*/
+double installedPV_kWp = 0.0;
+double PVPotential_kWp = 0.0;
+double averageEffectivePV_kWppm2 = zero_Interface.energyModel.avgc_data.p_avgRatioRoofPotentialPV * zero_Interface.energyModel.avgc_data.p_avgPVPower_kWpm2;
+
+for (GridConnection gc : gcList ) {
+	double gcInstalledPV_kWp = 0.0;
+	if ( gc.v_hasPV ) {
+		for ( J_EAProduction j_ea : gc.c_productionAssets ) {
+			if ( j_ea.getEAType() == OL_EnergyAssetType.PHOTOVOLTAIC ) {
+				gcInstalledPV_kWp += j_ea.getCapacityElectric_kW();
+			}
+		}
+	}
+	installedPV_kWp += gcInstalledPV_kWp;
+	PVPotential_kWp += max( gcInstalledPV_kWp, max(0.1, gc.p_roofSurfaceArea_m2 * averageEffectivePV_kWppm2) );
+}
+
+return installedPV_kWp / PVPotential_kWp * 100.0;
+/*ALCODEEND*/}
+
+double f_setPVSystem(List<GridConnection> gcList,double target_pct)
+{/*ALCODESTART::1747297871195*/
+//List<GridConnection> GCs = new ArrayList<GridConnection>(zero_Interface.c_orderedPVSystems);
+//GCs.retainAll(gcList);
+
+//traceln(GCs);
+
+//traceln(f_getPVSystemPercentage(gcList));
+/*ALCODEEND*/}
+
diff --git a/_alp/Agents/tabElectricity/Code/Functions.xml b/_alp/Agents/tabElectricity/Code/Functions.xml
index 8890144b..1b0a0b0f 100644
--- a/_alp/Agents/tabElectricity/Code/Functions.xml
+++ b/_alp/Agents/tabElectricity/Code/Functions.xml
@@ -318,4 +318,50 @@
 		<ShowLabel>true</ShowLabel>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1747294812333</Id>
+		<Name><![CDATA[f_getPVSystemPercentage]]></Name>
+		<Description><![CDATA[Calculates the percentage of installed PV compared to the total potential based on roof surface area. Assumes that 50% of the roof surface is available for PV. If a GridConnection already has more than this installed it takes the installed capacity instead.]]></Description>
+		<X>430</X>
+		<Y>740</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gcList]]></Name>
+			<Type><![CDATA[List<GridConnection>]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1747297871195</Id>
+		<Name><![CDATA[f_setPVSystem]]></Name>
+		<Description><![CDATA[Adds or removes photovoltaic production assets to GridConnections. Takes as arguments a list of Gridconnections and a target percentage. It runs untill that list of GCs has that percentage of PV installed. If a new asset is created it determines its electric capacity by the total roof area of all the buildings connected to the GC. The function also updates the PV slider in the company UI if the GC is a company. The variables in the engine that keep track of the amount of installed PV are updated automatically.]]></Description>
+		<X>430</X>
+		<Y>700</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gcList]]></Name>
+			<Type><![CDATA[List<GridConnection>]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[target_pct]]></Name>
+			<Type><![CDATA[double]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
 </Functions>
diff --git a/_alp/Agents/tabElectricity/Levels/Level.level.xml b/_alp/Agents/tabElectricity/Levels/Level.level.xml
index d1b401ed..229ac1fc 100644
--- a/_alp/Agents/tabElectricity/Levels/Level.level.xml
+++ b/_alp/Agents/tabElectricity/Levels/Level.level.xml
@@ -2763,4 +2763,29 @@ f_setPublicChargingStationsScale(sliderValue);</ActionCode>
 			</Image>
 		</Presentation>
 	</Group>
+	<Control Type="Button">
+		<EmbeddedIcon>false</EmbeddedIcon>
+		<Id>1747298732893</Id>
+		<Name><![CDATA[button]]></Name>
+		<X>440</X>
+		<Y>790</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>
+			<TextColor/>
+			<Enabled>true</Enabled>
+			<ActionCode>f_setPVSystem(zero_Interface.energyModel.f_getGridConnections().subList(0,5), 10.0);</ActionCode>
+		</BasicProperties>
+		<ExtendedProperties>
+			<Font Name="Dialog" Size="11" Style="0"/>
+			<LabelText>button</LabelText>
+		</ExtendedProperties>
+	</Control>
 </Presentation>

From 4464dcfe1b7c53cee286f18aeff15b958bf313a4 Mon Sep 17 00:00:00 2001
From: Luc-Sol <luc@solidegroep.nl>
Date: Mon, 19 May 2025 14:53:24 +0200
Subject: [PATCH 2/7] Added function that sets the PV Systems

Still a seperate function for houses and companies, but they use the same helper function to add or remove the assets
---
 .../Agents/tabElectricity/Code/Functions.java | 107 ++++++++++++++++--
 _alp/Agents/tabElectricity/Code/Functions.xml |  76 +++++++++++--
 .../tabElectricity/Levels/Level.level.xml     |   2 +-
 3 files changed, 169 insertions(+), 16 deletions(-)

diff --git a/_alp/Agents/tabElectricity/Code/Functions.java b/_alp/Agents/tabElectricity/Code/Functions.java
index 724289c2..27154f74 100644
--- a/_alp/Agents/tabElectricity/Code/Functions.java
+++ b/_alp/Agents/tabElectricity/Code/Functions.java
@@ -506,7 +506,7 @@ else if(ea.energyAssetType == OL_EnergyAssetType.WINDMILL){
 }
 /*ALCODEEND*/}
 
-double f_getPVSystemPercentage(List<GridConnection> gcList)
+Pair<Double, Double> f_getPVSystemPercentage(List<GridConnection> gcList)
 {/*ALCODESTART::1747294812333*/
 double installedPV_kWp = 0.0;
 double PVPotential_kWp = 0.0;
@@ -525,16 +525,109 @@ else if(ea.energyAssetType == OL_EnergyAssetType.WINDMILL){
 	PVPotential_kWp += max( gcInstalledPV_kWp, max(0.1, gc.p_roofSurfaceArea_m2 * averageEffectivePV_kWppm2) );
 }
 
-return installedPV_kWp / PVPotential_kWp * 100.0;
+return new Pair(installedPV_kWp, PVPotential_kWp);
 /*ALCODEEND*/}
 
-double f_setPVSystem(List<GridConnection> gcList,double target_pct)
+double f_setPVSystemCompanies(List<GCUtility> gcList,double target_pct)
 {/*ALCODESTART::1747297871195*/
-//List<GridConnection> GCs = new ArrayList<GridConnection>(zero_Interface.c_orderedPVSystems);
-//GCs.retainAll(gcList);
+Pair<Double, Double> pair = f_getPVSystemPercentage();
+double remaining_kWp = target_pct * pair.getSecond() - pair.getFirst();
+double averageEffectivePV_kWppm2 = zero_Interface.energyModel.avgc_data.p_avgRatioRoofPotentialPV * zero_Interface.energyModel.avgc_data.p_avgPVPower_kWpm2;
+
+if ( remaining_kWp > 0 ) {
+	// add more PV
+	for ( GCUtility company : zero_Interface.c_orderedPVSystemsCompany ) {
+		double remainingPotential_kWp = company.p_roofSurfaceArea_m2 * averageEffectivePV_kWppm2 - company.v_liveAssetsMetaData.totalInstalledPVPower_kW;
+		if ( remainingPotential_kWp > 0 ) {
+			remaining_kWp -= remainingPotential_kWp
+			f_addPVSystem( company, remainingPotential_kWp );
+		}
+		
+		if ( remaining_kWp <= 0 ) {
+			return;
+		}
+	}
+}
+else {
+	// remove pv
+	for ( GCUtility company : zero_Interface.c_orderedPVSystemsCompany ) {
+		if ( company.v_liveAssetsMetaData.hasPV || gc.v_hasPV ) {
+			remaining_kWp += company.v_liveAssetsMetaData.totalInstalledPVPower_kW
+			f_removePVSystem( company );
+		}
+		if ( remaining_kWp >= 0 ) {
+			// removed slightly too much pv
+			f_addPVSystem( company, remaining_kWp );
+			return;
+		}
+	}
+}
+/*ALCODEEND*/}
+
+double f_addPVSystem(GridConnection gc,double capacity_kWp)
+{/*ALCODESTART::1747306690517*/
+if ( gc.v_liveAssetsMetaData.hasPV || gc.v_hasPV ) { // This boolean exists in 2 places...
+	// Add the capacity to the existing asset
+	J_EAProduction pvAsset = findFirst(gc.c_productionAssets, p -> p.energyAssetType == OL_EnergyAssetType.PHOTOVOLTAIC);
+	if ( pvAsset == null ) {
+		throw new RuntimeException("Could not find photovoltaic asset in GridConnection: " + gc.p_ownerID + ", even though hasPV is True.");
+	}
+	pvAsset.setCapacityElectric_kW( pvAsset.getCapacityElectric_kW() + capacity_kWp );
+}
+else {
+	// Create a new asset
+	OL_EnergyAssetType assetType = OL_EnergyAssetType.PHOTOVOLTAIC;
+	String assetName = "Rooftop PV";
+	double capacityHeat_kW = 0.0;
+	double yearlyProductionMethane_kWh = 0.0;
+	double yearlyProductionHydrogen_kWh = 0.0;
+	double outputTemperature_degC = 0.0;
+	
+	J_EAProduction productionAsset = new J_EAProduction ( gc, assetType, assetName, capacity_kWp, capacityHeat_kW, yearlyProductionMethane_kWh, yearlyProductionHydrogen_kWh, zero_Interface.energyModel.p_timeStep_h, outputTemperature_degC, zero_Interface.energyModel.pp_solarPVproduction );
+}
+
+// Update the ordered collection
+if ( gc instanceof GCHouse ) {
+	zero_Interface.c_orderedPVSystemsHouses.remove(gc);
+	zero_Interface.c_orderedPVSystemsHouses.add(0, gc);	
+}
+else if ( gc instanceof GCUtility ) {
+	zero_Interface.c_orderedPVSystemsCompanies.remove(gc);
+	zero_Interface.c_orderedPVSystemsCompanies.add(0, gc);
+	// update company UI
+	if ( zero_Interface.c_companyUIs.size() > 0 ) {
+		if ( gc.p_owner != null ) {
+			UI_company companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
+			if ( companyUI.c_ownedGridConnections.get(companyUI.v_currentSelectedGCnr) == gc ) {
+				companyUI.sl_rooftopPVCompany.setValue(roundToInt(capacityElectricity_kW), false);
+				companyUI.v_defaultPVSlider = roundToInt(capacityElectricity_kW);
+			}
+		}
+	}
+}
+else {
+	throw new RuntimeException("Unknown GridConnection type passed to f_addPVSystem.");
+}
+
+
+//Color the buildings when in solar color mode
+if ( zero_Interface.rb_buildingColors.getValue() == 2 ) {
+	for ( GIS_Object building : gc.c_connectedGISObjects ) {
+		zero_Interface.f_styleAreas(building);
+	}
+}
+/*ALCODEEND*/}
+
+double f_removePVSystem(GridConnection gc)
+{/*ALCODESTART::1747306699629*/
+J_EAProduction pvAsset = findFirst(gc.c_productionAssets, p -> p.energyAssetType == OL_EnergyAssetType.PHOTOVOLTAIC);
+if ( pvAsset != null ) {
+	pvAsset.removeEnergyAsset();
+}
+/*ALCODEEND*/}
 
-//traceln(GCs);
+double f_updateCompanyUI()
+{/*ALCODESTART::1747307194121*/
 
-//traceln(f_getPVSystemPercentage(gcList));
 /*ALCODEEND*/}
 
diff --git a/_alp/Agents/tabElectricity/Code/Functions.xml b/_alp/Agents/tabElectricity/Code/Functions.xml
index 1b0a0b0f..e80f13d5 100644
--- a/_alp/Agents/tabElectricity/Code/Functions.xml
+++ b/_alp/Agents/tabElectricity/Code/Functions.xml
@@ -320,12 +320,12 @@
 	</Function>
 	<Function AccessType="default" StaticFunction="false">
 		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
-		<ReturnType>double</ReturnType>
+		<ReturnType>Pair&lt;Double, Double&gt;</ReturnType>
 		<Id>1747294812333</Id>
 		<Name><![CDATA[f_getPVSystemPercentage]]></Name>
-		<Description><![CDATA[Calculates the percentage of installed PV compared to the total potential based on roof surface area. Assumes that 50% of the roof surface is available for PV. If a GridConnection already has more than this installed it takes the installed capacity instead.]]></Description>
+		<Description><![CDATA[Calculates the amount of installed PV compared to the total potential based on roof surface area. Assumes that 50% of the roof surface is available for PV. If a GridConnection already has more than this installed it takes the installed capacity instead.]]></Description>
 		<X>430</X>
-		<Y>740</Y>
+		<Y>800</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -343,20 +343,20 @@
 		<ReturnModificator>VOID</ReturnModificator>
 		<ReturnType>double</ReturnType>
 		<Id>1747297871195</Id>
-		<Name><![CDATA[f_setPVSystem]]></Name>
+		<Name><![CDATA[f_setPVSystemCompanies]]></Name>
 		<Description><![CDATA[Adds or removes photovoltaic production assets to GridConnections. Takes as arguments a list of Gridconnections and a target percentage. It runs untill that list of GCs has that percentage of PV installed. If a new asset is created it determines its electric capacity by the total roof area of all the buildings connected to the GC. The function also updates the PV slider in the company UI if the GC is a company. The variables in the engine that keep track of the amount of installed PV are updated automatically.]]></Description>
-		<X>430</X>
-		<Y>700</Y>
+		<X>410</X>
+		<Y>540</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
 		</Label>
 		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
+		<PresentationFlag>false</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
 		<Parameter>
 			<Name><![CDATA[gcList]]></Name>
-			<Type><![CDATA[List<GridConnection>]]></Type>
+			<Type><![CDATA[List<GCUtility>]]></Type>
 		</Parameter>
 		<Parameter>
 			<Name><![CDATA[target_pct]]></Name>
@@ -364,4 +364,64 @@
 		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1747306690517</Id>
+		<Name><![CDATA[f_addPVSystem]]></Name>
+		<Description><![CDATA[Takes as an argument a GridConnection and a capacity. If the GC already has a solar panel, it adds the capacity to the existing one. Otherwise it creates a new energy asset. If the GridConnection is a GCUtility it also updates the companyUI if it exists.]]></Description>
+		<X>460</X>
+		<Y>620</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[capacity_kWp]]></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>1747306699629</Id>
+		<Name><![CDATA[f_removePVSystem]]></Name>
+		<X>460</X>
+		<Y>640</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>1747307194121</Id>
+		<Name><![CDATA[f_updateCompanyUI]]></Name>
+		<X>450</X>
+		<Y>740</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+	</Function>
 </Functions>
diff --git a/_alp/Agents/tabElectricity/Levels/Level.level.xml b/_alp/Agents/tabElectricity/Levels/Level.level.xml
index 229ac1fc..5d998de4 100644
--- a/_alp/Agents/tabElectricity/Levels/Level.level.xml
+++ b/_alp/Agents/tabElectricity/Levels/Level.level.xml
@@ -2768,7 +2768,7 @@ f_setPublicChargingStationsScale(sliderValue);</ActionCode>
 		<Id>1747298732893</Id>
 		<Name><![CDATA[button]]></Name>
 		<X>440</X>
-		<Y>790</Y>
+		<Y>830</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>

From 245b89190c098f6467d2558efc909d3056ddb871 Mon Sep 17 00:00:00 2001
From: Luc-Sol <luc@solidegroep.nl>
Date: Wed, 21 May 2025 15:15:32 +0200
Subject: [PATCH 3/7] Company / Houses PV Sliders

For companies the PV Slider scales with the total potential (based on roof surface area).
For houses the slider is still just a percentage of households that have PV on their roof. If they do the amount is still randomised, which means this slider is still inconsistent, but for a large amount of houses this will average out. It is not a reasonable to assume that the amount of PV for households scales linearly with roof surface area, most houses determine their amount of PV based on the expected self consumption, which is usually the restricting factor
---
 _alp/Agents/UI_company/Code/Functions.java    |   6 +-
 .../Agents/Zero_Interface/Code/Functions.java |  14 +-
 .../Agents/tabElectricity/Code/Functions.java | 214 +++++++-----------
 _alp/Agents/tabElectricity/Code/Functions.xml |  72 +++---
 .../tabElectricity/Levels/Level.level.xml     |  33 +--
 _alp/Agents/tabElectricity/Variables.xml      |  23 --
 _alp/Classes/Class.J_InfoText.java            |   2 +-
 7 files changed, 126 insertions(+), 238 deletions(-)

diff --git a/_alp/Agents/UI_company/Code/Functions.java b/_alp/Agents/UI_company/Code/Functions.java
index e2fa554a..fc253548 100644
--- a/_alp/Agents/UI_company/Code/Functions.java
+++ b/_alp/Agents/UI_company/Code/Functions.java
@@ -422,7 +422,7 @@ else if (batteryAsset == null) {
 
 double f_setPVSystem(GridConnection GC,double v_rooftopPV_kWp)
 {/*ALCODESTART::1713954180112*/
-if (GC.v_hasPV){
+if (GC.v_liveAssetsMetaData.hasPV){
 	J_EAProduction pvAsset = findFirst(GC.c_productionAssets, p -> p.energyAssetType == OL_EnergyAssetType.PHOTOVOLTAIC );
 	if (v_rooftopPV_kWp == 0) {
 		pvAsset.removeEnergyAsset();;
@@ -1521,7 +1521,7 @@ else if(setAmountOfVehicles < local_HydrogenV_nb){ // Slider has decreased the a
 double yearlyProductionHydrogen_kWh = 0;
 double timestep_h 					= zero_Interface.energyModel.p_timeStep_h;
 double outputTemperature_degC 		= 0;
-parentGC.v_hasPV = true;
+parentGC.v_liveAssetsMetaData.hasPV = true;
 
 J_EAProduction production_asset = new J_EAProduction(parentGC, asset_type, asset_name, capacityElectric_kW , capacityHeat_kW, yearlyProductionMethane_kWh, yearlyProductionHydrogen_kWh, timestep_h, outputTemperature_degC, zero_Interface.energyModel.pp_solarPVproduction);
 
@@ -1626,7 +1626,7 @@ else if(setAmountOfVehicles < local_HydrogenV_nb){ // Slider has decreased the a
 
 //Find the current PV capacity
 int PVCapacityCurrent = 0;
-if (c_ownedGridConnections.get(v_currentSelectedGCnr).v_hasPV){
+if (c_ownedGridConnections.get(v_currentSelectedGCnr).v_liveAssetsMetaData.hasPV){
 	J_EAProduction pvAsset = findFirst(c_ownedGridConnections.get(v_currentSelectedGCnr).c_productionAssets, p -> p.energyAssetType == OL_EnergyAssetType.PHOTOVOLTAIC );
 	PVCapacityCurrent = roundToInt(pvAsset.getCapacityElectric_kW());
 }
diff --git a/_alp/Agents/Zero_Interface/Code/Functions.java b/_alp/Agents/Zero_Interface/Code/Functions.java
index 2b07a992..e83e2e5a 100644
--- a/_alp/Agents/Zero_Interface/Code/Functions.java
+++ b/_alp/Agents/Zero_Interface/Code/Functions.java
@@ -647,7 +647,7 @@ else if (v_previousClickedObjectType == OL_GISObjectType.BUILDING ||
 */
 
 List<GCHouse> houses = new ArrayList<GCHouse>(energyModel.Houses.findAll( x -> true));
-List<GCHouse> housesWithoutPV = houses.stream().filter( gc -> !gc.v_hasPV ).collect(Collectors.toList());
+List<GCHouse> housesWithoutPV = houses.stream().filter( gc -> !gc.v_liveAssetsMetaData.hasPV ).collect(Collectors.toList());
 List<GCHouse> housesWithPV = new ArrayList<>(houses);
 housesWithPV.removeAll(housesWithoutPV);
 
@@ -656,8 +656,8 @@ else if (v_previousClickedObjectType == OL_GISObjectType.BUILDING ||
 
 
 List<GCUtility> companies = new ArrayList<GCUtility>(energyModel.UtilityConnections.findAll( x -> true));
-List<GCUtility> companiesWithoutPV = companies.stream().filter( gc -> !gc.v_hasPV ).collect(Collectors.toList());
-List<GCUtility> companiesWithPV = companies.stream().filter( gc -> gc.v_hasPV ).collect(Collectors.toList());
+List<GCUtility> companiesWithoutPV = companies.stream().filter( gc -> !gc.v_liveAssetsMetaData.hasPV ).collect(Collectors.toList());
+List<GCUtility> companiesWithPV = companies.stream().filter( gc -> gc.v_liveAssetsMetaData.hasPV ).collect(Collectors.toList());
 List<GCUtility> detailedCompaniesWithPV = companiesWithPV.stream().filter( gc -> gc.p_owner != null && gc.p_owner.p_detailedCompany ).collect(Collectors.toList());
 List<GCUtility> genericCompaniesWithPV = new ArrayList<>(companiesWithPV);
 genericCompaniesWithPV.removeAll(detailedCompaniesWithPV);
@@ -750,7 +750,7 @@ else if (v_previousClickedObjectType == OL_GISObjectType.BUILDING ||
 */
 
 if (gis_area.c_containedGridConnections.size() > 0) {
-	if (gis_area.c_containedGridConnections.get(0).v_hasPV) {
+	if (gis_area.c_containedGridConnections.get(0).v_liveAssetsMetaData.hasPV) {
 		if (gis_area.c_containedGridConnections.get(0).c_productionAssets.get(0).getCapacityElectric_kW() < 100){
 			gis_area.f_style(rect_smallProduction.getFillColor(), null, null, null);
 		}
@@ -870,7 +870,7 @@ public void write(int b) {
 double f_setColorsBasedOnProductionHouseholds(GIS_Object gis_area)
 {/*ALCODESTART::1718265697364*/
 if (gis_area.c_containedGridConnections.size() > 0) {
-	if (gis_area.c_containedGridConnections.get(0).v_hasPV) {
+	if (gis_area.c_containedGridConnections.get(0).v_liveAssetsMetaData.hasPV) {
 		if (gis_area.c_containedGridConnections.get(0).c_productionAssets.get(0).getCapacityElectric_kW() < 5){
 			gis_area.f_style( rect_householdSmallProduction.getFillColor(), null, null, null );
 		}
@@ -897,7 +897,7 @@ public void write(int b) {
 
 
 // PV SYSTEMS:
-double PVsystems = count(energyModel.UtilityConnections, x->x.v_hasPV == true && x.v_isActive);		
+double PVsystems = count(energyModel.UtilityConnections, x->x.v_liveAssetsMetaData.hasPV == true && x.v_isActive);		
 int PV_pct = roundToInt(100 * PVsystems / count(energyModel.UtilityConnections, x->x.v_isActive));
 uI_Tabs.pop_tabElectricity.get(0).getSliderRooftopPVCompanies_pct().setValue(PV_pct, false);
 
@@ -1709,7 +1709,7 @@ else if(c_selectedFilterOptions.contains(selectedFilter_OL)){ // Remove filter
 
 double f_filterHasPV(ArrayList<GridConnection> toBeFilteredGC)
 {/*ALCODESTART::1734448690487*/
-c_selectedGridConnections = new ArrayList<>(findAll(toBeFilteredGC, GC -> GC.v_hasPV));
+c_selectedGridConnections = new ArrayList<>(findAll(toBeFilteredGC, GC -> GC.v_liveAssetsMetaData.hasPV));
 
 /*ALCODEEND*/}
 
diff --git a/_alp/Agents/tabElectricity/Code/Functions.java b/_alp/Agents/tabElectricity/Code/Functions.java
index 27154f74..de9089d6 100644
--- a/_alp/Agents/tabElectricity/Code/Functions.java
+++ b/_alp/Agents/tabElectricity/Code/Functions.java
@@ -1,110 +1,3 @@
-double f_setPVSystemCompanies(double PV_pct,ShapeSlider usedSlider)
-{/*ALCODESTART::1722256095319*/
-//Update variable to change to custom scenario
-if(!zero_Interface.b_runningMainInterfaceScenarios){
-	zero_Interface.b_changeToCustomScenario = true;
-}
-
-double PVsystems = count(zero_Interface.energyModel.UtilityConnections, x->x.v_hasPV == true && x.v_isActive);
-double totalActiveUtilityConnections = count(zero_Interface.energyModel.UtilityConnections, gc -> gc.v_isActive);
-
-if( PV_pct/100.0 < PVsystems/totalActiveUtilityConnections ){
-	while ( PV_pct/100.0*totalActiveUtilityConnections < PVsystems) { // remove excess PV systems
-		GCUtility gc = findFirst(zero_Interface.c_orderedPVSystemsCompanies, x->x.v_hasPV==true);
-		
-		if(gc != null){
-			// update UI company
-			if (zero_Interface.c_companyUIs.size()>0){
-				UI_company companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
-				if (companyUI != null && companyUI.c_ownedGridConnections.get(companyUI.v_currentSelectedGCnr) == gc) { // should also check the setting of selected GC
-					if (companyUI.v_minPVSlider != 0) {
-						traceln("Removed already existing PV system");
-					}
-					else {
-						companyUI.sl_rooftopPVCompany.setValue(0, false);
-						companyUI.v_defaultPVSlider = 0;
-					}
-				}
-			}
-			
-			J_EA pvAsset = findFirst(gc.c_productionAssets, p -> p.energyAssetType == OL_EnergyAssetType.PHOTOVOLTAIC );
-			//traceln("Found PV system: " + pvAsset);
-			if (pvAsset!=null) {
-				pvAsset.removeEnergyAsset();
-				zero_Interface.c_orderedPVSystemsCompanies.remove(gc);
-				zero_Interface.c_orderedPVSystemsCompanies.add(0, gc);
-				//traceln("Removing PV from GridConnection:" + h.p_gridConnectionID);
-			}
-			else{
-				gc.v_hasPV = false;
-			}
-			//Color the buildings when in solar color mode
-			if(zero_Interface.rb_buildingColors.getValue() == 2){
-				for(GIS_Object building : gc.c_connectedGISObjects){
-					zero_Interface.f_styleAreas(building);
-				}
-			}
-			
-		// Recalculating the amount of PV Systems instead of just decreasing by one to account for possibility of having multiple PV Assets
-		PVsystems--; //=count(zero_Interface.energyModel.UtilityConnections, x->x.v_hasPV == true);		
-		}
-		else{//No pv systems to adjust, set slider to minimum and do nothing else
-			int min_pct_pvSystems = roundToInt(100.0 * ((double)count(zero_Interface.energyModel.UtilityConnections, x->x.v_hasPV == true && x.v_isActive) / totalActiveUtilityConnections));
-			usedSlider.setValue(min_pct_pvSystems, false);
-			return;
-		}
-	}
-}
-else {
-	while ( PV_pct/100.0 > PVsystems/totalActiveUtilityConnections) {
-
-		GCUtility gc = findFirst(zero_Interface.c_orderedPVSystemsCompanies, x->x.v_hasPV==false);
-		if (gc == null){
-			traceln("No gridconnection without PV panels found! Current PVsystems count: %s", PVsystems);
-			break;
-		}
-		else {
-			OL_EnergyAssetType assetType = OL_EnergyAssetType.PHOTOVOLTAIC;
-			String assetName = "Rooftop PV";
-
-			double roofAreaForPV_m2 = zero_Interface.energyModel.avgc_data.p_avgRatioRoofPotentialPV * gc.p_roofSurfaceArea_m2;					
-			double capacityElectricity_kW = max(0.1, roofAreaForPV_m2*zero_Interface.energyModel.avgc_data.p_avgPVPower_kWpm2);
-			double capacityHeat_kW = 0.0;
-			double yearlyProductionHydrogen_kWh = 0.0;
-			double yearlyProductionMethane_kWh = 0.0;
-			double outputTemperature_degC = 0.0;
-			
-			J_EAProduction productionAsset = new J_EAProduction ( gc, assetType, assetName, capacityElectricity_kW, capacityHeat_kW, yearlyProductionMethane_kWh, yearlyProductionHydrogen_kWh, zero_Interface.energyModel.p_timeStep_h, outputTemperature_degC, zero_Interface.energyModel.pp_solarPVproduction );
-			
-			//Add GC to top of the orderd pv systems so it will be found first when removing.
-			zero_Interface.c_orderedPVSystemsCompanies.remove(gc);
-			zero_Interface.c_orderedPVSystemsCompanies.add(0, gc);
-		
-			PVsystems++;
-			//traceln("Added PV to GridConnection: " + gc.p_gridConnectionID + "With capacity [kW]: " + capacityElectricity_kW);
-			
-			// update UI company
-			if (zero_Interface.c_companyUIs.size()>0){
-				UI_company companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
-				if (companyUI.c_ownedGridConnections.get(companyUI.v_currentSelectedGCnr) == gc) { // should also check the setting of selected GC
-					companyUI.sl_rooftopPVCompany.setValue(roundToInt(capacityElectricity_kW), false);
-					companyUI.v_defaultPVSlider = roundToInt(capacityElectricity_kW);
-				}
-			}
-			
-			//Color the buildings when in solar color mode
-			if(zero_Interface.rb_buildingColors.getValue() == 2){
-				for(GIS_Object building : gc.c_connectedGISObjects){
-					zero_Interface.f_styleAreas(building);
-				}
-			}
-		}
-	}
-}	
-
-zero_Interface.f_resetSettings();
-/*ALCODEEND*/}
-
 double f_setPVOnLand(double hectare)
 {/*ALCODESTART::1722256117103*/
 // TODO: Change to work for multiple solar fields in one model.
@@ -140,34 +33,36 @@
 zero_Interface.f_resetSettings();
 /*ALCODEEND*/}
 
-double f_setPVSystemHouses(double PV_pct)
+double f_setPVSystemHouses(List<GCHouse> gcList,double PV_pct)
 {/*ALCODESTART::1722256142375*/
 //Update variable to change to custom scenario
 if(!zero_Interface.b_runningMainInterfaceScenarios){
 	zero_Interface.b_changeToCustomScenario = true;
 }
 
-double nbHousesWithPV = count(zero_Interface.energyModel.Houses, x -> x.v_hasPV == true);
+ArrayList<GCHouse> houses = new ArrayList<GCHouse>(zero_Interface.c_orderedPVSystemsHouses.stream().filter(gcList::contains).toList());
+int nbHouses = houses.size();
+int nbHousesWithPV = count(houses, x -> x.v_liveAssetsMetaData.hasPV == true);
 
-if( PV_pct /100.0 < nbHousesWithPV / zero_Interface.energyModel.Houses.size() ){
-	while ( PV_pct / 100.0 * zero_Interface.energyModel.Houses.size() < nbHousesWithPV ) { // remove excess PV systems
-		GCHouse house = findFirst(zero_Interface.c_orderedPVSystemsHouses, x -> x.v_hasPV == true);	
+if ( PV_pct / 100.0 * nbHouses < nbHousesWithPV ) {
+	while ( PV_pct / 100.0 * nbHouses < nbHousesWithPV ) { // remove excess PV systems
+		GCHouse house = findFirst(houses, x -> x.v_liveAssetsMetaData.hasPV == true);	
 		J_EA pvAsset = findFirst(house.c_productionAssets, p -> p.energyAssetType == OL_EnergyAssetType.PHOTOVOLTAIC );
 		if (pvAsset != null) {
 			pvAsset.removeEnergyAsset();
-			zero_Interface.c_orderedPVSystemsHouses.remove( house) ;
-			zero_Interface.c_orderedPVSystemsHouses.add(0, house) ;
+			houses.remove(house);
+			zero_Interface.c_orderedPVSystemsHouses.remove(house);
+			zero_Interface.c_orderedPVSystemsHouses.add(0, house);
 			nbHousesWithPV --; 
 		}
 		else {
 			traceln(" cant find PV asset in house that should have PV asset in f_setPVHouses (Interface)");
 		}
 	}
- 
 }
 else {
-	while ( PV_pct / 100.0 > nbHousesWithPV / zero_Interface.energyModel.Houses.size()) {
-		GCHouse house = findFirst(zero_Interface.c_orderedPVSystemsHouses, x -> x.v_hasPV == false);
+	while ( PV_pct / 100.0 * nbHouses > nbHousesWithPV ) {
+		GCHouse house = findFirst(houses, x -> x.v_liveAssetsMetaData.hasPV == false);
 		if (house == null){
 			traceln("No gridconnection without PV panels found! Current PVsystems count: %s", nbHousesWithPV);
 			break;
@@ -181,6 +76,7 @@
 			double installedPVCapacity_kW = uniform(3,6);
 
 			J_EAProduction productionAsset = new J_EAProduction ( house, OL_EnergyAssetType.PHOTOVOLTAIC, assetName, installedPVCapacity_kW, capacityHeat_kW, yearlyProductionMethane_kWh, yearlyProductionHydrogen_kWh, zero_Interface.energyModel.p_timeStep_h, outputTemperature_degC, zero_Interface.energyModel.pp_solarPVproduction );
+			houses.remove(house);
 			zero_Interface.c_orderedPVSystemsHouses.remove(house);
 			zero_Interface.c_orderedPVSystemsHouses.add(0, house);
 			nbHousesWithPV ++;	
@@ -284,7 +180,7 @@ else if ( v_currentNbChargers < desiredNbOfChargers ){
 {/*ALCODESTART::1722256291599*/
 // Setting houseBatteries
 double nbHouseBatteries = count(zero_Interface.energyModel.Houses, h -> h.p_batteryAsset != null); //f_getEnergyAssets(), p -> p.energyAssetType == OL_EnergyAssetType.STORAGE_ELECTRIC && p.getParentAgent() instanceof GCHouse);
-double nbHousesWithPV = count(zero_Interface.energyModel.Houses, x -> x.v_hasPV == true); //count(energyModel.f_getGridConnections(), p->p instanceof GCHouse);
+double nbHousesWithPV = count(zero_Interface.energyModel.Houses, x -> x.v_liveAssetsMetaData.hasPV == true); //count(energyModel.f_getGridConnections(), p->p instanceof GCHouse);
 double batteryShare_pct = homeBatteries_pct;
 
 if( nbHousesWithPV > 0 ){
@@ -298,7 +194,7 @@ else if ( v_currentNbChargers < desiredNbOfChargers ){
 	}
 	else {
 		while ( batteryShare_pct / 100.0 > nbHouseBatteries / nbHousesWithPV) {
-			GCHouse house = findFirst(zero_Interface.energyModel.Houses, p -> p.p_batteryAsset == null && p.v_hasPV == true);
+			GCHouse house = findFirst(zero_Interface.energyModel.Houses, p -> p.p_batteryAsset == null && p.v_liveAssetsMetaData.hasPV == true);
 			
 			double batteryStorageCapacity_kWh = 15;
 			double batteryCapacity_kW = batteryStorageCapacity_kWh / zero_Interface.energyModel.avgc_data.p_avgRatioBatteryCapacity_v_Power;
@@ -514,7 +410,7 @@ Pair<Double, Double> f_getPVSystemPercentage(List<GridConnection> gcList)
 
 for (GridConnection gc : gcList ) {
 	double gcInstalledPV_kWp = 0.0;
-	if ( gc.v_hasPV ) {
+	if ( gc.v_liveAssetsMetaData.hasPV ) {
 		for ( J_EAProduction j_ea : gc.c_productionAssets ) {
 			if ( j_ea.getEAType() == OL_EnergyAssetType.PHOTOVOLTAIC ) {
 				gcInstalledPV_kWp += j_ea.getCapacityElectric_kW();
@@ -530,49 +426,53 @@ Pair<Double, Double> f_getPVSystemPercentage(List<GridConnection> gcList)
 
 double f_setPVSystemCompanies(List<GCUtility> gcList,double target_pct)
 {/*ALCODESTART::1747297871195*/
-Pair<Double, Double> pair = f_getPVSystemPercentage();
+Pair<Double, Double> pair = f_getPVSystemPercentage( new ArrayList<GridConnection>(gcList));
 double remaining_kWp = target_pct * pair.getSecond() - pair.getFirst();
 double averageEffectivePV_kWppm2 = zero_Interface.energyModel.avgc_data.p_avgRatioRoofPotentialPV * zero_Interface.energyModel.avgc_data.p_avgPVPower_kWpm2;
 
 if ( remaining_kWp > 0 ) {
 	// add more PV
-	for ( GCUtility company : zero_Interface.c_orderedPVSystemsCompany ) {
-		double remainingPotential_kWp = company.p_roofSurfaceArea_m2 * averageEffectivePV_kWppm2 - company.v_liveAssetsMetaData.totalInstalledPVPower_kW;
+	for ( GCUtility company : new ArrayList<GCUtility>(zero_Interface.c_orderedPVSystemsCompanies) ) {
+		double remainingPotential_kWp = min( remaining_kWp, company.p_roofSurfaceArea_m2 * averageEffectivePV_kWppm2 - company.v_liveAssetsMetaData.totalInstalledPVPower_kW );
 		if ( remainingPotential_kWp > 0 ) {
-			remaining_kWp -= remainingPotential_kWp
+			remaining_kWp -= remainingPotential_kWp;
 			f_addPVSystem( company, remainingPotential_kWp );
 		}
 		
 		if ( remaining_kWp <= 0 ) {
+			zero_Interface.f_resetSettings();		
 			return;
 		}
 	}
 }
 else {
 	// remove pv
-	for ( GCUtility company : zero_Interface.c_orderedPVSystemsCompany ) {
-		if ( company.v_liveAssetsMetaData.hasPV || gc.v_hasPV ) {
-			remaining_kWp += company.v_liveAssetsMetaData.totalInstalledPVPower_kW
+	for ( GCUtility company : new ArrayList<GCUtility>(zero_Interface.c_orderedPVSystemsCompanies) ) {
+		if ( company.v_liveAssetsMetaData.hasPV ) {
+			remaining_kWp += company.v_liveAssetsMetaData.totalInstalledPVPower_kW;
 			f_removePVSystem( company );
 		}
 		if ( remaining_kWp >= 0 ) {
 			// removed slightly too much pv
 			f_addPVSystem( company, remaining_kWp );
+			zero_Interface.f_resetSettings();			
 			return;
 		}
 	}
 }
+zero_Interface.f_resetSettings();
 /*ALCODEEND*/}
 
 double f_addPVSystem(GridConnection gc,double capacity_kWp)
 {/*ALCODESTART::1747306690517*/
-if ( gc.v_liveAssetsMetaData.hasPV || gc.v_hasPV ) { // This boolean exists in 2 places...
+if ( gc.v_liveAssetsMetaData.hasPV ) {
 	// Add the capacity to the existing asset
 	J_EAProduction pvAsset = findFirst(gc.c_productionAssets, p -> p.energyAssetType == OL_EnergyAssetType.PHOTOVOLTAIC);
 	if ( pvAsset == null ) {
 		throw new RuntimeException("Could not find photovoltaic asset in GridConnection: " + gc.p_ownerID + ", even though hasPV is True.");
 	}
-	pvAsset.setCapacityElectric_kW( pvAsset.getCapacityElectric_kW() + capacity_kWp );
+	capacity_kWp += pvAsset.getCapacityElectric_kW();
+	pvAsset.setCapacityElectric_kW( capacity_kWp );
 }
 else {
 	// Create a new asset
@@ -589,18 +489,18 @@ Pair<Double, Double> f_getPVSystemPercentage(List<GridConnection> gcList)
 // Update the ordered collection
 if ( gc instanceof GCHouse ) {
 	zero_Interface.c_orderedPVSystemsHouses.remove(gc);
-	zero_Interface.c_orderedPVSystemsHouses.add(0, gc);	
+	zero_Interface.c_orderedPVSystemsHouses.add(0, (GCHouse)gc);	
 }
 else if ( gc instanceof GCUtility ) {
 	zero_Interface.c_orderedPVSystemsCompanies.remove(gc);
-	zero_Interface.c_orderedPVSystemsCompanies.add(0, gc);
+	zero_Interface.c_orderedPVSystemsCompanies.add(0, (GCUtility)gc);
 	// update company UI
 	if ( zero_Interface.c_companyUIs.size() > 0 ) {
 		if ( gc.p_owner != null ) {
 			UI_company companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
 			if ( companyUI.c_ownedGridConnections.get(companyUI.v_currentSelectedGCnr) == gc ) {
-				companyUI.sl_rooftopPVCompany.setValue(roundToInt(capacityElectricity_kW), false);
-				companyUI.v_defaultPVSlider = roundToInt(capacityElectricity_kW);
+				companyUI.sl_rooftopPVCompany.setValue(roundToInt(capacity_kWp), false);
+				companyUI.v_defaultPVSlider = roundToInt(capacity_kWp);
 			}
 		}
 	}
@@ -623,11 +523,55 @@ else if ( gc instanceof GCUtility ) {
 J_EAProduction pvAsset = findFirst(gc.c_productionAssets, p -> p.energyAssetType == OL_EnergyAssetType.PHOTOVOLTAIC);
 if ( pvAsset != null ) {
 	pvAsset.removeEnergyAsset();
+
+	if ( gc instanceof GCHouse ) {
+		zero_Interface.c_orderedPVSystemsHouses.remove(gc);
+		zero_Interface.c_orderedPVSystemsHouses.add(0, (GCHouse)gc);	
+	}
+	else if ( gc instanceof GCUtility ) {
+		zero_Interface.c_orderedPVSystemsCompanies.remove(gc);
+		zero_Interface.c_orderedPVSystemsCompanies.add(0, (GCUtility)gc);
+	}
 }
 /*ALCODEEND*/}
 
-double f_updateCompanyUI()
-{/*ALCODESTART::1747307194121*/
+double f_setPVSystemHouses(List<GCHouse> gcList,double target_pct)
+{/*ALCODESTART::1747825874398*/
+Pair<Double, Double> pair = f_getPVSystemPercentage( new ArrayList<GridConnection>(gcList));
+
+double remaining_kWp = target_pct / 100 * pair.getSecond()  - pair.getFirst();
+double averageEffectivePV_kWppm2 = zero_Interface.energyModel.avgc_data.p_avgRatioRoofPotentialPV * zero_Interface.energyModel.avgc_data.p_avgPVPower_kWpm2;
 
+if ( remaining_kWp > 0 ) {
+	// add more PV
+	for ( GCHouse house : new ArrayList<GCHouse>(zero_Interface.c_orderedPVSystemsHouses) ) {
+		double remainingPotential_kWp = min( remaining_kWp, house.p_roofSurfaceArea_m2 * averageEffectivePV_kWppm2 - house.v_liveAssetsMetaData.totalInstalledPVPower_kW );
+		if ( remainingPotential_kWp > 0 ) {
+			remaining_kWp -= remainingPotential_kWp;
+			f_addPVSystem( house, remainingPotential_kWp );
+		}
+		
+		if ( remaining_kWp <= 0 ) {
+			zero_Interface.f_resetSettings();		
+			return;
+		}
+	}
+}
+else {
+	// remove pv
+	for ( GCHouse house : new ArrayList<GCHouse>(zero_Interface.c_orderedPVSystemsHouses) ) {
+		if ( house.v_liveAssetsMetaData.hasPV ) {
+			remaining_kWp += house.v_liveAssetsMetaData.totalInstalledPVPower_kW;
+			f_removePVSystem( house );
+		}
+		if ( remaining_kWp >= 0 ) {
+			// removed slightly too much pv
+			f_addPVSystem( house, remaining_kWp );
+			zero_Interface.f_resetSettings();			
+			return;
+		}
+	}
+}
+zero_Interface.f_resetSettings();
 /*ALCODEEND*/}
 
diff --git a/_alp/Agents/tabElectricity/Code/Functions.xml b/_alp/Agents/tabElectricity/Code/Functions.xml
index e80f13d5..91ce9eec 100644
--- a/_alp/Agents/tabElectricity/Code/Functions.xml
+++ b/_alp/Agents/tabElectricity/Code/Functions.xml
@@ -1,30 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Functions>
-	<Function AccessType="protected" StaticFunction="false">
-		<ReturnModificator>VOID</ReturnModificator>
-		<ReturnType>double</ReturnType>
-		<Id>1722256095319</Id>
-		<Name><![CDATA[f_setPVSystemCompanies]]></Name>
-		<Description><![CDATA[Function that adds or removes photovoltaic production assets to utility connections. Takes a percentage as a parameter and runs untill that percentage of all the utility connections has a PV asset. If a new asset is created it determines its electric capacity by the total roof area of all the buildings connected to the GC. The function also updates the PV slider in the company UI. The variables for amount of installed PV are updated automatically in the zero_engine.]]></Description>
-		<X>70</X>
-		<Y>760</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Parameter>
-			<Name><![CDATA[PV_pct]]></Name>
-			<Type><![CDATA[double]]></Type>
-		</Parameter>
-		<Parameter>
-			<Name><![CDATA[usedSlider]]></Name>
-			<Type><![CDATA[ShapeSlider]]></Type>
-		</Parameter>
-		<Body xmlns:al="http://anylogic.com"/>
-	</Function>
 	<Function AccessType="protected" StaticFunction="false">
 		<ReturnModificator>VOID</ReturnModificator>
 		<ReturnType>double</ReturnType>
@@ -32,7 +7,7 @@
 		<Name><![CDATA[f_setPVOnLand]]></Name>
 		<Description><![CDATA[Function that changes the electric capacity of the energy asset of the "Solar field". Takes an area size in hectares as a parameter and assumes that 1 MWp of solarpannels fits on 1 ha. The variables for amount of installed PV are updated automatically in the zero_engine. The function also modifies the connection capacity of the energy production site to match the new installed PV Power.]]></Description>
 		<X>70</X>
-		<Y>820</Y>
+		<Y>880</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -54,7 +29,7 @@
 		<Description><![CDATA[Function that adds or removes photovoltaic production assets to houses. Takes a percentage as a parameter and runs untill that percentage of all the houses has a PV asset. If a new asset is created it takes as its electric capacity a random value between 3 and 6 kW. The variables for amount of installed PV are updated automatically in the zero_engine.
 ]]></Description>
 		<X>70</X>
-		<Y>790</Y>
+		<Y>850</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -62,6 +37,10 @@
 		<PublicFlag>false</PublicFlag>
 		<PresentationFlag>true</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gcList]]></Name>
+			<Type><![CDATA[List<GCHouse>]]></Type>
+		</Parameter>
 		<Parameter>
 			<Name><![CDATA[PV_pct]]></Name>
 			<Type><![CDATA[double]]></Type>
@@ -324,8 +303,8 @@
 		<Id>1747294812333</Id>
 		<Name><![CDATA[f_getPVSystemPercentage]]></Name>
 		<Description><![CDATA[Calculates the amount of installed PV compared to the total potential based on roof surface area. Assumes that 50% of the roof surface is available for PV. If a GridConnection already has more than this installed it takes the installed capacity instead.]]></Description>
-		<X>430</X>
-		<Y>800</Y>
+		<X>90</X>
+		<Y>820</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -344,9 +323,9 @@
 		<ReturnType>double</ReturnType>
 		<Id>1747297871195</Id>
 		<Name><![CDATA[f_setPVSystemCompanies]]></Name>
-		<Description><![CDATA[Adds or removes photovoltaic production assets to GridConnections. Takes as arguments a list of Gridconnections and a target percentage. It runs untill that list of GCs has that percentage of PV installed. If a new asset is created it determines its electric capacity by the total roof area of all the buildings connected to the GC. The function also updates the PV slider in the company UI if the GC is a company. The variables in the engine that keep track of the amount of installed PV are updated automatically.]]></Description>
-		<X>410</X>
-		<Y>540</Y>
+		<Description><![CDATA[Adds or removes photovoltaic production assets to GridConnections. Takes as arguments a list of Gridconnections and a target percentage. It runs untill that list of GCs has that percentage of PV installed, compared to the total potential PV. If a new asset is created it determines its electric capacity by the total roof area of all the buildings connected to the GC. The function also updates the PV slider in the company UI if the GC is a company. The variables in the engine that keep track of the amount of installed PV are updated automatically.]]></Description>
+		<X>70</X>
+		<Y>740</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -370,8 +349,8 @@
 		<Id>1747306690517</Id>
 		<Name><![CDATA[f_addPVSystem]]></Name>
 		<Description><![CDATA[Takes as an argument a GridConnection and a capacity. If the GC already has a solar panel, it adds the capacity to the existing one. Otherwise it creates a new energy asset. If the GridConnection is a GCUtility it also updates the companyUI if it exists.]]></Description>
-		<X>460</X>
-		<Y>620</Y>
+		<X>90</X>
+		<Y>780</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -394,8 +373,8 @@
 		<ReturnType>double</ReturnType>
 		<Id>1747306699629</Id>
 		<Name><![CDATA[f_removePVSystem]]></Name>
-		<X>460</X>
-		<Y>640</Y>
+		<X>90</X>
+		<Y>800</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -412,16 +391,27 @@
 	<Function AccessType="default" StaticFunction="false">
 		<ReturnModificator>VOID</ReturnModificator>
 		<ReturnType>double</ReturnType>
-		<Id>1747307194121</Id>
-		<Name><![CDATA[f_updateCompanyUI]]></Name>
-		<X>450</X>
-		<Y>740</Y>
+		<Id>1747825874398</Id>
+		<Name><![CDATA[f_setPVSystemHouses]]></Name>
+		<Description><![CDATA[Adds or removes photovoltaic production assets to GridConnections. Takes as arguments a list of Gridconnections and a target percentage. It runs untill that list of GCs has that percentage of PV installed, compared to the total potential PV. If a new asset is created it determines its electric capacity by the total roof area of all the buildings connected to the GC. The function also updates the PV slider in the company UI if the GC is a company. The variables in the engine that keep track of the amount of installed PV are updated automatically.]]></Description>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>70</X>
+		<Y>760</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
 		</Label>
 		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
+		<PresentationFlag>false</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gcList]]></Name>
+			<Type><![CDATA[List<GCHouse>]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[target_pct]]></Name>
+			<Type><![CDATA[double]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
 </Functions>
diff --git a/_alp/Agents/tabElectricity/Levels/Level.level.xml b/_alp/Agents/tabElectricity/Levels/Level.level.xml
index 5d998de4..9b01000b 100644
--- a/_alp/Agents/tabElectricity/Levels/Level.level.xml
+++ b/_alp/Agents/tabElectricity/Levels/Level.level.xml
@@ -156,6 +156,7 @@
 			<Text>
 				<Id>1722249610020</Id>
 				<Name><![CDATA[t_rooftopSolarCompanies2]]></Name>
+				<ExcludeFromBuild>true</ExcludeFromBuild>
 				<X>230</X>
 				<Y>35</Y>
 				<Label>
@@ -183,6 +184,7 @@
 				<EmbeddedIcon>false</EmbeddedIcon>
 				<Id>1722249610022</Id>
 				<Name><![CDATA[sl_rooftopPV]]></Name>
+				<ExcludeFromBuild>true</ExcludeFromBuild>
 				<X>260</X>
 				<Y>30</Y>
 				<Label>
@@ -939,7 +941,7 @@ f_setPublicChargingStations(sliderValue);</ActionCode>
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setPVSystemCompanies(sl_rooftopPVCompanies_pct.getValue(), sl_rooftopPVCompanies_pct);</ActionCode>
+					<ActionCode>f_setPVSystemCompanies( zero_Interface.energyModel.UtilityConnections.findAll( x -&gt; true), sl_rooftopPVCompanies_pct.getValue() );</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -1202,7 +1204,7 @@ f_setPublicChargingStations(sliderValue);</ActionCode>
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setPVSystemHouses( sl_rooftopPVHouses_pct.getValue() );
+					<ActionCode>f_setPVSystemHouses( zero_Interface.energyModel.Houses.findAll( x -&gt; true), sl_rooftopPVHouses_pct.getValue() );
 
 if( zero_Interface.rb_buildingColors.getValue() == 2){
 	zero_Interface.rb_buildingColors.setValue(2, true);
@@ -2434,7 +2436,7 @@ f_setPublicChargingStationsScale(sliderValue);</ActionCode>
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setPVSystemCompanies(sl_rooftopPVCompanies_pct_Businesspark.getValue(), sl_rooftopPVCompanies_pct_Businesspark);</ActionCode>
+					<ActionCode>f_setPVSystemCompanies( zero_Interface.energyModel.UtilityConnections.findAll( x -&gt; true), sl_rooftopPVCompanies_pct_Businesspark.getValue() );</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -2763,29 +2765,4 @@ f_setPublicChargingStationsScale(sliderValue);</ActionCode>
 			</Image>
 		</Presentation>
 	</Group>
-	<Control Type="Button">
-		<EmbeddedIcon>false</EmbeddedIcon>
-		<Id>1747298732893</Id>
-		<Name><![CDATA[button]]></Name>
-		<X>440</X>
-		<Y>830</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>
-			<TextColor/>
-			<Enabled>true</Enabled>
-			<ActionCode>f_setPVSystem(zero_Interface.energyModel.f_getGridConnections().subList(0,5), 10.0);</ActionCode>
-		</BasicProperties>
-		<ExtendedProperties>
-			<Font Name="Dialog" Size="11" Style="0"/>
-			<LabelText>button</LabelText>
-		</ExtendedProperties>
-	</Control>
 </Presentation>
diff --git a/_alp/Agents/tabElectricity/Variables.xml b/_alp/Agents/tabElectricity/Variables.xml
index 1f182969..b45657d9 100644
--- a/_alp/Agents/tabElectricity/Variables.xml
+++ b/_alp/Agents/tabElectricity/Variables.xml
@@ -22,29 +22,6 @@
 			</InitialValue>
 		</Properties>
 	</Variable>
-	<Variable Class="PlainVariable">
-		<Id>1722258596992</Id>
-		<Name><![CDATA[v_previousPVOnLand_ha]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>90</X>
-		<Y>840</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Properties SaveInSnapshot="true"
-              Constant="false"
-              AccessType="public"
-              StaticVariable="false">
-			<Type><![CDATA[double]]></Type>
-			<InitialValue Class="CodeValue">
-				<Code><![CDATA[0]]></Code>
-			</InitialValue>
-		</Properties>
-	</Variable>
 	<Variable Class="PlainVariable">
 		<Id>1722258980135</Id>
 		<Name><![CDATA[v_currentNbChargers]]></Name>
diff --git a/_alp/Classes/Class.J_InfoText.java b/_alp/Classes/Class.J_InfoText.java
index adbfac70..3a445280 100644
--- a/_alp/Classes/Class.J_InfoText.java
+++ b/_alp/Classes/Class.J_InfoText.java
@@ -18,7 +18,7 @@ public class J_InfoText implements Serializable {
     public String householdElectricityDemandReduction = "Met deze slider kun je het basisverbruik van stroom voor huizen aanpassen. Een positief percentage betekent dat ze minder verbruiken dan in het basis scenario. Een negatief percentage betekent dat het verbruik is toegenoemen. Dit past niet de hoeveelheid stroombehoefte aan voor specifieke apparaten die apart in het model zitten zoals warmtepompen en elektrische auto's. Zie hiervoor de besparingsslider in de tabjes warmte of transport.";
     public String companyElectricityDemandReduction = "Met deze slider kun je het basisverbruik van stroom voor bedrijven aanpassen. Een positief percentage betekent dat ze minder verbruiken dan in het basis scenario. Een negatief percentage betekent dat het verbruik is toegenoemen. Dit past niet de hoeveelheid stroombehoefte aan voor specifieke apparaten die apart in het model zitten zoals warmtepompen en elektrische auto's. Zie hiervoor de besparingsslider in de tabjes warmte of transport.";
     public String householdRooftopPV = "Met deze slider kun je instellen welk aandeel van de huizen zonnepanelen op hun dak heeft liggen. De minimum waarde van de slider is gezet op de hoveelheid die al in het huidige scenario aanwezig is.";
-	public String companyRooftopPV = "Met deze slider kun je instellen welk aandeel van de bedrijven zonnepanelen op hun dak heeft liggen. Het aantal zonnepanelen wordt geschaald naar het dak oppervlak van het bedrijf. De minimum waarde van de slider is gezet op de hoveelheid die al in het huidige scenario aanwezig is.";
+	public String companyRooftopPV = "Met deze slider kun je instellen welk deel van alle daken van de bedrijven zonnepanelen bevat. Het aantal zonnepanelen voor een bedrijf wordt geschaald naar het dak oppervlak van het bedrijf. De minimum waarde van de slider is gezet op de hoveelheid die al in het huidige scenario aanwezig is.";
 	public String landPV = "Met deze slider kun je instellen hoeveel zonneparken er in het model zitten. 1 hectare zonnepark heeft een piek opwek van 1 MW. De minimum waarde van de slider is gezet op de hoveelheid die al in het huidige scenario aanwezig is.";
 	public String landWind = "Met deze slider kun je instellen hoeveel windmolens er in het model zitten. De minimum waarde van de slider is gezet op de hoveelheid die al in het huidige scenario aanwezig is.";
 	public String householdBatteries = "Met deze slider kun je instellen welk aandeel van de huizen die zonnepanelen op hun dak hebben liggen een batterij hebben. De minimum waarde van de slider is gezet op de hoveelheid die al in het huidige scenario aanwezig is.";

From c28e7a40c6ca71b6b3794f06873041fc8afeb8bf Mon Sep 17 00:00:00 2001
From: Luc-Sol <luc@solidegroep.nl>
Date: Thu, 5 Jun 2025 12:54:15 +0200
Subject: [PATCH 4/7] Heating Sliders

---
 .../Agents/Zero_Interface/Code/Functions.java |  73 ++---
 _alp/Agents/Zero_Interface/Variables.xml      |   4 +-
 .../Agents/tabElectricity/Code/Functions.java |  50 ++-
 _alp/Agents/tabElectricity/Code/Functions.xml |   4 +
 .../tabElectricity/Levels/Level.level.xml     |   4 +-
 _alp/Agents/tabElectricity/Variables.xml      |  22 --
 _alp/Agents/tabHeating/AOC.tabHeating.xml     |   1 +
 _alp/Agents/tabHeating/Code/Functions.java    | 308 +++++++-----------
 _alp/Agents/tabHeating/Code/Functions.xml     |  59 ++--
 _alp/Agents/tabHeating/Levels/Level.level.xml |  10 +-
 _alp/Agents/tabHeating/Variables.xml          |  44 ---
 11 files changed, 217 insertions(+), 362 deletions(-)

diff --git a/_alp/Agents/Zero_Interface/Code/Functions.java b/_alp/Agents/Zero_Interface/Code/Functions.java
index e83e2e5a..8ff64091 100644
--- a/_alp/Agents/Zero_Interface/Code/Functions.java
+++ b/_alp/Agents/Zero_Interface/Code/Functions.java
@@ -615,37 +615,6 @@ else if (v_previousClickedObjectType == OL_GISObjectType.BUILDING ||
 
 double f_initialPVSystemsOrder()
 {/*ALCODESTART::1714130288661*/
-/*
-// First we make a copy of all the Uitility GridConnections
-List<GridConnection> GCs = new ArrayList<>(energyModel.f_getGridConnections());
-List<GridConnection> GCs_detailedCompanies = new ArrayList<>(energyModel.f_getGridConnections());
-if( p_selectedProjectType == OL_ProjectType.RESIDENTIAL){
-	GCs = GCs.stream().filter(gc -> gc instanceof GCHouse).collect(Collectors.toList());
-}
-else {
-	GCs_detailedCompanies = GCs.stream().filter(gc -> gc instanceof GCUtility && gc.p_owner.p_detailedCompany).collect(Collectors.toList());
-	GCs = GCs.stream().filter(gc -> gc instanceof GCUtility && !gc.p_owner.p_detailedCompany).collect(Collectors.toList());
-}
-// Find all the GCs with PV at the start of the simulation
-ArrayList<GridConnection> GCsWithPV = GCs.stream().filter(gc -> gc.v_hasPV).collect(Collectors.toCollection(ArrayList::new));
-ArrayList<GridConnection> otherGCs = GCs.stream().filter(gc -> !gc.v_hasPV).collect(Collectors.toCollection(ArrayList::new));
-//Collections.shuffle(otherGCs);
-ArrayList<GridConnection> detailedCompanyGCsWithPV = GCs_detailedCompanies.stream().filter(gc -> gc.v_hasPV).collect(Collectors.toCollection(ArrayList::new));
-ArrayList<GridConnection> datailedCompanyGCsnoPV = GCs_detailedCompanies.stream().filter(gc -> !gc.v_hasPV).collect(Collectors.toCollection(ArrayList::new));
-
-// We make sure that the GCs with PV at the start of the simulation are the last in the list
-
-//traceln("amount of GCs with PV at start: " + GCsWithPV.size());
-//traceln("amount of other GCs at start: " + otherGCs.size());
-
-if(c_companyUIs.size() == 0){
-	otherGCs.addAll(GCsWithPV);
-}
-
-c_orderedPVSystems = otherGCs;
-c_orderedPVSystems.addAll(datailedCompanyGCsnoPV);
-*/
-
 List<GCHouse> houses = new ArrayList<GCHouse>(energyModel.Houses.findAll( x -> true));
 List<GCHouse> housesWithoutPV = houses.stream().filter( gc -> !gc.v_liveAssetsMetaData.hasPV ).collect(Collectors.toList());
 List<GCHouse> housesWithPV = new ArrayList<>(houses);
@@ -691,27 +660,27 @@ else if (v_previousClickedObjectType == OL_GISObjectType.BUILDING ||
 
 double f_initialHeatingSystemsOrder()
 {/*ALCODESTART::1714131269202*/
-// First we make a copy of all the GridConnections
-List<GridConnection> companyList = new ArrayList<>(energyModel.f_getGridConnections());
-companyList = companyList.stream().filter(gc -> gc instanceof GCUtility && gc.p_primaryHeatingAsset != null).collect(Collectors.toList());
-
-// Find all the GCs with Heatpumps at the start of the simulation
-ArrayList<GridConnection> GCsWithHP = companyList.stream().filter(gc -> gc.p_primaryHeatingAsset instanceof J_EAConversionHeatPump).collect(Collectors.toCollection(ArrayList::new));
-ArrayList<GridConnection> otherGCs = companyList.stream().filter(gc -> !(gc.p_primaryHeatingAsset instanceof J_EAConversionHeatPump)).collect(Collectors.toCollection(ArrayList::new));
-// We make sure that the GCs with Heatpumps at the start of the simulation are the last in the list (if there is no companyUI)
-if(c_companyUIs.size() == 0){
-	otherGCs.addAll(GCsWithHP);
-}
-c_orderedHeatingSystemsCompanies = otherGCs;
-
-
-// Doe same for houses
-List<GridConnection> houseList = new ArrayList<>(energyModel.f_getGridConnections());
-houseList = houseList.stream().filter(gc -> gc instanceof GCHouse).collect(Collectors.toList());
-ArrayList<GridConnection> housesWithHP = houseList.stream().filter(gc -> gc.p_primaryHeatingAsset instanceof J_EAConversionHeatPump).collect(Collectors.toCollection(ArrayList::new));
-ArrayList<GridConnection> otherHouses = houseList.stream().filter(gc -> !(gc.p_primaryHeatingAsset instanceof J_EAConversionHeatPump)).collect(Collectors.toCollection(ArrayList::new));
-otherHouses.addAll(housesWithHP);
-c_orderedHeatingSystemsHouses = otherHouses;
+List<GCHouse> houses = new ArrayList<GCHouse>(energyModel.Houses.findAll( x -> true));
+List<GCHouse> housesWithoutHP = houses.stream().filter( gc -> gc.p_heatingType != OL_GridConnectionHeatingType.HEATPUMP_AIR ).collect(Collectors.toList());
+List<GCHouse> housesWithHP = new ArrayList<>(houses);
+housesWithHP.removeAll(housesWithoutHP);
+
+c_orderedHeatingSystemsHouses = new ArrayList<>(housesWithoutHP);
+c_orderedHeatingSystemsHouses.addAll(housesWithHP);
+
+
+List<GCUtility> companies = new ArrayList<GCUtility>(energyModel.UtilityConnections.findAll( x -> true));
+List<GCUtility> companiesWithoutHP = companies.stream().filter( gc -> gc.p_heatingType != OL_GridConnectionHeatingType.HEATPUMP_AIR ).collect(Collectors.toList());
+List<GCUtility> companiesWithHP = companies.stream().filter( gc -> gc.p_heatingType == OL_GridConnectionHeatingType.HEATPUMP_AIR ).collect(Collectors.toList());
+List<GCUtility> detailedCompaniesWithHP = companiesWithHP.stream().filter( gc -> gc.p_owner != null && gc.p_owner.p_detailedCompany ).collect(Collectors.toList());
+List<GCUtility> genericCompaniesWithHP = new ArrayList<>(companiesWithHP);
+genericCompaniesWithHP.removeAll(detailedCompaniesWithHP);
+
+c_orderedHeatingSystemsCompanies = new ArrayList<>(companiesWithoutHP);
+c_orderedHeatingSystemsCompanies.addAll(genericCompaniesWithHP);
+c_orderedHeatingSystemsCompanies.addAll(detailedCompaniesWithHP);
+
+
 /*ALCODEEND*/}
 
 double f_initalAssetOrdering()
diff --git a/_alp/Agents/Zero_Interface/Variables.xml b/_alp/Agents/Zero_Interface/Variables.xml
index 033b1208..2b24313a 100644
--- a/_alp/Agents/Zero_Interface/Variables.xml
+++ b/_alp/Agents/Zero_Interface/Variables.xml
@@ -2439,7 +2439,7 @@
 		<ShowLabel>true</ShowLabel>
 		<Properties SaveInSnapshot="true" AccessType="public" StaticVariable="false">
 			<CollectionClass>ArrayList</CollectionClass>
-			<ElementClass>GridConnection</ElementClass>
+			<ElementClass>GCUtility</ElementClass>
 			<ValueElementClass>String</ValueElementClass>
 		</Properties>
 	</Variable>
@@ -2475,7 +2475,7 @@
 		<ShowLabel>true</ShowLabel>
 		<Properties SaveInSnapshot="true" AccessType="public" StaticVariable="false">
 			<CollectionClass>ArrayList</CollectionClass>
-			<ElementClass>GridConnection</ElementClass>
+			<ElementClass>GCHouse</ElementClass>
 			<ValueElementClass>String</ValueElementClass>
 		</Properties>
 	</Variable>
diff --git a/_alp/Agents/tabElectricity/Code/Functions.java b/_alp/Agents/tabElectricity/Code/Functions.java
index de9089d6..e75fce04 100644
--- a/_alp/Agents/tabElectricity/Code/Functions.java
+++ b/_alp/Agents/tabElectricity/Code/Functions.java
@@ -215,48 +215,40 @@ else if ( v_currentNbChargers < desiredNbOfChargers ){
 
 /*ALCODEEND*/}
 
-double f_setDemandReduction(double demandReduction_pct)
+double f_setDemandReduction(List<GridConnection> gcList,double demandReduction_pct)
 {/*ALCODESTART::1722335253834*/
-double newElectricityDemandReduction_pct = demandReduction_pct;
-double consumptionScaling_fr = 1  - newElectricityDemandReduction_pct/100;
+double scalingFactor = 1 - demandReduction_pct/100;
 
-for (J_EA j_ea : zero_Interface.energyModel.f_getEnergyAssets()) {
-	if (j_ea instanceof J_EAConsumption) {
-		if (j_ea.energyAssetType == OL_EnergyAssetType.ELECTRICITY_DEMAND) {
-			((J_EAConsumption)j_ea).setConsumptionScaling_fr(consumptionScaling_fr);
-			
-			if (zero_Interface.c_companyUIs.size()>0){
-				UI_company companyUI = zero_Interface.c_companyUIs.get(((GridConnection)j_ea.getParentAgent()).p_owner.p_connectionOwnerIndexNr);
-				if (companyUI != null && companyUI.c_ownedGridConnections.get(companyUI.v_currentSelectedGCnr) == j_ea.getParentAgent()) { // should also check the setting of selected GC
-					companyUI.sl_electricityDemandCompanyReduction.setValue(newElectricityDemandReduction_pct, false);
-				}
-			}
+for (GridConnection gc : gcList) {
+	// Set Consumption Assets
+	for (J_EAConsumption j_ea : gc.c_consumptionAssets) {
+		if (j_ea.getEAType() == OL_EnergyAssetType.ELECTRICITY_DEMAND) {
+			j_ea.setConsumptionScaling_fr( scalingFactor );
 		}
 	}
-	if (j_ea instanceof J_EAProfile) {
-		if (((J_EAProfile) j_ea).energyCarrier == OL_EnergyCarriers.ELECTRICITY) {
-			((J_EAProfile) j_ea).resetEnergyProfile();
-			((J_EAProfile) j_ea).scaleEnergyProfile(consumptionScaling_fr);
-			
-			if (zero_Interface.c_companyUIs.size()>0){
-				UI_company companyUI = zero_Interface.c_companyUIs.get(((GridConnection)j_ea.getParentAgent()).p_owner.p_connectionOwnerIndexNr);
-				if (companyUI != null && companyUI.c_ownedGridConnections.get(companyUI.v_currentSelectedGCnr) == j_ea.getParentAgent()) { // should also check the setting of selected GC
-					companyUI.sl_electricityDemandCompanyReduction.setValue(newElectricityDemandReduction_pct, false);
-				}
-			}
+	// Set Profile Assets
+	for (J_EAProfile j_ea : gc.c_profileAssets) {
+		if (j_ea.energyCarrier == OL_EnergyCarriers.ELECTRICITY) {
+			j_ea.resetEnergyProfile();
+			j_ea.scaleEnergyProfile( scalingFactor );
+		}
+	}
+	
+	// Update Company UI
+	if (zero_Interface.c_companyUIs.size()>0){
+		UI_company companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
+		if (companyUI != null && companyUI.c_ownedGridConnections.get(companyUI.v_currentSelectedGCnr) == gc) { // should also check the setting of selected GC
+			companyUI.sl_electricityDemandCompanyReduction.setValue(demandReduction_pct, false);
 		}
 	}
 }
 
-v_electricityDemandReduction_pct = newElectricityDemandReduction_pct;
-
-//Update variable to change to custom scenario
+// Update variable to change to custom scenario
 if(!zero_Interface.b_runningMainInterfaceScenarios){
 	zero_Interface.b_changeToCustomScenario = true;
 }
 
 zero_Interface.f_resetSettings();
-
 /*ALCODEEND*/}
 
 double f_setGridBatteries(double AllocatedCapacity_kW)
diff --git a/_alp/Agents/tabElectricity/Code/Functions.xml b/_alp/Agents/tabElectricity/Code/Functions.xml
index 91ce9eec..62a0f745 100644
--- a/_alp/Agents/tabElectricity/Code/Functions.xml
+++ b/_alp/Agents/tabElectricity/Code/Functions.xml
@@ -153,6 +153,10 @@
 		<PublicFlag>false</PublicFlag>
 		<PresentationFlag>true</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gcList]]></Name>
+			<Type><![CDATA[List<GridConnection>]]></Type>
+		</Parameter>
 		<Parameter>
 			<Name><![CDATA[demandReduction_pct]]></Name>
 			<Type><![CDATA[double]]></Type>
diff --git a/_alp/Agents/tabElectricity/Levels/Level.level.xml b/_alp/Agents/tabElectricity/Levels/Level.level.xml
index 9b01000b..85652db4 100644
--- a/_alp/Agents/tabElectricity/Levels/Level.level.xml
+++ b/_alp/Agents/tabElectricity/Levels/Level.level.xml
@@ -837,7 +837,7 @@ f_setPublicChargingStations(sliderValue);</ActionCode>
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setDemandReduction( sl_electricityDemandReduction_pct.getValue() );</ActionCode>
+					<ActionCode>f_setDemandReduction( zero_Interface.energyModel.f_getGridConnections(), sl_electricityDemandReduction_pct.getValue() );</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -2332,7 +2332,7 @@ f_setPublicChargingStationsScale(sliderValue);</ActionCode>
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setDemandReduction( sl_electricityDemandReduction_pct_Businesspark.getValue() );</ActionCode>
+					<ActionCode>f_setDemandReduction( zero_Interface.energyModel.f_getGridConnections(), sl_electricityDemandReduction_pct_Businesspark.getValue() );</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
diff --git a/_alp/Agents/tabElectricity/Variables.xml b/_alp/Agents/tabElectricity/Variables.xml
index b45657d9..070c164c 100644
--- a/_alp/Agents/tabElectricity/Variables.xml
+++ b/_alp/Agents/tabElectricity/Variables.xml
@@ -1,27 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Variables>
-	<Variable Class="PlainVariable">
-		<Id>1722258588313</Id>
-		<Name><![CDATA[v_electricityDemandReduction_pct]]></Name>
-		<X>80</X>
-		<Y>620</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Properties SaveInSnapshot="true"
-              Constant="false"
-              AccessType="public"
-              StaticVariable="false">
-			<Type><![CDATA[double]]></Type>
-			<InitialValue Class="CodeValue">
-				<Code><![CDATA[0]]></Code>
-			</InitialValue>
-		</Properties>
-	</Variable>
 	<Variable Class="PlainVariable">
 		<Id>1722258980135</Id>
 		<Name><![CDATA[v_currentNbChargers]]></Name>
diff --git a/_alp/Agents/tabHeating/AOC.tabHeating.xml b/_alp/Agents/tabHeating/AOC.tabHeating.xml
index 95634e77..32a0bfff 100644
--- a/_alp/Agents/tabHeating/AOC.tabHeating.xml
+++ b/_alp/Agents/tabHeating/AOC.tabHeating.xml
@@ -3,6 +3,7 @@
 	<Id>1722253108625</Id>
 	<Name><![CDATA[tabHeating]]></Name>
 	<AdditionalClassCode xmlns:al="http://anylogic.com"/>
+	<Import><![CDATA[import zeroPackage.ZeroMath;]]></Import>
 	<ExtendsReference>
 		<PackageName>zerointerfaceloader</PackageName>
 		<ClassName>tabArea</ClassName>
diff --git a/_alp/Agents/tabHeating/Code/Functions.java b/_alp/Agents/tabHeating/Code/Functions.java
index 7b7ed999..de47c9a6 100644
--- a/_alp/Agents/tabHeating/Code/Functions.java
+++ b/_alp/Agents/tabHeating/Code/Functions.java
@@ -1,4 +1,4 @@
-int f_setHeatingSystemsCompanies(ShapeSlider sliderGasburner,ShapeSlider sliderHeatpump)
+int f_setHeatingSystemsCompanies(List<GCUtility> gcList,ShapeSlider sliderGasburner,ShapeSlider sliderHeatpump)
 {/*ALCODESTART::1722256102007*/
 //Update variable to change to custom scenario
 if(!zero_Interface.b_runningMainInterfaceScenarios){
@@ -13,140 +13,99 @@ int f_setHeatingSystemsCompanies(ShapeSlider sliderGasburner,ShapeSlider sliderH
  	f_setHeatingSystemsWithCompanyUI(targetHeatPump_pct, sliderGasburner, sliderHeatpump);
 }
 else{
-	//Setting Heating systems
-	int nbHeatPumps = count(zero_Interface.energyModel.UtilityConnections, gc -> gc.p_primaryHeatingAsset instanceof J_EAConversionHeatPump);
-	int nbConnectionsWithHeat = count(zero_Interface.energyModel.UtilityConnections, gc -> gc.p_primaryHeatingAsset != null);
-	int targetHeatPumpAmount = roundToInt(targetHeatPump_pct/100.0* nbConnectionsWithHeat);
-
-	if( targetHeatPumpAmount < nbHeatPumps){
-		while ( targetHeatPumpAmount < nbHeatPumps) { // remove excess heatpumps, replace with gasburners.
-			//traceln("While loop for removing heatpumps");
-			GridConnection gc = findFirst(zero_Interface.c_orderedHeatingSystemsCompanies, x->x.p_primaryHeatingAsset instanceof J_EAConversionHeatPump);
-			if (gc!=null) {
-				
-				J_EA heatPump = gc.p_primaryHeatingAsset;
-				//traceln("Found heatpump: " + heatPump);		
-				heatPump.removeEnergyAsset();
-				zero_Interface.c_orderedHeatingSystemsCompanies.remove(gc);
-				zero_Interface.c_orderedHeatingSystemsCompanies.add(0, gc);
-				//traceln("Removing heatpump from GridConnection:" + gc.p_gridConnectionID);
-				J_EAConsumption heatDemandAsset = findFirst(gc.c_consumptionAssets, j_ea->j_ea.energyAssetType == OL_EnergyAssetType.HEAT_DEMAND);
-				J_EAConversionGasBurner gasBurner;
-				if (heatDemandAsset != null) {
-					gasBurner = new J_EAConversionGasBurner(gc, heatDemandAsset.yearlyDemand_kWh/8760*10, 0.99, zero_Interface.energyModel.p_timeStep_h, 90);
-				} else {
-					J_EAProfile heatDemandProfile = (J_EAProfile)findFirst(gc.c_profileAssets, x->x instanceof J_EAProfile && x.energyCarrier == OL_EnergyCarriers.HEAT);
-					double peakHeatDemand_kW = Arrays.stream(heatDemandProfile.a_energyProfile_kWh).max().orElseThrow(() -> new RuntimeException());
-					gasBurner = new J_EAConversionGasBurner(gc, peakHeatDemand_kW, 0.99, zero_Interface.energyModel.p_timeStep_h, 90);
-				}			
-			}
-			
+	ArrayList<GCUtility> companies = new ArrayList<GCUtility>(zero_Interface.c_orderedHeatingSystemsCompanies.stream().filter(gcList::contains).toList());
+	double nbHeatPumps = count(gcList, gc -> gc.p_primaryHeatingAsset instanceof J_EAConversionHeatPump);
+	int targetHeatPumpAmount = roundToInt( targetHeatPump_pct / 100.0 * gcList.size());
+	
+	while ( targetHeatPumpAmount < nbHeatPumps) { // remove excess heatpumps, replace with gasburners.
+		GCUtility company = findFirst(companies, x->x.p_primaryHeatingAsset instanceof J_EAConversionHeatPump);
+		if (company != null) {
+			company.p_primaryHeatingAsset.removeEnergyAsset();
 			nbHeatPumps--;
-			//traceln("Number of heatpumps: " + nbHeatPumps);
+			companies.remove(company);
+			zero_Interface.c_orderedHeatingSystemsCompanies.remove(company);
+			zero_Interface.c_orderedHeatingSystemsCompanies.add(0, company);
+			double peakHeatDemand_kW = f_calculatePeakHeatDemand_kW(company);
+			new J_EAConversionGasBurner(company, peakHeatDemand_kW, zero_Interface.energyModel.avgc_data.p_avgEfficiencyGasBurner, zero_Interface.energyModel.p_timeStep_h, zero_Interface.energyModel.avgc_data.p_avgOutputTemperatureGasBurner_degC);
+			company.p_heatingType = OL_GridConnectionHeatingType.GASBURNER;
 		}
-	 
-	} else { 
-		while ( targetHeatPumpAmount > nbHeatPumps) { // remove gasburners, add heatpumps.
-			//traceln("While loop for adding heatpumps");
-			GridConnection gc = findFirst(zero_Interface.c_orderedHeatingSystemsCompanies, x->x.p_primaryHeatingAsset instanceof J_EAConversionGasBurner);
+		else {
+			throw new RuntimeException("Can't find Heatpump in company that should have heatpump in f_setHeatingSystemsCompanies.");
+		}
+	}
 	
-			if (gc!=null) {
-
-				J_EA gasBurner = gc.p_primaryHeatingAsset;
-				gasBurner.removeEnergyAsset();
-				
-				J_EAConversionHeatPump heatPump;
-				J_EAConsumption heatDemandAsset = findFirst(gc.c_consumptionAssets, j_ea->j_ea.energyAssetType == OL_EnergyAssetType.HEAT_DEMAND);
-				if (heatDemandAsset != null) {
-					heatPump = new J_EAConversionHeatPump(gc, heatDemandAsset.yearlyDemand_kWh/8760*10 / 3, 0.5, zero_Interface.energyModel.p_timeStep_h, 60, zero_Interface.energyModel.v_currentAmbientTemperature_degC, 0, 1);
-				} else {
-					J_EAProfile heatDemandProfile = (J_EAProfile)findFirst(gc.c_profileAssets, x->x instanceof J_EAProfile && x.energyCarrier == OL_EnergyCarriers.HEAT);
-					double peakHeatDemand_kW = Arrays.stream(heatDemandProfile.a_energyProfile_kWh).max().orElseThrow(() -> new RuntimeException());
-					heatPump = new J_EAConversionHeatPump(gc, peakHeatDemand_kW / 3, 0.5, zero_Interface.energyModel.p_timeStep_h, 60, zero_Interface.energyModel.v_currentAmbientTemperature_degC, 0, 1);
-				}
-				zero_Interface.c_orderedHeatingSystemsCompanies.remove(gc);
-				zero_Interface.c_orderedHeatingSystemsCompanies.add(0, gc);		 
-				//traceln("Added heatpump to GridConnection: " + gc.p_gridConnectionID);
-			} else {
-				traceln("No more gasburners to replace!");
-				break;
-			}	
-			
-			nbHeatPumps++;
+	while ( targetHeatPumpAmount > nbHeatPumps) { // remove gasburners, add heatpumps.
+		GCUtility company = findFirst(companies, x -> x.p_primaryHeatingAsset instanceof J_EAConversionGasBurner);
+		if (company != null) {			
+			company.p_primaryHeatingAsset.removeEnergyAsset();
+			nbHeatPumps++;		
+			companies.remove(company);
+			zero_Interface.c_orderedHeatingSystemsCompanies.remove(company);
+			zero_Interface.c_orderedHeatingSystemsCompanies.add(0, company);	
+			double peakHeatDemand_kW = f_calculatePeakHeatDemand_kW(company);
+			new J_EAConversionHeatPump(company, peakHeatDemand_kW, 0.5, zero_Interface.energyModel.p_timeStep_h, 60,  zero_Interface.energyModel.v_currentAmbientTemperature_degC, 0, 1);				
+			company.p_heatingType = OL_GridConnectionHeatingType.HEATPUMP_AIR;
+		} 
+		else {
+			throw new RuntimeException("Can't find Gasburner in company that should have gasburner in f_setHeatingSystemsCompanies.");
 		}	
-	}
+	}	
 }
 
-/*ALCODEEND*/}
-
-double f_setHeatingSystemsHouseholds(double targetHeatPump_pct)
-{/*ALCODESTART::1722256221655*/
 //Update variable to change to custom scenario
 if(!zero_Interface.b_runningMainInterfaceScenarios){
 	zero_Interface.b_changeToCustomScenario = true;
 }
 
-double nbHeatPumps = count(zero_Interface.energyModel.Houses, house -> house.p_primaryHeatingAsset instanceof J_EAConversionHeatPump);
-int targetHeatPumpAmount = roundToInt( targetHeatPump_pct / 100.0 *(zero_Interface.energyModel.Houses.size()));
+zero_Interface.f_resetSettings();
+/*ALCODEEND*/}
 
-if( targetHeatPumpAmount < nbHeatPumps){
-	while ( targetHeatPumpAmount < nbHeatPumps) { // remove excess heatpumps, replace with gasburners.
-		GridConnection gc = findFirst(zero_Interface.c_orderedHeatingSystemsHouses, x->x.p_primaryHeatingAsset instanceof J_EAConversionHeatPump);
-		if (gc != null) {
-			J_EA heatPump = gc.p_primaryHeatingAsset;
-			heatPump.removeEnergyAsset();
-			nbHeatPumps --;
-			zero_Interface.c_orderedHeatingSystemsHouses.remove(gc);
-			zero_Interface.c_orderedHeatingSystemsHouses.add(0, gc);
-			 
-			// In loader: f_addEnergyAssetsToHouses staat jaarlijks gasverbruik in else???
-			J_EAConsumption heatDemandAsset = findFirst(gc.c_consumptionAssets, j_ea->j_ea.energyAssetType == OL_EnergyAssetType.HEAT_DEMAND);
-			J_EAConversionGasBurner gasBurner;
-			if (heatDemandAsset != null) {
-				gasBurner = new J_EAConversionGasBurner(gc, heatDemandAsset.yearlyDemand_kWh/8760*10, 0.99, zero_Interface.energyModel.p_timeStep_h, 90);
-			}
-			else {
-				J_EAProfile heatDemandProfile = (J_EAProfile)findFirst(gc.c_profileAssets, x->x instanceof J_EAProfile && x.energyCarrier == OL_EnergyCarriers.HEAT);
-				double peakHeatDemand_kW = Arrays.stream(heatDemandProfile.a_energyProfile_kWh).max().orElseThrow(() -> new RuntimeException());
-				gasBurner = new J_EAConversionGasBurner(gc, peakHeatDemand_kW, 0.99, zero_Interface.energyModel.p_timeStep_h, 90);
-			}	
-			gc.p_heatingType = OL_GridConnectionHeatingType.GASBURNER;		
-		}
+double f_setHeatingSystemsHouseholds(List<GCHouse> gcList,double targetHeatPump_pct)
+{/*ALCODESTART::1722256221655*/
+ArrayList<GCHouse> houses = new ArrayList<GCHouse>(zero_Interface.c_orderedHeatingSystemsHouses.stream().filter(gcList::contains).toList());
+double nbHeatPumps = count(gcList, gc -> gc.p_primaryHeatingAsset instanceof J_EAConversionHeatPump);
+int targetHeatPumpAmount = roundToInt( targetHeatPump_pct / 100.0 * gcList.size());
+
+while ( targetHeatPumpAmount < nbHeatPumps) { // remove excess heatpumps, replace with gasburners.
+	GCHouse house = findFirst(houses, x->x.p_primaryHeatingAsset instanceof J_EAConversionHeatPump);
+	if (house != null) {
+		house.p_primaryHeatingAsset.removeEnergyAsset();
+		nbHeatPumps--;
+		houses.remove(house);
+		zero_Interface.c_orderedHeatingSystemsHouses.remove(house);
+		zero_Interface.c_orderedHeatingSystemsHouses.add(0, house);
+		double peakHeatDemand_kW = f_calculatePeakHeatDemand_kW(house);
+		new J_EAConversionGasBurner(house, peakHeatDemand_kW, zero_Interface.energyModel.avgc_data.p_avgEfficiencyGasBurner, zero_Interface.energyModel.p_timeStep_h, zero_Interface.energyModel.avgc_data.p_avgOutputTemperatureGasBurner_degC);
+		house.p_heatingType = OL_GridConnectionHeatingType.GASBURNER;
 	}
- 
-} 
-else { 
-	while ( targetHeatPumpAmount > nbHeatPumps) { // remove gasburners, add heatpumps.
-		GCHouse gc = (GCHouse)findFirst(zero_Interface.c_orderedHeatingSystemsHouses, x -> x.p_primaryHeatingAsset instanceof J_EAConversionGasBurner);
-		if (gc != null) {			
-			gc.p_primaryHeatingAsset.removeEnergyAsset();
-			J_EAConversionHeatPump heatPump;
-			J_EAConsumption heatDemandAsset = findFirst(gc.c_consumptionAssets, j_ea -> j_ea.energyAssetType == OL_EnergyAssetType.HEAT_DEMAND);
-			if (heatDemandAsset != null) { // als house een standaard warmtebehoefte profiel heeft
-				heatPump = new J_EAConversionHeatPump(gc, heatDemandAsset.yearlyDemand_kWh/8760*10 / 3, 0.5, zero_Interface.energyModel.p_timeStep_h, 60,  zero_Interface.energyModel.v_currentAmbientTemperature_degC, 0, 1);				
-			} 
-			else if (gc.p_BuildingThermalAsset != null){ //als huis een building heatmodel heeft
-				heatPump = new J_EAConversionHeatPump(gc, 5, 0.5, zero_Interface.energyModel.p_timeStep_h, 60,  zero_Interface.energyModel.v_currentAmbientTemperature_degC, 0, 1);				
-				//J_EAStorageHeat buffer = new J_EAStorageHeat(gc, OL_EAStorageTypes.HEATBUFFER, 10, 0, energyModel.p_timeStep_h, 75, 15, 90, 50, 50000, "AIR" );
-				//Agent parentAgent, OL_EAStorageTypes heatStorageType, double capacityHeat_kW, double lossFactor_WpK, double timestep_h, double initialTemperature_degC, double minTemperature_degC, double maxTemperature_degC, double setTemperature_degC, double heatCapacity_JpK, String ambientTempType 
-				//voeg heatbuffer toe
-			}
-			else { //anders moet het huis een heatProfiel krijgen
-				J_EAProfile heatDemandProfile = (J_EAProfile)findFirst(gc.c_profileAssets, x->x instanceof J_EAProfile && x.energyCarrier == OL_EnergyCarriers.HEAT);
-				double peakHeatDemand_kW = Arrays.stream(heatDemandProfile.a_energyProfile_kWh).max().orElseThrow(() -> new RuntimeException());
-				heatPump = new J_EAConversionHeatPump(gc, peakHeatDemand_kW / 3, 0.5, zero_Interface.energyModel.p_timeStep_h, 60, zero_Interface.energyModel.v_currentAmbientTemperature_degC, 0, 1);
-			}
-			nbHeatPumps ++;
-			zero_Interface.c_orderedHeatingSystemsHouses.remove(gc);
-			zero_Interface.c_orderedHeatingSystemsHouses.add(0, gc);
-			gc.p_heatingType = OL_GridConnectionHeatingType.HEATPUMP_AIR;
-		} 
-		else {
-			traceln("No more gasburners to replace!");
-			break;
-		}	
+	else {
+		throw new RuntimeException("Can't find Heatpump in house that should have heatpump in f_setHeatingSystemsHouseholds.");
+	}
+}
+
+while ( targetHeatPumpAmount > nbHeatPumps) { // remove gasburners, add heatpumps.
+	GCHouse house = findFirst(houses, x -> x.p_primaryHeatingAsset instanceof J_EAConversionGasBurner);
+	if (house != null) {			
+		house.p_primaryHeatingAsset.removeEnergyAsset();
+		nbHeatPumps++;		
+		houses.remove(house);
+		zero_Interface.c_orderedHeatingSystemsHouses.remove(house);
+		zero_Interface.c_orderedHeatingSystemsHouses.add(0, house);		
+		double peakHeatDemand_kW = f_calculatePeakHeatDemand_kW(house);
+		new J_EAConversionHeatPump(house, peakHeatDemand_kW, 0.5, zero_Interface.energyModel.p_timeStep_h, 60,  zero_Interface.energyModel.v_currentAmbientTemperature_degC, 0, 1);				
+		house.p_heatingType = OL_GridConnectionHeatingType.HEATPUMP_AIR;
+	} 
+	else {
+		throw new RuntimeException("Can't find Gasburner in house that should have gasburner in f_setHeatingSystemsHouseholds.");
 	}	
+}	
+
+//Update variable to change to custom scenario
+if(!zero_Interface.b_runningMainInterfaceScenarios){
+	zero_Interface.b_changeToCustomScenario = true;
 }
+
+zero_Interface.f_resetSettings();
 /*ALCODEEND*/}
 
 double f_setHeatingSliders(int sliderIndex,ShapeSlider gasBurnerSlider,ShapeSlider heatPumpSlider,ShapeSlider hybridHeatPumpSlider,ShapeSlider districtHeatingSlider)
@@ -191,77 +150,34 @@ else if (gc.p_BuildingThermalAsset != null){ //als huis een building heatmodel h
 
 /*ALCODEEND*/}
 
-double f_setDemandReductionHeatingCompanies(double demandReduction_pct)
+double f_setDemandReductionHeating(List<GridConnection> gcList,double demandReduction_pct)
 {/*ALCODESTART::1722335783993*/
-double newHeatDemandReduction_pct = demandReduction_pct;
-double consumptionScaling_fr = 1  - newHeatDemandReduction_pct/100;
+double scalingFactor = 1 - demandReduction_pct/100;
 
-for (J_EA j_ea : zero_Interface.energyModel.f_getEnergyAssets()){
-	Agent parentGC = j_ea.getParentAgent();
-	if(parentGC != null && parentGC instanceof GCUtility){
-		if (j_ea instanceof J_EAConsumption) {
-			if (j_ea.energyAssetType == OL_EnergyAssetType.HEAT_DEMAND) {
-				((J_EAConsumption)j_ea).setConsumptionScaling_fr(consumptionScaling_fr);
-				
-				if (zero_Interface.c_companyUIs.size()>0){
-					UI_company companyUI = zero_Interface.c_companyUIs.get(((GridConnection)parentGC).p_owner.p_connectionOwnerIndexNr);
-					if (companyUI != null && companyUI.c_ownedGridConnections.get(companyUI.v_currentSelectedGCnr) == parentGC) { // should also check the setting of selected GC
-						companyUI.sl_heatDemandCompanyReduction.setValue(newHeatDemandReduction_pct, false);
-					}
-				}	
-			}
-		}
-		if (j_ea instanceof J_EAProfile) {
-			if (((J_EAProfile) j_ea).energyCarrier == OL_EnergyCarriers.HEAT) {
-				((J_EAProfile) j_ea).resetEnergyProfile();
-				((J_EAProfile) j_ea).scaleEnergyProfile(consumptionScaling_fr);
-				if (zero_Interface.c_companyUIs.size()>0){
-					UI_company companyUI = zero_Interface.c_companyUIs.get(((GridConnection)parentGC).p_owner.p_connectionOwnerIndexNr);
-					if (companyUI != null && companyUI.c_ownedGridConnections.get(companyUI.v_currentSelectedGCnr) == parentGC) { // should also check the setting of selected GC
-						companyUI.sl_heatDemandCompanyReduction.setValue(newHeatDemandReduction_pct, false);
-					}
-				}
-			}
+for (GridConnection gc : gcList) {
+	// Set Consumption Assets
+	for (J_EAConsumption j_ea : gc.c_consumptionAssets) {
+		if (j_ea.getEAType() == OL_EnergyAssetType.HEAT_DEMAND) {
+			j_ea.setConsumptionScaling_fr( scalingFactor );
 		}
 	}
-}
-
-
-v_heatDemandReductionCompanies_pct = newHeatDemandReduction_pct;
-
-//Update variable to change to custom scenario
-if(!zero_Interface.b_runningMainInterfaceScenarios){
-	zero_Interface.b_changeToCustomScenario = true;
-}
-
-zero_Interface.f_resetSettings();
-/*ALCODEEND*/}
-
-double f_setDemandReductionHeatingHouses(double demandReduction_pct)
-{/*ALCODESTART::1727269173559*/
-double newHeatDemandReduction_pct = demandReduction_pct;
-double consumptionScaling_fr = 1  - newHeatDemandReduction_pct/100;
-
-for (J_EA j_ea : zero_Interface.energyModel.f_getEnergyAssets()){
-	Agent parentGC = j_ea.getParentAgent();
-	if(parentGC != null && parentGC instanceof GCHouse){
-		if (j_ea instanceof J_EAConsumption) {
-			if (j_ea.energyAssetType == OL_EnergyAssetType.HEAT_DEMAND) {
-				((J_EAConsumption)j_ea).setConsumptionScaling_fr(consumptionScaling_fr);
-			}
+	// Set Profile Assets
+	for (J_EAProfile j_ea : gc.c_profileAssets) {
+		if (j_ea.energyCarrier == OL_EnergyCarriers.HEAT) {
+			j_ea.resetEnergyProfile();
+			j_ea.scaleEnergyProfile( scalingFactor );
 		}
-		if (j_ea instanceof J_EAProfile) {
-			if (((J_EAProfile) j_ea).energyCarrier == OL_EnergyCarriers.HEAT) {
-				((J_EAProfile) j_ea).resetEnergyProfile();
-				((J_EAProfile) j_ea).scaleEnergyProfile(consumptionScaling_fr);
-			}
+	}
+	
+	// Update Company UI
+	if (zero_Interface.c_companyUIs.size()>0){
+		UI_company companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
+		if (companyUI != null && companyUI.c_ownedGridConnections.get(companyUI.v_currentSelectedGCnr) == gc) { // should also check the setting of selected GC
+			companyUI.sl_heatDemandCompanyReduction.setValue(demandReduction_pct, false);
 		}
 	}
 }
 
-
-v_heatDemandReductionHouses_pct = newHeatDemandReduction_pct;
-
 //Update variable to change to custom scenario
 if(!zero_Interface.b_runningMainInterfaceScenarios){
 	zero_Interface.b_changeToCustomScenario = true;
@@ -270,8 +186,12 @@ else if (gc.p_BuildingThermalAsset != null){ //als huis een building heatmodel h
 zero_Interface.f_resetSettings();
 /*ALCODEEND*/}
 
-int f_setHeatingSystemsWithCompanyUI(double targetHeatPump_pct,ShapeSlider sliderGasburner,ShapeSlider sliderHeatpump)
+int f_setHeatingSystemsWithCompanyUI(List<GCUtility> gcList,double targetHeatPump_pct,ShapeSlider sliderGasburner,ShapeSlider sliderHeatpump)
 {/*ALCODESTART::1729259449060*/
+//ArrayList<GCUtility> companies = new ArrayList<GCUtility>(zero_Interface.c_orderedHeatingSystemsCompanies.stream().filter(gcList::contains).toList());
+//double nbHeatPumps = count(gcList, gc -> gc.p_primaryHeatingAsset instanceof J_EAConversionHeatPump);
+//int targetHeatPumpAmount = roundToInt( targetHeatPump_pct / 100.0 * gcList.size());
+
 //Setting Heating systems
 int nbHeatPumps = count(zero_Interface.energyModel.UtilityConnections, gc -> gc.p_primaryHeatingAsset instanceof J_EAConversionHeatPump && gc.v_isActive) + v_totalNumberOfGhostHeatingSystems_ElectricHeatpumps + v_totalNumberOfGhostHeatingSystems_HybridHeatpumps;// && gc.p_secondaryHeatingAsset == null );
 int nbConnectionsWithHeat = count(zero_Interface.energyModel.UtilityConnections, gc -> gc.p_primaryHeatingAsset != null && gc.v_isActive) + v_totalNumberOfGhostHeatingSystems_ElectricHeatpumps + v_totalNumberOfGhostHeatingSystems_HybridHeatpumps;
@@ -381,3 +301,25 @@ int f_setHeatingSystemsWithCompanyUI(double targetHeatPump_pct,ShapeSlider slide
 
 /*ALCODEEND*/}
 
+double f_calculatePeakHeatDemand_kW(GridConnection gc)
+{/*ALCODESTART::1749116448649*/
+double peakHeatDemand_kW = 0.0;
+for (J_EAConsumption j_ea : gc.c_consumptionAssets) {
+	if (j_ea.getEAType() == OL_EnergyAssetType.HEAT_DEMAND) {
+		TableFunction tf = j_ea.getProfilePointer().getTableFunction();
+		double maxFactor = Arrays.stream(tf.getValues()).max().getAsDouble();
+		peakHeatDemand_kW += maxFactor * j_ea.yearlyDemand_kWh * j_ea.getConsumptionScaling_fr();
+	}
+}
+for (J_EAProfile j_ea : gc.c_profileAssets) {
+	if (j_ea.energyCarrier == OL_EnergyCarriers.HEAT) {
+		double maxValue = Arrays.stream(j_ea.a_energyProfile_kWh).max().getAsDouble();
+		peakHeatDemand_kW += maxValue / zero_Interface.energyModel.p_timeStep_h * j_ea.getProfileScaling_fr();
+	}
+}
+if (gc.p_BuildingThermalAsset != null) {
+	peakHeatDemand_kW += gc.p_BuildingThermalAsset.getCapacityHeat_kW();
+}
+return peakHeatDemand_kW;
+/*ALCODEEND*/}
+
diff --git a/_alp/Agents/tabHeating/Code/Functions.xml b/_alp/Agents/tabHeating/Code/Functions.xml
index 84672d44..45b580c6 100644
--- a/_alp/Agents/tabHeating/Code/Functions.xml
+++ b/_alp/Agents/tabHeating/Code/Functions.xml
@@ -13,8 +13,12 @@
 			<Y>0</Y>
 		</Label>
 		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
+		<PresentationFlag>false</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gcList]]></Name>
+			<Type><![CDATA[List<GCUtility>]]></Type>
+		</Parameter>
 		<Parameter>
 			<Name><![CDATA[sliderGasburner]]></Name>
 			<Type><![CDATA[ShapeSlider]]></Type>
@@ -40,6 +44,10 @@
 		<PublicFlag>false</PublicFlag>
 		<PresentationFlag>true</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gcList]]></Name>
+			<Type><![CDATA[List<GCHouse>]]></Type>
+		</Parameter>
 		<Parameter>
 			<Name><![CDATA[targetHeatPump_pct]]></Name>
 			<Type><![CDATA[double]]></Type>
@@ -87,8 +95,8 @@
 		<ReturnModificator>VOID</ReturnModificator>
 		<ReturnType>double</ReturnType>
 		<Id>1722335783993</Id>
-		<Name><![CDATA[f_setDemandReductionHeatingCompanies]]></Name>
-		<Description><![CDATA[Function that reduces the heat demand of all consumption assets. Takes as an argument a percentage to reduce by compared to the default value of the consumption assets.]]></Description>
+		<Name><![CDATA[f_setDemandReductionHeating]]></Name>
+		<Description><![CDATA[Function that reduces the heat demand of all profile and consumption assets. Takes as an argument a percentage to reduce by compared to the default value of the consumption assets. Does not effect heating demand from gridconnection that have a thermal building model. ]]></Description>
 		<X>70</X>
 		<Y>590</Y>
 		<Label>
@@ -99,26 +107,9 @@
 		<PresentationFlag>true</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
 		<Parameter>
-			<Name><![CDATA[demandReduction_pct]]></Name>
-			<Type><![CDATA[double]]></Type>
+			<Name><![CDATA[gcList]]></Name>
+			<Type><![CDATA[List<GridConnection>]]></Type>
 		</Parameter>
-		<Body xmlns:al="http://anylogic.com"/>
-	</Function>
-	<Function AccessType="protected" StaticFunction="false">
-		<ReturnModificator>VOID</ReturnModificator>
-		<ReturnType>double</ReturnType>
-		<Id>1727269173559</Id>
-		<Name><![CDATA[f_setDemandReductionHeatingHouses]]></Name>
-		<Description><![CDATA[Function that reduces the heat demand of all consumption assets. Takes as an argument a percentage to reduce by compared to the default value of the consumption assets.]]></Description>
-		<X>70</X>
-		<Y>630</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
 		<Parameter>
 			<Name><![CDATA[demandReduction_pct]]></Name>
 			<Type><![CDATA[double]]></Type>
@@ -139,6 +130,10 @@
 		<PublicFlag>false</PublicFlag>
 		<PresentationFlag>true</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gcList]]></Name>
+			<Type><![CDATA[List<GCUtility>]]></Type>
+		</Parameter>
 		<Parameter>
 			<Name><![CDATA[targetHeatPump_pct]]></Name>
 			<Type><![CDATA[double]]></Type>
@@ -169,4 +164,24 @@
 		<ShowLabel>true</ShowLabel>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1749116448649</Id>
+		<Name><![CDATA[f_calculatePeakHeatDemand_kW]]></Name>
+		<X>60</X>
+		<Y>900</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>
 </Functions>
diff --git a/_alp/Agents/tabHeating/Levels/Level.level.xml b/_alp/Agents/tabHeating/Levels/Level.level.xml
index 697fce7a..9ce4520e 100644
--- a/_alp/Agents/tabHeating/Levels/Level.level.xml
+++ b/_alp/Agents/tabHeating/Levels/Level.level.xml
@@ -444,13 +444,13 @@ f_setHeatingSystemsHouseholds( sl_electricHeatPumpHouseholds_pct.getValue() );
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setDemandReductionHeatingHouses( sl_heatDemandReductionHouseholds_pct.getValue() );</ActionCode>
+					<ActionCode>f_setDemandReductionHeating( new ArrayList&lt;GridConnection&gt;(zero_Interface.energyModel.Houses.findAll( x -&gt; true)), sl_heatDemandReductionHouseholds_pct.getValue() );</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
 					<Orientation>HORIZONTAL</Orientation>
 					<MinValue>0</MinValue>
-					<MaxValue>100</MaxValue>
+					<MaxValue>50</MaxValue>
 					<Step>1</Step>
 					<LinkTo>false</LinkTo>
 				</ExtendedProperties>
@@ -548,7 +548,7 @@ f_setHeatingSystemsHouseholds( sl_electricHeatPumpHouseholds_pct.getValue() );
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setDemandReductionHeatingCompanies( sl_heatDemandReductionCompanies_pct.getValue() );</ActionCode>
+					<ActionCode>f_setDemandReductionHeating( new ArrayList&lt;GridConnection&gt;(zero_Interface.energyModel.UtilityConnections.findAll( x -&gt; true)), sl_heatDemandReductionCompanies_pct.getValue() );</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -1818,9 +1818,7 @@ zero_Interface.f_resetSettings();</ActionCode>
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setDemandReductionHeatingCompanies( sl_heatDemandSlidersCompaniesHeatDemandReductionCompanies_pct.getValue());
-
-</ActionCode>
+					<ActionCode>f_setDemandReductionHeating( new ArrayList&lt;GridConnection&gt;(zero_Interface.energyModel.UtilityConnections.findAll( x -&gt; true)), sl_heatDemandSlidersCompaniesHeatDemandReductionCompanies_pct.getValue());</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
diff --git a/_alp/Agents/tabHeating/Variables.xml b/_alp/Agents/tabHeating/Variables.xml
index f9d3dc42..91f91bfd 100644
--- a/_alp/Agents/tabHeating/Variables.xml
+++ b/_alp/Agents/tabHeating/Variables.xml
@@ -1,49 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Variables>
-	<Variable Class="PlainVariable">
-		<Id>1722258576600</Id>
-		<Name><![CDATA[v_heatDemandReductionCompanies_pct]]></Name>
-		<X>90</X>
-		<Y>610</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Properties SaveInSnapshot="true"
-              Constant="false"
-              AccessType="public"
-              StaticVariable="false">
-			<Type><![CDATA[double]]></Type>
-			<InitialValue Class="CodeValue">
-				<Code><![CDATA[0]]></Code>
-			</InitialValue>
-		</Properties>
-	</Variable>
-	<Variable Class="PlainVariable">
-		<Id>1727269173561</Id>
-		<Name><![CDATA[v_heatDemandReductionHouses_pct]]></Name>
-		<X>90</X>
-		<Y>650</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Properties SaveInSnapshot="true"
-              Constant="false"
-              AccessType="public"
-              StaticVariable="false">
-			<Type><![CDATA[double]]></Type>
-			<InitialValue Class="CodeValue">
-				<Code><![CDATA[0]]></Code>
-			</InitialValue>
-		</Properties>
-	</Variable>
 	<Variable Class="PlainVariable">
 		<Id>1729262524509</Id>
 		<Name><![CDATA[v_totalNumberOfGhostHeatingSystems_ElectricHeatpumps]]></Name>

From c61432c9248ea925eeec6fe9c3309256d79a66a7 Mon Sep 17 00:00:00 2001
From: Luc-Sol <luc@solidegroep.nl>
Date: Thu, 5 Jun 2025 17:24:10 +0200
Subject: [PATCH 5/7] mobility sliders

---
 .../Zero_Interface/AOC.Zero_Interface.xml     |   4 +-
 .../Agents/Zero_Interface/Code/Functions.java |  17 +-
 _alp/Agents/tabHeating/Code/Functions.java    | 178 +++++-----
 _alp/Agents/tabHeating/Code/Functions.xml     |  12 +-
 _alp/Agents/tabHeating/Levels/Level.level.xml |  16 +-
 _alp/Agents/tabMobility/AOC.tabMobility.xml   |   1 +
 _alp/Agents/tabMobility/Code/Functions.java   | 303 ++++++++++--------
 _alp/Agents/tabMobility/Code/Functions.xml    |  82 ++++-
 .../Agents/tabMobility/Levels/Level.level.xml |  16 +-
 9 files changed, 368 insertions(+), 261 deletions(-)

diff --git a/_alp/Agents/Zero_Interface/AOC.Zero_Interface.xml b/_alp/Agents/Zero_Interface/AOC.Zero_Interface.xml
index 62f6c555..23b80c30 100644
--- a/_alp/Agents/Zero_Interface/AOC.Zero_Interface.xml
+++ b/_alp/Agents/Zero_Interface/AOC.Zero_Interface.xml
@@ -19,6 +19,7 @@ import java.util.Dictionary.*;
 import java.util.Hashtable.*;
 import java.util.*;
 import java.util.stream.Collectors;
+import java.lang.Object;
 
 import java.io.*;
 import java.io.File;
@@ -40,7 +41,8 @@ import zero_engine.OL_EnergyCarriers;
 import com.querydsl.core.types.dsl.TimeExpression;
 import zero_engine.J_EAStorageElectric;
 import zero_engine.J_EAConsumption;
-import digital_twin_results.OL_ChartTypes;]]></Import>
+import digital_twin_results.OL_ChartTypes;
+import kotlin.Triple;]]></Import>
 	<Generic>false</Generic>
 	<GenericParameter>
 		<Id>1658477103138</Id>
diff --git a/_alp/Agents/Zero_Interface/Code/Functions.java b/_alp/Agents/Zero_Interface/Code/Functions.java
index 8ff64091..4f963c5c 100644
--- a/_alp/Agents/Zero_Interface/Code/Functions.java
+++ b/_alp/Agents/Zero_Interface/Code/Functions.java
@@ -548,10 +548,14 @@ else if (v_previousClickedObjectType == OL_GISObjectType.BUILDING ||
 v_connectionOwnerIndexNr = 0;
 
 //Get the ghost vehicles for the transport slider tab
-uI_Tabs.pop_tabMobility.get(0).f_calculateNumberOfGhostVehicles();
-
+Triple<Integer, Integer, Integer> triple = uI_Tabs.pop_tabMobility.get(0).f_calculateNumberOfGhostVehicles( new ArrayList<GridConnection>(energyModel.UtilityConnections.findAll( x -> true)) );
+uI_Tabs.pop_tabMobility.get(0).v_totalNumberOfGhostVehicle_Cars = triple.getFirst();
+uI_Tabs.pop_tabMobility.get(0).v_totalNumberOfGhostVehicle_Vans = triple.getSecond();
+uI_Tabs.pop_tabMobility.get(0).v_totalNumberOfGhostVehicle_Trucks = triple.getThird();
 //Get the ghost heating systems
-uI_Tabs.pop_tabHeating.get(0).f_calculateNumberOfGhostHeatingSystems();
+Pair<Integer, Integer> pair = uI_Tabs.pop_tabHeating.get(0).f_calculateNumberOfGhostHeatingSystems( energyModel.UtilityConnections.findAll( x -> true) );
+uI_Tabs.pop_tabHeating.get(0).v_totalNumberOfGhostHeatingSystems_ElectricHeatpumps = pair.getFirst();
+uI_Tabs.pop_tabHeating.get(0).v_totalNumberOfGhostHeatingSystems_HybridHeatpumps = pair.getSecond();
 
 /*ALCODEEND*/}
 
@@ -858,13 +862,6 @@ public void write(int b) {
 {/*ALCODESTART::1718288402102*/
 // ATTENTION: If you have custom tabs it may be neccesary to override this function and add updates to your custom sliders!
 
-if(c_companyUIs.size()>0){//Update ghost vehicles and heating systems present if there are companyUIs
-	uI_Tabs.pop_tabHeating.get(0).f_calculateNumberOfGhostHeatingSystems();
-	uI_Tabs.pop_tabMobility.get(0).f_calculateNumberOfGhostVehicles();
-}
-
-
-
 // PV SYSTEMS:
 double PVsystems = count(energyModel.UtilityConnections, x->x.v_liveAssetsMetaData.hasPV == true && x.v_isActive);		
 int PV_pct = roundToInt(100 * PVsystems / count(energyModel.UtilityConnections, x->x.v_isActive));
diff --git a/_alp/Agents/tabHeating/Code/Functions.java b/_alp/Agents/tabHeating/Code/Functions.java
index de47c9a6..5fc986d4 100644
--- a/_alp/Agents/tabHeating/Code/Functions.java
+++ b/_alp/Agents/tabHeating/Code/Functions.java
@@ -10,7 +10,7 @@ int f_setHeatingSystemsCompanies(List<GCUtility> gcList,ShapeSlider sliderGasbur
 
 //Set the sliders if companyUI is present using the companyUI functions, if not: do it the normal way
 if(zero_Interface.c_companyUIs.size()>0){
- 	f_setHeatingSystemsWithCompanyUI(targetHeatPump_pct, sliderGasburner, sliderHeatpump);
+ 	f_setHeatingSystemsWithCompanyUI(gcList, targetHeatPump_pct, sliderGasburner, sliderHeatpump);
 }
 else{
 	ArrayList<GCUtility> companies = new ArrayList<GCUtility>(zero_Interface.c_orderedHeatingSystemsCompanies.stream().filter(gcList::contains).toList());
@@ -188,117 +188,101 @@ int f_setHeatingSystemsCompanies(List<GCUtility> gcList,ShapeSlider sliderGasbur
 
 int f_setHeatingSystemsWithCompanyUI(List<GCUtility> gcList,double targetHeatPump_pct,ShapeSlider sliderGasburner,ShapeSlider sliderHeatpump)
 {/*ALCODESTART::1729259449060*/
-//ArrayList<GCUtility> companies = new ArrayList<GCUtility>(zero_Interface.c_orderedHeatingSystemsCompanies.stream().filter(gcList::contains).toList());
-//double nbHeatPumps = count(gcList, gc -> gc.p_primaryHeatingAsset instanceof J_EAConversionHeatPump);
-//int targetHeatPumpAmount = roundToInt( targetHeatPump_pct / 100.0 * gcList.size());
+ArrayList<GCUtility> companies = new ArrayList<GCUtility>(zero_Interface.c_orderedHeatingSystemsCompanies.stream().filter(gcList::contains).filter(x -> x.v_isActive).toList());
+int nbActiveCompanies = companies.size();
+Pair<Integer, Integer> pair = f_calculateNumberOfGhostHeatingSystems(companies);
+int nbOfGhostHeatingSystems = pair.getFirst() + pair.getSecond(); // Both Electric and Hybrid heatpumps
+int nbHeatPumps = count(companies, gc -> gc.p_primaryHeatingAsset instanceof J_EAConversionHeatPump) + nbOfGhostHeatingSystems;
+int targetHeatPumpAmount = roundToInt( targetHeatPump_pct / 100.0 * nbActiveCompanies) + nbOfGhostHeatingSystems;
 
-//Setting Heating systems
-int nbHeatPumps = count(zero_Interface.energyModel.UtilityConnections, gc -> gc.p_primaryHeatingAsset instanceof J_EAConversionHeatPump && gc.v_isActive) + v_totalNumberOfGhostHeatingSystems_ElectricHeatpumps + v_totalNumberOfGhostHeatingSystems_HybridHeatpumps;// && gc.p_secondaryHeatingAsset == null );
-int nbConnectionsWithHeat = count(zero_Interface.energyModel.UtilityConnections, gc -> gc.p_primaryHeatingAsset != null && gc.v_isActive) + v_totalNumberOfGhostHeatingSystems_ElectricHeatpumps + v_totalNumberOfGhostHeatingSystems_HybridHeatpumps;
-int targetHeatPumpAmount = roundToInt(targetHeatPump_pct/100.0* nbConnectionsWithHeat);
 
-if( targetHeatPumpAmount < nbHeatPumps){
-	while ( targetHeatPumpAmount < nbHeatPumps){ // remove excess heatpumps of companies that didnt start with a heatpump, replace with gasburners.
+while ( targetHeatPumpAmount < nbHeatPumps){ // remove excess heatpumps of companies that didnt start with a heatpump, replace with gasburners.
+	GCUtility company = findFirst(companies, gc -> gc.p_primaryHeatingAsset instanceof J_EAConversionHeatPump);
+	if (company != null) {
+		UI_company companyUI = zero_Interface.c_companyUIs.get(company.p_owner.p_connectionOwnerIndexNr);
 		
-		GridConnection GC = findFirst(zero_Interface.c_orderedHeatingSystemsCompanies, gc -> gc.p_primaryHeatingAsset instanceof J_EAConversionHeatPump);
-		
-		if (GC!=null) {
-			UI_company companyUI = zero_Interface.c_companyUIs.get(GC.p_owner.p_connectionOwnerIndexNr);
-			
-			companyUI.b_runningMainInterfaceSlider = true;
-			if(companyUI.c_ownedGridConnections.get(companyUI.v_currentSelectedGCnr) != GC){
-				int selectedGC = 0;
-				if(companyUI.v_currentSelectedGCnr != 0){
-					companyUI.GCnr_selection.setValue(selectedGC, true); 
-				}
-				while (companyUI.c_ownedGridConnections.get(companyUI.v_currentSelectedGCnr) != GC){ //Check if selected
-					companyUI.GCnr_selection.setValue(selectedGC++, true);
-				}
-			}
-			
-			// rbSetting Bugfix, does not change the heating system if the radiobutton was disabled!			
-			boolean rbSetting = companyUI.rb_heatingTypePrivateUI.isEnabled();
-			companyUI.rb_heatingTypePrivateUI.setEnabled(true);
-			companyUI.rb_heatingTypePrivateUI.setValue(0, true);
-			companyUI.rb_heatingTypePrivateUI.setEnabled(rbSetting);
-			companyUI.rb_scenariosPrivateUI.setValue(2, false);
-			companyUI.b_runningMainInterfaceSlider = false;
-
-			//Reorder c_orderedHeatingSystems
-			zero_Interface.c_orderedHeatingSystemsCompanies.remove(GC);
-			zero_Interface.c_orderedHeatingSystemsCompanies.add(0, GC);
-			
-			nbHeatPumps--;
-		}
-		else{//No more heating assets to adjust: this is the minimum: set slider to minimum and do nothing else
-			int min_nbOfHeatpumps = count(zero_Interface.energyModel.UtilityConnections, gc -> gc.v_isActive && gc.p_primaryHeatingAsset instanceof J_EAConversionHeatPump) + v_totalNumberOfGhostHeatingSystems_ElectricHeatpumps + v_totalNumberOfGhostHeatingSystems_HybridHeatpumps;
-			int min_pct_ElectricHeatpumpSlider = (int) ((float) min_nbOfHeatpumps / nbConnectionsWithHeat * 100.0);
-			sliderHeatpump.setValue(min_pct_ElectricHeatpumpSlider, false);
-			sliderGasburner.setValue(100-min_pct_ElectricHeatpumpSlider, false);
-			return;
+		companyUI.b_runningMainInterfaceSlider = true;
+		if(companyUI.c_ownedGridConnections.get(companyUI.v_currentSelectedGCnr) != company){
+			int i = indexOf(companyUI.c_ownedGridConnections.stream().toArray(), company);
+			companyUI.GCnr_selection.setValue(i, true);
 		}
+		// rbSetting Bugfix, does not change the heating system if the radiobutton was disabled!			
+		boolean rbSetting = companyUI.rb_heatingTypePrivateUI.isEnabled();
+		companyUI.rb_heatingTypePrivateUI.setEnabled(true);
+		companyUI.rb_heatingTypePrivateUI.setValue(0, true); // First option is gasburner
+		companyUI.rb_heatingTypePrivateUI.setEnabled(rbSetting);
+		companyUI.rb_scenariosPrivateUI.setValue(2, false);
+		companyUI.b_runningMainInterfaceSlider = false;
+
+		//Reorder c_orderedHeatingSystems
+		zero_Interface.c_orderedHeatingSystemsCompanies.remove(company);
+		zero_Interface.c_orderedHeatingSystemsCompanies.add(0, company);
+		companies.remove(company);
+		nbHeatPumps--;
 	}
-} else { 
-	while ( targetHeatPumpAmount > nbHeatPumps) { // remove gasburners, add heatpumps.
-			
-		GridConnection GC = findFirst(zero_Interface.c_orderedHeatingSystemsCompanies, gc -> gc.p_primaryHeatingAsset instanceof J_EAConversionGasBurner);
-		if (GC!=null) {
-			UI_company companyUI = zero_Interface.c_companyUIs.get(GC.p_owner.p_connectionOwnerIndexNr);
-			companyUI.b_runningMainInterfaceSlider = true;
-			if(companyUI.c_ownedGridConnections.get(companyUI.v_currentSelectedGCnr) != GC){
-				int selectedGC = 0;
-				if(companyUI.v_currentSelectedGCnr != 0){
-					companyUI.GCnr_selection.setValue(selectedGC, true); 
-				}
-				while (companyUI.c_ownedGridConnections.get(companyUI.v_currentSelectedGCnr) != GC){ //Check if selected
-					companyUI.GCnr_selection.setValue(selectedGC++, true);
-				}
-			}
-			
-			// rbSetting Bugfix, does not change the heating system if the radiobutton was disabled!
-			boolean rbSetting = companyUI.rb_heatingTypePrivateUI.isEnabled();
-			companyUI.rb_heatingTypePrivateUI.setEnabled(true);
-			companyUI.rb_heatingTypePrivateUI.setValue(2, true);
-			companyUI.rb_heatingTypePrivateUI.setEnabled(rbSetting);
-			companyUI.rb_scenariosPrivateUI.setValue(2, false);
-			companyUI.b_runningMainInterfaceSlider = false;
-			
-			//Reorder c_orderedHeatingSystems
-			zero_Interface.c_orderedHeatingSystemsCompanies.remove(GC);
-			zero_Interface.c_orderedHeatingSystemsCompanies.add(0, GC);
-			
-			nbHeatPumps++;
-		}
-		else{//No more gas burner assets to adjust: this is the minimum: set slider to minimum and do nothing else
-			int min_nbOfHeatpumps = count(zero_Interface.energyModel.UtilityConnections, gc -> gc.v_isActive && gc.p_primaryHeatingAsset instanceof J_EAConversionHeatPump) + v_totalNumberOfGhostHeatingSystems_ElectricHeatpumps + v_totalNumberOfGhostHeatingSystems_HybridHeatpumps;
-			int min_pct_ElectricHeatpumpSlider = (int) ((float) min_nbOfHeatpumps / nbConnectionsWithHeat * 100.0);
-			sliderHeatpump.setValue(min_pct_ElectricHeatpumpSlider, false);
-			sliderGasburner.setValue(100-min_pct_ElectricHeatpumpSlider, false);
-			return;
+	else { //No more heating assets to adjust: this is the minimum: set slider to minimum and do nothing else
+		int min_nbOfHeatpumps = count(gcList, gc -> gc.v_isActive && gc.p_primaryHeatingAsset instanceof J_EAConversionHeatPump) + nbOfGhostHeatingSystems;
+		int min_pct_ElectricHeatpumpSlider = roundToInt( min_nbOfHeatpumps * 100.0 / nbActiveCompanies );
+		sliderHeatpump.setValue(min_pct_ElectricHeatpumpSlider, false);
+		sliderGasburner.setValue(100-min_pct_ElectricHeatpumpSlider, false);
+		return;
+	}
+}
+
+while ( targetHeatPumpAmount > nbHeatPumps) { // remove gasburners, add heatpumps.
+		
+	GCUtility company = findFirst(companies, gc -> gc.p_primaryHeatingAsset instanceof J_EAConversionGasBurner);
+	if (company != null) {
+		UI_company companyUI = zero_Interface.c_companyUIs.get(company.p_owner.p_connectionOwnerIndexNr);
+		companyUI.b_runningMainInterfaceSlider = true;
+		if(companyUI.c_ownedGridConnections.get(companyUI.v_currentSelectedGCnr) != company){
+			int i = indexOf(companyUI.c_ownedGridConnections.stream().toArray(), company);
+			companyUI.GCnr_selection.setValue(i, true);
 		}
-	}	
+		
+		// rbSetting Bugfix, does not change the heating system if the radiobutton was disabled!
+		boolean rbSetting = companyUI.rb_heatingTypePrivateUI.isEnabled();
+		companyUI.rb_heatingTypePrivateUI.setEnabled(true);
+		companyUI.rb_heatingTypePrivateUI.setValue(2, true); // Third option (index 2) is electric heatpump
+		companyUI.rb_heatingTypePrivateUI.setEnabled(rbSetting);
+		companyUI.rb_scenariosPrivateUI.setValue(2, false);
+		companyUI.b_runningMainInterfaceSlider = false;
+		
+		//Reorder c_orderedHeatingSystems
+		zero_Interface.c_orderedHeatingSystemsCompanies.remove(company);
+		zero_Interface.c_orderedHeatingSystemsCompanies.add(0, company);
+		companies.remove(company);		
+		nbHeatPumps++;
+	}
+	else { //No more gas burner assets to adjust: this is the minimum: set slider to minimum and do nothing else
+		int min_nbOfHeatpumps = count(gcList, gc -> gc.v_isActive && gc.p_primaryHeatingAsset instanceof J_EAConversionHeatPump) + nbOfGhostHeatingSystems;
+		int min_pct_ElectricHeatpumpSlider = roundToInt( min_nbOfHeatpumps * 100.0 / nbActiveCompanies );
+		sliderHeatpump.setValue(min_pct_ElectricHeatpumpSlider, false);
+		sliderGasburner.setValue(100-min_pct_ElectricHeatpumpSlider, false);
+		return;
+	}
 }
 /*ALCODEEND*/}
 
-double f_calculateNumberOfGhostHeatingSystems()
+Pair<Integer, Integer> f_calculateNumberOfGhostHeatingSystems(List<GCUtility> gcList)
 {/*ALCODESTART::1729262524479*/
-v_totalNumberOfGhostHeatingSystems_ElectricHeatpumps = 0;
-v_totalNumberOfGhostHeatingSystems_HybridHeatpumps = 0;
+Integer numberOfGhostHeatingSystems_ElectricHeatpumps = 0;
+Integer numberOfGhostHeatingSystems_HybridHeatpumps = 0;
 
-for (UI_company companyUI : zero_Interface.c_companyUIs ){
-	
-	for(int i = 0; i < companyUI.c_ownedGridConnections.size(); i++){
-		if(companyUI.c_ownedGridConnections.get(i).v_hasQuarterHourlyValues && companyUI.c_ownedGridConnections.get(i).v_isActive){
-			if (companyUI.c_scenarioSettings_Current.get(i).getCurrentHeatingType() == OL_GridConnectionHeatingType.ELECTRIC_HEATPUMP){
-				v_totalNumberOfGhostHeatingSystems_ElectricHeatpumps++;
-			}
-			if (companyUI.c_scenarioSettings_Current.get(i).getCurrentHeatingType() == OL_GridConnectionHeatingType.HYBRID_HEATPUMP){
-				v_totalNumberOfGhostHeatingSystems_HybridHeatpumps++;
-			}
+for (GCUtility gc : gcList) {
+	if ( gc.v_hasQuarterHourlyValues && gc.v_isActive ) {
+		UI_company companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
+		int i = indexOf(companyUI.c_ownedGridConnections.stream().toArray(), gc);
+		if (companyUI.c_scenarioSettings_Current.get(i).getCurrentHeatingType() == OL_GridConnectionHeatingType.ELECTRIC_HEATPUMP){
+			numberOfGhostHeatingSystems_ElectricHeatpumps++;
+		}
+		if (companyUI.c_scenarioSettings_Current.get(i).getCurrentHeatingType() == OL_GridConnectionHeatingType.HYBRID_HEATPUMP){
+			numberOfGhostHeatingSystems_HybridHeatpumps++;
 		}
 	}
 }
 
+return new Pair(numberOfGhostHeatingSystems_ElectricHeatpumps, numberOfGhostHeatingSystems_HybridHeatpumps);
 /*ALCODEEND*/}
 
 double f_calculatePeakHeatDemand_kW(GridConnection gc)
diff --git a/_alp/Agents/tabHeating/Code/Functions.xml b/_alp/Agents/tabHeating/Code/Functions.xml
index 45b580c6..1fa6d68e 100644
--- a/_alp/Agents/tabHeating/Code/Functions.xml
+++ b/_alp/Agents/tabHeating/Code/Functions.xml
@@ -96,7 +96,7 @@
 		<ReturnType>double</ReturnType>
 		<Id>1722335783993</Id>
 		<Name><![CDATA[f_setDemandReductionHeating]]></Name>
-		<Description><![CDATA[Function that reduces the heat demand of all profile and consumption assets. Takes as an argument a percentage to reduce by compared to the default value of the consumption assets. Does not effect heating demand from gridconnection that have a thermal building model. ]]></Description>
+		<Description><![CDATA[Function that reduces the heat demand of all profile and consumption assets.  Takes as arguments a list of GridConnections to effect and a percentage to reduce by compared to the default value of the assets. Does not effect heating demand from gridconnection that have a thermal building model. ]]></Description>
 		<X>70</X>
 		<Y>590</Y>
 		<Label>
@@ -149,8 +149,8 @@
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
 	<Function AccessType="default" StaticFunction="false">
-		<ReturnModificator>VOID</ReturnModificator>
-		<ReturnType>double</ReturnType>
+		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
+		<ReturnType>Pair&lt;Integer, Integer&gt;</ReturnType>
 		<Id>1729262524479</Id>
 		<Name><![CDATA[f_calculateNumberOfGhostHeatingSystems]]></Name>
 		<X>40</X>
@@ -162,6 +162,10 @@
 		<PublicFlag>false</PublicFlag>
 		<PresentationFlag>true</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gcList]]></Name>
+			<Type><![CDATA[List<GCUtility>]]></Type>
+		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
 	<Function AccessType="default" StaticFunction="false">
@@ -170,7 +174,7 @@
 		<Id>1749116448649</Id>
 		<Name><![CDATA[f_calculatePeakHeatDemand_kW]]></Name>
 		<X>60</X>
-		<Y>900</Y>
+		<Y>890</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
diff --git a/_alp/Agents/tabHeating/Levels/Level.level.xml b/_alp/Agents/tabHeating/Levels/Level.level.xml
index 9ce4520e..c5080092 100644
--- a/_alp/Agents/tabHeating/Levels/Level.level.xml
+++ b/_alp/Agents/tabHeating/Levels/Level.level.xml
@@ -352,7 +352,7 @@
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
 					<ActionCode>f_setHeatingSliders( 0, sl_gasBurnerHouseholds_pct, sl_electricHeatPumpHouseholds_pct, null, null );
-f_setHeatingSystemsHouseholds( sl_electricHeatPumpHouseholds_pct.getValue() );
+f_setHeatingSystemsHouseholds( zero_Interface.energyModel.Houses.findAll( x -&gt; true), sl_electricHeatPumpHouseholds_pct.getValue() );
 </ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
@@ -415,7 +415,7 @@ f_setHeatingSystemsHouseholds( sl_electricHeatPumpHouseholds_pct.getValue() );
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
 					<ActionCode>f_setHeatingSliders( 1, sl_gasBurnerHouseholds_pct, sl_electricHeatPumpHouseholds_pct, null, null );
-f_setHeatingSystemsHouseholds( sl_electricHeatPumpHouseholds_pct.getValue() );
+f_setHeatingSystemsHouseholds( zero_Interface.energyModel.Houses.findAll( x -&gt; true), sl_electricHeatPumpHouseholds_pct.getValue() );
 </ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
@@ -867,7 +867,7 @@ f_setHeatingSystemsHouseholds( sl_electricHeatPumpHouseholds_pct.getValue() );
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
 					<ActionCode>f_setHeatingSliders( 0, sl_gasBurnerCompanies_pct, sl_electricHeatPumpCompanies_pct, null, null );
-f_setHeatingSystemsCompanies( sl_gasBurnerCompanies_pct, sl_electricHeatPumpCompanies_pct );
+f_setHeatingSystemsCompanies( zero_Interface.energyModel.UtilityConnections.findAll( x -&gt; true), sl_gasBurnerCompanies_pct, sl_electricHeatPumpCompanies_pct );
 
 zero_Interface.f_resetSettings();</ActionCode>
 				</BasicProperties>
@@ -930,7 +930,7 @@ zero_Interface.f_resetSettings();</ActionCode>
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
 					<ActionCode>f_setHeatingSliders( 1, sl_gasBurnerCompanies_pct, sl_electricHeatPumpCompanies_pct, null, null );
-f_setHeatingSystemsCompanies( sl_gasBurnerCompanies_pct, sl_electricHeatPumpCompanies_pct);
+f_setHeatingSystemsCompanies( zero_Interface.energyModel.UtilityConnections.findAll( x -&gt; true), sl_gasBurnerCompanies_pct, sl_electricHeatPumpCompanies_pct);
 
 zero_Interface.f_resetSettings();</ActionCode>
 				</BasicProperties>
@@ -1545,7 +1545,7 @@ f_setHeatingSystemsHouseholds();
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
 					<ActionCode>f_setHeatingSliders( 0, sl_heatDemandSlidersResidentialAreaHouseholdsGasBurner_pct, sl_heatDemandSlidersResidentialAreaHouseholdsElectricHeatPump_pct, null, null );
-f_setHeatingSystemsHouseholds( sl_heatDemandSlidersResidentialAreaHouseholdsElectricHeatPump_pct.getValue() );
+f_setHeatingSystemsHouseholds( zero_Interface.energyModel.Houses.findAll( x -&gt; true), sl_heatDemandSlidersResidentialAreaHouseholdsElectricHeatPump_pct.getValue() );
 </ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
@@ -1606,7 +1606,7 @@ f_setHeatingSystemsHouseholds();
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
 					<ActionCode>f_setHeatingSliders( 1, sl_heatDemandSlidersResidentialAreaHouseholdsGasBurner_pct, sl_heatDemandSlidersResidentialAreaHouseholdsElectricHeatPump_pct, null, null );
-f_setHeatingSystemsHouseholds( sl_heatDemandSlidersResidentialAreaHouseholdsElectricHeatPump_pct.getValue() );
+f_setHeatingSystemsHouseholds( zero_Interface.energyModel.Houses.findAll( x -&gt; true), sl_heatDemandSlidersResidentialAreaHouseholdsElectricHeatPump_pct.getValue() );
 </ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
@@ -2136,7 +2136,7 @@ zero_Interface.f_resetSettings();</ActionCode>
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
 					<ActionCode>f_setHeatingSliders( 0, sl_heatDemandSlidersCompaniesGasBurnerCompanies_pct, sl_heatDemandSlidersCompaniesElectricHeatPumpCompanies_pct, null, null );
-f_setHeatingSystemsCompanies( sl_heatDemandSlidersCompaniesGasBurnerCompanies_pct, sl_heatDemandSlidersCompaniesElectricHeatPumpCompanies_pct);
+f_setHeatingSystemsCompanies( zero_Interface.energyModel.UtilityConnections.findAll( x -&gt; true), sl_heatDemandSlidersCompaniesGasBurnerCompanies_pct, sl_heatDemandSlidersCompaniesElectricHeatPumpCompanies_pct);
 
 zero_Interface.f_resetSettings();</ActionCode>
 				</BasicProperties>
@@ -2198,7 +2198,7 @@ zero_Interface.f_resetSettings();</ActionCode>
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
 					<ActionCode>f_setHeatingSliders( 1, sl_heatDemandSlidersCompaniesGasBurnerCompanies_pct, sl_heatDemandSlidersCompaniesElectricHeatPumpCompanies_pct, null, null );
-f_setHeatingSystemsCompanies( sl_heatDemandSlidersCompaniesGasBurnerCompanies_pct, sl_heatDemandSlidersCompaniesElectricHeatPumpCompanies_pct);
+f_setHeatingSystemsCompanies( zero_Interface.energyModel.UtilityConnections.findAll( x -&gt; true), sl_heatDemandSlidersCompaniesGasBurnerCompanies_pct, sl_heatDemandSlidersCompaniesElectricHeatPumpCompanies_pct);
 
 zero_Interface.f_resetSettings();</ActionCode>
 				</BasicProperties>
diff --git a/_alp/Agents/tabMobility/AOC.tabMobility.xml b/_alp/Agents/tabMobility/AOC.tabMobility.xml
index 4ee5c996..4f9376a7 100644
--- a/_alp/Agents/tabMobility/AOC.tabMobility.xml
+++ b/_alp/Agents/tabMobility/AOC.tabMobility.xml
@@ -3,6 +3,7 @@
 	<Id>1722245324895</Id>
 	<Name><![CDATA[tabMobility]]></Name>
 	<AdditionalClassCode xmlns:al="http://anylogic.com"/>
+	<Import><![CDATA[import kotlin.Triple;]]></Import>
 	<ExtendsReference>
 		<PackageName>zerointerfaceloader</PackageName>
 		<ClassName>tabArea</ClassName>
diff --git a/_alp/Agents/tabMobility/Code/Functions.java b/_alp/Agents/tabMobility/Code/Functions.java
index 9dda20a0..cc8c008b 100644
--- a/_alp/Agents/tabMobility/Code/Functions.java
+++ b/_alp/Agents/tabMobility/Code/Functions.java
@@ -221,24 +221,23 @@
 */
 /*ALCODEEND*/}
 
-double f_setElectricVans(double pctElectricVansGoal,ShapeSlider sliderElectricVans,ShapeSlider sliderFFVans)
+double f_setElectricVans(List<GridConnection> gcList,double pctElectricVansGoal,ShapeSlider sliderElectricVans,ShapeSlider sliderFFVans)
 {/*ALCODESTART::1722256088451*/
-//Update variable to change to custom scenario
-if(!zero_Interface.b_runningMainInterfaceScenarios){
-	zero_Interface.b_changeToCustomScenario = true;
-}
+int numberOfGhostVehicle_Vans = f_calculateNumberOfGhostVehicles(gcList).getSecond();
 
-int nbEVansCurrent = count(zero_Interface.energyModel.f_getEnergyAssets(), p->p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VAN && !(p.getParentAgent() instanceof GCPublicCharger) && ((GridConnection)p.getParentAgent()).v_isActive) + v_totalNumberOfGhostVehicle_Vans;
-int nbDieselVansCurrent = count(zero_Interface.energyModel.f_getEnergyAssets(), p->p.energyAssetType == OL_EnergyAssetType.DIESEL_VAN && ((GridConnection)p.getParentAgent()).v_isActive);
-int nbElectricVansGoal = roundToInt((nbEVansCurrent + nbDieselVansCurrent)*pctElectricVansGoal/100.0);
-
-//Remember how much vehicles there are initially
+int nbEVansCurrent = numberOfGhostVehicle_Vans;
+int nbDieselVansCurrent = 0;
+for ( GridConnection gc : gcList ) {
+	nbEVansCurrent += count(gc.c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VAN && !(gc instanceof GCPublicCharger) && gc.v_isActive);
+	nbDieselVansCurrent += count(gc.c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.DIESEL_VAN && gc.v_isActive);
+}
 int total_vehicles = nbEVansCurrent + nbDieselVansCurrent;
 
+int nbElectricVansGoal = roundToInt((nbEVansCurrent + nbDieselVansCurrent)*pctElectricVansGoal/100.0);
 
 if( nbEVansCurrent > nbElectricVansGoal){
 	while ( nbEVansCurrent > nbElectricVansGoal && nbEVansCurrent > 0) { // remove excess EVs systems !!!! Should also add diesel vehicle again!
-		J_EAEV ev = (J_EAEV)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VAN && ((GridConnection)p.getParentAgent()).v_isActive);
+		J_EAEV ev = (J_EAEV)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VAN && ((GridConnection)p.getParentAgent()).v_isActive && gcList.contains((GridConnection)p.getParentAgent()) );
 		if (ev!=null) {
 			//traceln("Found eTrucks: " + ev);
 			GridConnection gc = (GridConnection)ev.getParentAgent();
@@ -301,10 +300,14 @@
 			nbDieselVansCurrent++;
 		}
 		else{//No more vehicles to adjust: this is the minimum: set slider to minimum and do nothing else
-			int total_electricVans = count(zero_Interface.energyModel.f_getEnergyAssets(), p->p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VAN && !(p.getParentAgent() instanceof GCPublicCharger)  && ((GridConnection)p.getParentAgent()).v_isActive) + v_totalNumberOfGhostVehicle_Vans;
+			int total_electricVans = count(zero_Interface.energyModel.f_getEnergyAssets(), p->p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VAN && !(p.getParentAgent() instanceof GCPublicCharger)  && ((GridConnection)p.getParentAgent()).v_isActive && gcList.contains(((GridConnection)p.getParentAgent())) ) + numberOfGhostVehicle_Vans;
 			int min_pct_electricVanSlider = roundToInt(100.0*total_electricVans/total_vehicles);
 			sliderElectricVans.setValue(min_pct_electricVanSlider, false);
 			sliderFFVans.setValue(100-min_pct_electricVanSlider, false);
+			if(!zero_Interface.b_runningMainInterfaceScenarios){
+				zero_Interface.b_changeToCustomScenario = true;
+			}
+			zero_Interface.f_resetSettings();
 			return;
 		}
 	} 
@@ -312,7 +315,7 @@
 	while ( nbEVansCurrent < nbElectricVansGoal && nbDieselVansCurrent > 0) {
 
 		// Remove diesel vehicle
-		J_EADieselVehicle dieselVehicle = (J_EADieselVehicle)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_VAN && ((GridConnection)p.getParentAgent()).v_isActive);
+		J_EADieselVehicle dieselVehicle = (J_EADieselVehicle)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_VAN && ((GridConnection)p.getParentAgent()).v_isActive && gcList.contains((GridConnection)p.getParentAgent()) );
 		//traceln("Found diesel vehicle: " + dieselVehicle);
 		if (dieselVehicle!=null) {
 			GridConnection gc = (GridConnection)dieselVehicle.getParentAgent();
@@ -377,27 +380,30 @@
 	
 }	
 
-//traceln("%s diesel vans and %s EVans: ", nbDieselVansCurrent, nbEVansCurrent);
-zero_Interface.f_resetSettings();
-/*ALCODEEND*/}
-
-double f_setElectricCars(double pctEVsGoal,ShapeSlider sliderElectricCars,ShapeSlider sliderFFCars)
-{/*ALCODESTART::1722256088460*/
 //Update variable to change to custom scenario
 if(!zero_Interface.b_runningMainInterfaceScenarios){
 	zero_Interface.b_changeToCustomScenario = true;
 }
+zero_Interface.f_resetSettings();
+/*ALCODEEND*/}
 
-int nbEVsCurrent = count(zero_Interface.energyModel.f_getEnergyAssets(), p->p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VEHICLE && !(p.getParentAgent() instanceof GCPublicCharger) && ((GridConnection)p.getParentAgent()).v_isActive) + v_totalNumberOfGhostVehicle_Cars;
-int nbDieselCarsCurrent = count(zero_Interface.energyModel.f_getEnergyAssets(), p->p.energyAssetType == OL_EnergyAssetType.DIESEL_VEHICLE && ((GridConnection)p.getParentAgent()).v_isActive);
-int nbEVsGoal = roundToInt((nbEVsCurrent + nbDieselCarsCurrent)*pctEVsGoal/100.0);
+double f_setElectricCars(List<GridConnection> gcList,double pctEVsGoal,ShapeSlider sliderElectricCars,ShapeSlider sliderFFCars)
+{/*ALCODESTART::1722256088460*/
+int numberOfGhostVehicle_Cars = f_calculateNumberOfGhostVehicles(gcList).getFirst();
 
-//Remember how much vehicles there are initially
+int nbEVsCurrent = numberOfGhostVehicle_Cars;
+int nbDieselCarsCurrent = 0;
+for ( GridConnection gc : gcList ) {
+	nbEVsCurrent += count(gc.c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VEHICLE && !(gc instanceof GCPublicCharger) && gc.v_isActive);
+	nbDieselCarsCurrent += count(gc.c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.DIESEL_VEHICLE && gc.v_isActive);
+}
 int total_vehicles = nbEVsCurrent + nbDieselCarsCurrent;
 
+int nbEVsGoal = roundToInt((nbEVsCurrent + nbDieselCarsCurrent)*pctEVsGoal/100.0);
+
 if( nbEVsCurrent > nbEVsGoal){
 	while ( nbEVsCurrent > nbEVsGoal && nbEVsCurrent > 0) { // remove excess EVs systems !!!! Should also add diesel vehicle again!
-		J_EAEV ev = (J_EAEV)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VEHICLE && ((GridConnection)p.getParentAgent()).v_isActive);
+		J_EAEV ev = (J_EAEV)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VEHICLE && ((GridConnection)p.getParentAgent()).v_isActive && gcList.contains(((GridConnection)p.getParentAgent())) );
 		if (ev!=null) {
 			//traceln("Found eTrucks: " + ev);
 			GridConnection gc = (GridConnection)ev.getParentAgent();
@@ -460,18 +466,22 @@
 			nbEVsCurrent--;
 			nbDieselCarsCurrent++;
 		}
-		else{//No more vehicles to adjust: this is the minimum: set slider to minimum and do nothing else
-				int total_electricCars = count(zero_Interface.energyModel.f_getEnergyAssets(), p->p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VEHICLE && !(p.getParentAgent() instanceof GCPublicCharger)  && ((GridConnection)p.getParentAgent()).v_isActive) + v_totalNumberOfGhostVehicle_Cars;
-				int min_pct_electricCarSlider = roundToInt(100.0*total_electricCars/total_vehicles);
-				sliderElectricCars.setValue(min_pct_electricCarSlider, false);
-				sliderFFCars.setValue(100-min_pct_electricCarSlider, false);
+		else { //No more vehicles to adjust: this is the minimum: set slider to minimum and do nothing else
+			int total_electricCars = count(zero_Interface.energyModel.f_getEnergyAssets(), p->p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VEHICLE && !(p.getParentAgent() instanceof GCPublicCharger)  && ((GridConnection)p.getParentAgent()).v_isActive) + numberOfGhostVehicle_Cars;
+			int min_pct_electricCarSlider = roundToInt(100.0*total_electricCars/total_vehicles);
+			sliderElectricCars.setValue(min_pct_electricCarSlider, false);
+			sliderFFCars.setValue(100-min_pct_electricCarSlider, false);
+			if(!zero_Interface.b_runningMainInterfaceScenarios){
+				zero_Interface.b_changeToCustomScenario = true;
+			}
+			zero_Interface.f_resetSettings();
 			return;
 		}
 	} 
 } else { 
 	while ( nbEVsCurrent < nbEVsGoal && nbDieselCarsCurrent > 0) {
 		// Remove diesel vehicle
-		J_EADieselVehicle dieselVehicle = (J_EADieselVehicle)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_VEHICLE && ((GridConnection)p.getParentAgent()).v_isActive);
+		J_EADieselVehicle dieselVehicle = (J_EADieselVehicle)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_VEHICLE && ((GridConnection)p.getParentAgent()).v_isActive && gcList.contains(((GridConnection)p.getParentAgent())) );
 		//traceln("Found diesel vehicle: " + dieselVehicle);
 		if (dieselVehicle!=null) {
 			GridConnection gc = (GridConnection)dieselVehicle.getParentAgent();
@@ -534,28 +544,35 @@
 		}
 	}
 	
-}	
+}
 
-//traceln("%s diesel cars and %s EVs: ", nbDieselCarsCurrent, nbEVsCurrent);
+//Update variable to change to custom scenario
+if(!zero_Interface.b_runningMainInterfaceScenarios){
+	zero_Interface.b_changeToCustomScenario = true;
+}
 zero_Interface.f_resetSettings();
 /*ALCODEEND*/}
 
-double f_setDemandReduction(double demandReduction_pct)
+double f_setDemandReduction(List<GridConnection> gcList,double demandReduction_pct)
 {/*ALCODESTART::1722342449665*/
 // TODO: when new triptrackers are created, for example in the company ui sliders,
 // make sure they have this distance scaling fraction!
 
-double mobilityDemandReduction_pct = demandReduction_pct;
+double scalingFactor = 1 - demandReduction_pct/100;
 
-for (J_EA j_ea : zero_Interface.energyModel.f_getEnergyAssets()) {
-	if (j_ea instanceof J_EAVehicle) {
-		((J_EAVehicle)j_ea).getTripTracker().distanceScaling_fr =  1 - mobilityDemandReduction_pct/100.0;
-		if (zero_Interface.c_companyUIs.size()>0){
-			UI_company companyUI = zero_Interface.c_companyUIs.get(((GridConnection)j_ea.getParentAgent()).p_owner.p_connectionOwnerIndexNr);
-			if (companyUI != null && companyUI.c_ownedGridConnections.get(companyUI.v_currentSelectedGCnr) == j_ea.getParentAgent()) { // should also check the setting of selected GC
-				companyUI.sl_mobilityDemandCompanyReduction.setValue(mobilityDemandReduction_pct, false);
+for (GridConnection gc : gcList) {
+	for (J_EAVehicle j_ea : gc.c_vehicleAssets) {
+		j_ea.getTripTracker().distanceScaling_fr = scalingFactor;
+	}
+	if (zero_Interface.c_companyUIs.size() > 0) {
+		UI_company companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
+		if (companyUI != null) {
+			if(companyUI.c_ownedGridConnections.get(companyUI.v_currentSelectedGCnr) != gc){
+				int i = indexOf(companyUI.c_ownedGridConnections.stream().toArray(), gc);
+				companyUI.GCnr_selection.setValue(i, true);
 			}
-		}	
+			companyUI.sl_mobilityDemandCompanyReduction.setValue(demandReduction_pct, false);			
+		}
 	}
 }
 
@@ -567,53 +584,49 @@
 zero_Interface.f_resetSettings();
 /*ALCODEEND*/}
 
-double f_calculateNumberOfGhostVehicles()
+Triple<Integer, Integer, Integer> f_calculateNumberOfGhostVehicles(List<GridConnection> gcList)
 {/*ALCODESTART::1729168033110*/
-v_totalNumberOfGhostVehicle_Cars = 0;
-v_totalNumberOfGhostVehicle_Vans = 0;
-v_totalNumberOfGhostVehicle_Trucks = 0;
-for (UI_company companyUI : zero_Interface.c_companyUIs ){
-	
-	for(int i = 0; i < companyUI.c_ownedGridConnections.size(); i++){
-		if(companyUI.c_ownedGridConnections.get(i).v_hasQuarterHourlyValues && companyUI.c_ownedGridConnections.get(i).v_isActive){
-			v_totalNumberOfGhostVehicle_Cars += companyUI.v_minEVCarSlider;
-			v_totalNumberOfGhostVehicle_Vans += companyUI.v_minEVVanSlider;
-			v_totalNumberOfGhostVehicle_Trucks += companyUI.v_minEVTruckSlider;
+Integer numberOfGhostVehicle_Cars = 0;
+Integer numberOfGhostVehicle_Vans = 0;
+Integer numberOfGhostVehicle_Trucks = 0;
+
+if (zero_Interface.c_companyUIs.size() > 0) {
+	for (GridConnection gc : gcList ) {
+		UI_company companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
+		for(int i = 0; i < companyUI.c_ownedGridConnections.size(); i++){
+			if(companyUI.c_ownedGridConnections.get(i).v_hasQuarterHourlyValues && companyUI.c_ownedGridConnections.get(i).v_isActive){
+				numberOfGhostVehicle_Cars += companyUI.v_minEVCarSlider;
+				numberOfGhostVehicle_Vans += companyUI.v_minEVVanSlider;
+				numberOfGhostVehicle_Trucks += companyUI.v_minEVTruckSlider;
+			}
 		}
 	}
 }
+
+return new Triple(numberOfGhostVehicle_Cars, numberOfGhostVehicle_Vans, numberOfGhostVehicle_Trucks);
 /*ALCODEEND*/}
 
-double f_setDieselTrucks(ShapeSlider sliderElectricTrucks,ShapeSlider sliderHydrogenTrucks,ShapeSlider sliderFFTrucks)
+double f_setDieselTrucks(List<GridConnection> gcList,ShapeSlider sliderElectricTrucks,ShapeSlider sliderHydrogenTrucks,ShapeSlider sliderFFTrucks)
 {/*ALCODESTART::1746008458894*/
 double pctDieselTrucksGoal = sliderFFTrucks.getValue();
 
+int numberOfGhostVehicle_Trucks = f_calculateNumberOfGhostVehicles(gcList).getThird();
+Triple<Integer, Integer, Integer> triple = f_calculateCurrentNumberOfTrucks( gcList, numberOfGhostVehicle_Trucks );
 
-//Update variable to change to custom scenario
-if(!zero_Interface.b_runningMainInterfaceScenarios){
-	zero_Interface.b_changeToCustomScenario = true;
-}
-
-//Get totals
-int nbEtruckCurrent = count(zero_Interface.energyModel.f_getEnergyAssets(), p->p.energyAssetType == OL_EnergyAssetType.ELECTRIC_TRUCK && !(p.getParentAgent() instanceof GCPublicCharger) && ((GridConnection)p.getParentAgent()).v_isActive) + v_totalNumberOfGhostVehicle_Trucks;
-int nbDieseltrucksCurrent = count(zero_Interface.energyModel.f_getEnergyAssets(), p->p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive);
-int nbHydrogentrucksCurrent = count(zero_Interface.energyModel.f_getEnergyAssets(), p->p.energyAssetType == OL_EnergyAssetType.HYDROGEN_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive);
-
+int nbEtruckCurrent = triple.getFirst();
+int nbDieseltrucksCurrent = triple.getSecond();
+int nbHydrogentrucksCurrent = triple.getThird();
 int total_vehicles = nbEtruckCurrent + nbDieseltrucksCurrent + nbHydrogentrucksCurrent;
 
-traceln("nbEtruckCurrent: %s", nbEtruckCurrent);
-traceln("nbDieseltrucksCurrent: %s", nbDieseltrucksCurrent);
-traceln("nbHydrogentrucksCurrent: %s", nbHydrogentrucksCurrent);
-traceln("total_vehicles: %s", total_vehicles);
-
 int nbDieselTrucksGoal = roundToInt(total_vehicles*pctDieselTrucksGoal/100.0);
 boolean finishedLookingThroughElectricTrucks = false;
+
 if (nbDieseltrucksCurrent < nbDieselTrucksGoal) {
 	// Add Diesel Trucks
 	while ( nbDieseltrucksCurrent < nbDieselTrucksGoal ) {
-		if ( nbEtruckCurrent > v_totalNumberOfGhostVehicle_Trucks && !finishedLookingThroughElectricTrucks ) {
+		if ( nbEtruckCurrent > numberOfGhostVehicle_Trucks && !finishedLookingThroughElectricTrucks ) {
 			// replace electric truck with a diesel truck
-			if (!f_electricToDieselTruck()) {
+			if (!f_electricToDieselTruck(gcList)) {
 				finishedLookingThroughElectricTrucks = true;
 			}
 			else {
@@ -623,7 +636,7 @@
 		}
 		else{// ( nbHydrogentrucksCurrent > 0 ) {
 			// replace hydrogen truck with diesel truck
-			if (!f_hydrogenToDieselTruck()) {
+			if (!f_hydrogenToDieselTruck(gcList)) {
 				f_setTruckSlidersToCurrentEngineState(sliderElectricTrucks, sliderHydrogenTrucks, sliderFFTrucks);
 				return;
 			}
@@ -641,7 +654,7 @@
 	// Remove Diesel Trucks
 	while ( nbDieseltrucksCurrent > nbDieselTrucksGoal ) {
 		// replace a diesel truck with an electric truck
-		if (!f_dieselToElectricTruck()) {
+		if (!f_dieselToElectricTruck(gcList)) {
 			f_setTruckSlidersToCurrentEngineState(sliderElectricTrucks, sliderHydrogenTrucks, sliderFFTrucks);
 			return;
 		}
@@ -650,30 +663,25 @@
 	}
 }
 
-zero_Interface.f_resetSettings();
-/*ALCODEEND*/}
-
-double f_setHydrogenTrucks(ShapeSlider sliderElectricTrucks,ShapeSlider sliderHydrogenTrucks,ShapeSlider sliderFFTrucks)
-{/*ALCODESTART::1746008458907*/
-double pctHydrogenTrucksGoal = sliderHydrogenTrucks.getValue();
-
 
 //Update variable to change to custom scenario
 if(!zero_Interface.b_runningMainInterfaceScenarios){
 	zero_Interface.b_changeToCustomScenario = true;
 }
+zero_Interface.f_resetSettings();
+/*ALCODEEND*/}
 
-//Get totals
-int nbEtruckCurrent = count(zero_Interface.energyModel.f_getEnergyAssets(), p->p.energyAssetType == OL_EnergyAssetType.ELECTRIC_TRUCK && !(p.getParentAgent() instanceof GCPublicCharger) && ((GridConnection)p.getParentAgent()).v_isActive) + v_totalNumberOfGhostVehicle_Trucks;
-int nbDieseltrucksCurrent = count(zero_Interface.energyModel.f_getEnergyAssets(), p->p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive);
-int nbHydrogentrucksCurrent = count(zero_Interface.energyModel.f_getEnergyAssets(), p->p.energyAssetType == OL_EnergyAssetType.HYDROGEN_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive);
+double f_setHydrogenTrucks(List<GridConnection> gcList,ShapeSlider sliderElectricTrucks,ShapeSlider sliderHydrogenTrucks,ShapeSlider sliderFFTrucks)
+{/*ALCODESTART::1746008458907*/
+double pctHydrogenTrucksGoal = sliderHydrogenTrucks.getValue();
 
-int total_vehicles = nbEtruckCurrent + nbDieseltrucksCurrent + nbHydrogentrucksCurrent;
+int numberOfGhostVehicle_Trucks = f_calculateNumberOfGhostVehicles(gcList).getThird();
+Triple<Integer, Integer, Integer> triple = f_calculateCurrentNumberOfTrucks( gcList, numberOfGhostVehicle_Trucks );
 
-traceln("nbEtruckCurrent: %s", nbEtruckCurrent);
-traceln("nbDieseltrucksCurrent: %s", nbDieseltrucksCurrent);
-traceln("nbHydrogentrucksCurrent: %s", nbHydrogentrucksCurrent);
-traceln("total_vehicles: %s", total_vehicles);
+int nbEtruckCurrent = triple.getFirst();
+int nbDieseltrucksCurrent = triple.getSecond();
+int nbHydrogentrucksCurrent = triple.getThird();
+int total_vehicles = nbEtruckCurrent + nbDieseltrucksCurrent + nbHydrogentrucksCurrent;
 
 int nbHydrogenTrucksGoal = roundToInt(total_vehicles*pctHydrogenTrucksGoal/100.0);
 boolean finishedLookingThroughDieselTrucks = false;
@@ -683,7 +691,7 @@
 	while ( nbHydrogentrucksCurrent < nbHydrogenTrucksGoal && !finishedLookingThroughDieselTrucks ) {
 		if ( nbDieseltrucksCurrent > 0 ) {
 			// replace a diesel truck with a hydrogen truck
-			if (!f_dieselToHydrogenTruck()) {
+			if (!f_dieselToHydrogenTruck(gcList)) {
 				finishedLookingThroughDieselTrucks = true;
 			}
 			else {
@@ -693,7 +701,7 @@
 		}
 		else{// ( nbEtruckCurrent > v_totalNumberOfGhostVehicle_Trucks ) {
 			// replace an electric truck with a hydrogen truck
-			if (!f_electricToHydrogenTruck()) {
+			if (!f_electricToHydrogenTruck(gcList)) {
 				f_setTruckSlidersToCurrentEngineState(sliderElectricTrucks, sliderHydrogenTrucks, sliderFFTrucks);
 				return;
 			}
@@ -709,7 +717,7 @@
 	// Remove Hydrogen Trucks
 	while ( nbHydrogentrucksCurrent > nbHydrogenTrucksGoal ) {
 		// replace a hydrogen truck with a diesel truck
-		if (!f_hydrogenToDieselTruck()) {
+		if (!f_hydrogenToDieselTruck(gcList)) {
 			f_setTruckSlidersToCurrentEngineState(sliderElectricTrucks, sliderHydrogenTrucks, sliderFFTrucks);
 			return;
 		}
@@ -718,30 +726,26 @@
 	}
 }
 
+//Update variable to change to custom scenario
+if(!zero_Interface.b_runningMainInterfaceScenarios){
+	zero_Interface.b_changeToCustomScenario = true;
+}
+
 zero_Interface.f_resetSettings();
 /*ALCODEEND*/}
 
-double f_setElectricTrucks(ShapeSlider sliderElectricTrucks,ShapeSlider sliderHydrogenTrucks,ShapeSlider sliderFFTrucks)
+double f_setElectricTrucks(List<GridConnection> gcList,ShapeSlider sliderElectricTrucks,ShapeSlider sliderHydrogenTrucks,ShapeSlider sliderFFTrucks)
 {/*ALCODESTART::1746008458917*/
 double pctElectricTrucksGoal = sliderElectricTrucks.getValue();
 
-//Update variable to change to custom scenario
-if(!zero_Interface.b_runningMainInterfaceScenarios){
-	zero_Interface.b_changeToCustomScenario = true;
-}
-
-//Get totals
-int nbEtruckCurrent = count(zero_Interface.energyModel.f_getEnergyAssets(), p->p.energyAssetType == OL_EnergyAssetType.ELECTRIC_TRUCK && !(p.getParentAgent() instanceof GCPublicCharger) && ((GridConnection)p.getParentAgent()).v_isActive) + v_totalNumberOfGhostVehicle_Trucks;
-int nbDieseltrucksCurrent = count(zero_Interface.energyModel.f_getEnergyAssets(), p->p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive);
-int nbHydrogentrucksCurrent = count(zero_Interface.energyModel.f_getEnergyAssets(), p->p.energyAssetType == OL_EnergyAssetType.HYDROGEN_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive);
+int numberOfGhostVehicle_Trucks = f_calculateNumberOfGhostVehicles(gcList).getThird();
+Triple<Integer, Integer, Integer> triple = f_calculateCurrentNumberOfTrucks( gcList, numberOfGhostVehicle_Trucks );
 
+int nbEtruckCurrent = triple.getFirst();
+int nbDieseltrucksCurrent = triple.getSecond();
+int nbHydrogentrucksCurrent = triple.getThird();
 int total_vehicles = nbEtruckCurrent + nbDieseltrucksCurrent + nbHydrogentrucksCurrent;
 
-traceln("nbEtruckCurrent: %s", nbEtruckCurrent);
-traceln("nbDieseltrucksCurrent: %s", nbDieseltrucksCurrent);
-traceln("nbHydrogentrucksCurrent: %s", nbHydrogentrucksCurrent);
-traceln("total_vehicles: %s", total_vehicles);
-
 int nbElectricTrucksGoal = roundToInt(total_vehicles*pctElectricTrucksGoal/100.0);
 boolean finishedLookingThroughDieselTrucks = false;
 
@@ -750,7 +754,7 @@
 	while ( nbEtruckCurrent < nbElectricTrucksGoal && !finishedLookingThroughDieselTrucks ) {
 		if ( nbDieseltrucksCurrent > 0 ) {
 			// replace a diesel truck with an electric truck
-			if (!f_dieselToElectricTruck()) {
+			if (!f_dieselToElectricTruck(gcList)) {
 				finishedLookingThroughDieselTrucks = true;
 			}
 			else {
@@ -760,7 +764,7 @@
 		}
 		else{// if ( nbHydrogentrucksCurrent > 0 ) {
 			// replace a hydrogen truck with an electric truck
-			if (!f_hydrogenToElectricTruck()) {
+			if (!f_hydrogenToElectricTruck(gcList)) {
 				f_setTruckSlidersToCurrentEngineState(sliderElectricTrucks, sliderHydrogenTrucks, sliderFFTrucks);
 				return;
 			}
@@ -777,7 +781,7 @@
 	// Remove Electric Trucks
 	while ( nbEtruckCurrent > nbElectricTrucksGoal ) {
 		// replace an electric truck with a diesel truck
-		if (!f_electricToDieselTruck()) {
+		if (!f_electricToDieselTruck(gcList)) {
 			f_setTruckSlidersToCurrentEngineState(sliderElectricTrucks, sliderHydrogenTrucks, sliderFFTrucks);
 			return;
 		}
@@ -786,26 +790,32 @@
 	}
 }
 
+//Update variable to change to custom scenario
+if(!zero_Interface.b_runningMainInterfaceScenarios){
+	zero_Interface.b_changeToCustomScenario = true;
+}
 zero_Interface.f_resetSettings();
 /*ALCODEEND*/}
 
-boolean f_dieselToElectricTruck()
+boolean f_dieselToElectricTruck(List<GridConnection> gcList)
 {/*ALCODESTART::1746008458938*/
 J_EADieselVehicle dieselTruck = null;
 boolean foundAdditionalVehicle = false;
-for (UI_company companyUI : zero_Interface.c_companyUIs) {
+
+for (GridConnection gc : gcList ) {
+	UI_company companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
 	List<J_EAVehicle> totalList = new ArrayList<J_EAVehicle>();
 	for (List<J_EAVehicle> list : companyUI.c_additionalVehicles.values() ) {
 		totalList.addAll(list);
 	}
-	dieselTruck = (J_EADieselVehicle)findFirst(totalList, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive);
+	dieselTruck = (J_EADieselVehicle)findFirst(totalList, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK && gc.v_isActive);
 	if ( dieselTruck != null ) {
 		foundAdditionalVehicle = true;
 		break;
 	}
 }
-if (!foundAdditionalVehicle) {
-	dieselTruck = (J_EADieselVehicle)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive);
+if (!foundAdditionalVehicle) {	
+	dieselTruck = (J_EADieselVehicle)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive && gcList.contains((GridConnection)p.getParentAgent()));
 }
 if (dieselTruck!=null) {
 	GridConnection gc = (GridConnection)dieselTruck.getParentAgent();
@@ -873,11 +883,13 @@ boolean f_dieselToElectricTruck()
 return true;
 /*ALCODEEND*/}
 
-boolean f_hydrogenToElectricTruck()
+boolean f_hydrogenToElectricTruck(List<GridConnection> gcList)
 {/*ALCODESTART::1746008458950*/
 J_EAHydrogenVehicle hydrogenTruck = null;
 boolean foundAdditionalVehicle = false;
-for (UI_company companyUI : zero_Interface.c_companyUIs) {
+
+for (GridConnection gc : gcList ) {
+	UI_company companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
 	List<J_EAVehicle> totalList = new ArrayList<J_EAVehicle>();
 	for (List<J_EAVehicle> list : companyUI.c_additionalVehicles.values() ) {
 		totalList.addAll(list);
@@ -889,7 +901,7 @@ boolean f_hydrogenToElectricTruck()
 	}
 }
 if (!foundAdditionalVehicle) {
-	hydrogenTruck = (J_EAHydrogenVehicle)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.HYDROGEN_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive);
+	hydrogenTruck = (J_EAHydrogenVehicle)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.HYDROGEN_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive && gcList.contains((GridConnection)p.getParentAgent()));
 }
 if (hydrogenTruck!=null) {
 	GridConnection gc = (GridConnection)hydrogenTruck.getParentAgent();
@@ -956,11 +968,13 @@ boolean f_hydrogenToElectricTruck()
 return true;
 /*ALCODEEND*/}
 
-boolean f_electricToHydrogenTruck()
+boolean f_electricToHydrogenTruck(List<GridConnection> gcList)
 {/*ALCODESTART::1746008458960*/
 J_EAEV electricTruck = null;
 boolean foundAdditionalVehicle = false;
-for (UI_company companyUI : zero_Interface.c_companyUIs) {
+
+for (GridConnection gc : gcList ) {
+	UI_company companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
 	List<J_EAVehicle> totalList = new ArrayList<J_EAVehicle>();
 	for (List<J_EAVehicle> list : companyUI.c_additionalVehicles.values() ) {
 		totalList.addAll(list);
@@ -972,7 +986,7 @@ boolean f_electricToHydrogenTruck()
 	}
 }
 if (!foundAdditionalVehicle) {
-	electricTruck = (J_EAEV)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.ELECTRIC_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive);
+	electricTruck = (J_EAEV)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.ELECTRIC_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive && gcList.contains((GridConnection)p.getParentAgent()));
 }
 if (electricTruck!=null) {
 	GridConnection gc = (GridConnection)electricTruck.getParentAgent();
@@ -1036,11 +1050,13 @@ boolean f_electricToHydrogenTruck()
 return true;
 /*ALCODEEND*/}
 
-boolean f_dieselToHydrogenTruck()
+boolean f_dieselToHydrogenTruck(List<GridConnection> gcList)
 {/*ALCODESTART::1746008458968*/
 J_EADieselVehicle dieselTruck = null;
 boolean foundAdditionalVehicle = false;
-for (UI_company companyUI : zero_Interface.c_companyUIs) {
+
+for (GridConnection gc : gcList ) {
+	UI_company companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
 	List<J_EAVehicle> totalList = new ArrayList<J_EAVehicle>();
 	for (List<J_EAVehicle> list : companyUI.c_additionalVehicles.values() ) {
 		totalList.addAll(list);
@@ -1052,7 +1068,7 @@ boolean f_dieselToHydrogenTruck()
 	}
 }
 if (!foundAdditionalVehicle) {
-	dieselTruck = (J_EADieselVehicle)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive);
+	dieselTruck = (J_EADieselVehicle)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive && gcList.contains((GridConnection)p.getParentAgent()));
 }
 if (dieselTruck!=null) {
 	GridConnection gc = (GridConnection)dieselTruck.getParentAgent();
@@ -1112,11 +1128,13 @@ boolean f_dieselToHydrogenTruck()
 return true;
 /*ALCODEEND*/}
 
-boolean f_electricToDieselTruck()
+boolean f_electricToDieselTruck(List<GridConnection> gcList)
 {/*ALCODESTART::1746008458977*/
 J_EAEV electricTruck = null;
 boolean foundAdditionalVehicle = false;
-for (UI_company companyUI : zero_Interface.c_companyUIs) {
+
+for (GridConnection gc : gcList ) {
+	UI_company companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
 	List<J_EAVehicle> totalList = new ArrayList<J_EAVehicle>();
 	for (List<J_EAVehicle> list : companyUI.c_additionalVehicles.values() ) {
 		totalList.addAll(list);
@@ -1128,7 +1146,7 @@ boolean f_electricToDieselTruck()
 	}
 }
 if (!foundAdditionalVehicle) {
-	electricTruck = (J_EAEV)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.ELECTRIC_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive);
+	electricTruck = (J_EAEV)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.ELECTRIC_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive && gcList.contains((GridConnection)p.getParentAgent()));
 }
 if ( electricTruck != null ) {
 	GridConnection gc = (GridConnection)electricTruck.getParentAgent();
@@ -1195,11 +1213,13 @@ boolean f_electricToDieselTruck()
 return true;
 /*ALCODEEND*/}
 
-boolean f_hydrogenToDieselTruck()
+boolean f_hydrogenToDieselTruck(List<GridConnection> gcList)
 {/*ALCODESTART::1746008458987*/
 J_EAHydrogenVehicle hydrogenTruck = null;
 boolean foundAdditionalVehicle = false;
-for (UI_company companyUI : zero_Interface.c_companyUIs) {
+
+for (GridConnection gc : gcList ) {
+	UI_company companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
 	List<J_EAVehicle> totalList = new ArrayList<J_EAVehicle>();
 	for (List<J_EAVehicle> list : companyUI.c_additionalVehicles.values() ) {
 		totalList.addAll(list);
@@ -1211,7 +1231,7 @@ boolean f_hydrogenToDieselTruck()
 	}
 }
 if (!foundAdditionalVehicle) {
-	hydrogenTruck = (J_EAHydrogenVehicle)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.HYDROGEN_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive);
+	hydrogenTruck = (J_EAHydrogenVehicle)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.HYDROGEN_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive && gcList.contains((GridConnection)p.getParentAgent()));
 }
 if ( hydrogenTruck != null ) {
 	GridConnection gc = (GridConnection)hydrogenTruck.getParentAgent();
@@ -1289,6 +1309,29 @@ boolean f_hydrogenToDieselTruck()
 sliderHydrogenTrucks.setValue(pct_hydrogenTruckSlider, false);
 sliderFFTrucks.setValue(pct_dieselTruckSlider, false);
 
+
+//Update variable to change to custom scenario
+if(!zero_Interface.b_runningMainInterfaceScenarios){
+	zero_Interface.b_changeToCustomScenario = true;
+}
 zero_Interface.f_resetSettings();
 /*ALCODEEND*/}
 
+Triple<Integer, Integer, Integer> f_calculateCurrentNumberOfTrucks(List<GridConnection> gcList,Integer numberOfGhostVehicle_Trucks)
+{/*ALCODESTART::1749134655530*/
+if (numberOfGhostVehicle_Trucks == null) {
+	numberOfGhostVehicle_Trucks = f_calculateNumberOfGhostVehicles(gcList).getThird();
+}
+
+int nbEtruckCurrent = numberOfGhostVehicle_Trucks;
+int nbDieseltrucksCurrent = 0;
+int nbHydrogentrucksCurrent = 0;
+for ( GridConnection gc : gcList ) {
+	nbEtruckCurrent += count(gc.c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.ELECTRIC_TRUCK && !(gc instanceof GCPublicCharger) && gc.v_isActive);
+	nbDieseltrucksCurrent += count(gc.c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK && gc.v_isActive);
+	nbHydrogentrucksCurrent += count(gc.c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.HYDROGEN_TRUCK && gc.v_isActive);
+}
+
+return new Triple(nbDieseltrucksCurrent, nbHydrogentrucksCurrent, nbEtruckCurrent);
+/*ALCODEEND*/}
+
diff --git a/_alp/Agents/tabMobility/Code/Functions.xml b/_alp/Agents/tabMobility/Code/Functions.xml
index 1c2ae2cd..4e8ae69f 100644
--- a/_alp/Agents/tabMobility/Code/Functions.xml
+++ b/_alp/Agents/tabMobility/Code/Functions.xml
@@ -78,6 +78,10 @@
 		<PublicFlag>false</PublicFlag>
 		<PresentationFlag>true</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gcList]]></Name>
+			<Type><![CDATA[List<GridConnection>]]></Type>
+		</Parameter>
 		<Parameter>
 			<Name><![CDATA[pctElectricVansGoal]]></Name>
 			<Type><![CDATA[double]]></Type>
@@ -107,6 +111,10 @@
 		<PublicFlag>false</PublicFlag>
 		<PresentationFlag>true</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gcList]]></Name>
+			<Type><![CDATA[List<GridConnection>]]></Type>
+		</Parameter>
 		<Parameter>
 			<Name><![CDATA[pctEVsGoal]]></Name>
 			<Type><![CDATA[double]]></Type>
@@ -126,7 +134,7 @@
 		<ReturnType>double</ReturnType>
 		<Id>1722342449665</Id>
 		<Name><![CDATA[f_setDemandReduction]]></Name>
-		<Description><![CDATA[Function that reduces the distance of all triptrackers. Takes as an argument a percentage to reduce by compared to the default distance value of the triptrackers.]]></Description>
+		<Description><![CDATA[Function that reduces the distance of all triptrackers of vehicles. Takes as arguments a list of GridConnections to effect and a percentage to reduce by compared to the default distance value of the triptrackers.]]></Description>
 		<X>70</X>
 		<Y>600</Y>
 		<Label>
@@ -136,6 +144,10 @@
 		<PublicFlag>false</PublicFlag>
 		<PresentationFlag>true</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gcList]]></Name>
+			<Type><![CDATA[List<GridConnection>]]></Type>
+		</Parameter>
 		<Parameter>
 			<Name><![CDATA[demandReduction_pct]]></Name>
 			<Type><![CDATA[double]]></Type>
@@ -143,8 +155,8 @@
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
 	<Function AccessType="default" StaticFunction="false">
-		<ReturnModificator>VOID</ReturnModificator>
-		<ReturnType>double</ReturnType>
+		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
+		<ReturnType>Triple&lt;Integer, Integer, Integer&gt;</ReturnType>
 		<Id>1729168033110</Id>
 		<Name><![CDATA[f_calculateNumberOfGhostVehicles]]></Name>
 		<X>20</X>
@@ -156,6 +168,10 @@
 		<PublicFlag>false</PublicFlag>
 		<PresentationFlag>true</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gcList]]></Name>
+			<Type><![CDATA[List<GridConnection>]]></Type>
+		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
 	<Function AccessType="public" StaticFunction="false">
@@ -172,6 +188,10 @@
 		<PublicFlag>false</PublicFlag>
 		<PresentationFlag>true</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gcList]]></Name>
+			<Type><![CDATA[List<GridConnection>]]></Type>
+		</Parameter>
 		<Parameter>
 			<Name><![CDATA[sliderElectricTrucks]]></Name>
 			<Type><![CDATA[ShapeSlider]]></Type>
@@ -200,6 +220,10 @@
 		<PublicFlag>false</PublicFlag>
 		<PresentationFlag>true</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gcList]]></Name>
+			<Type><![CDATA[List<GridConnection>]]></Type>
+		</Parameter>
 		<Parameter>
 			<Name><![CDATA[sliderElectricTrucks]]></Name>
 			<Type><![CDATA[ShapeSlider]]></Type>
@@ -228,6 +252,10 @@
 		<PublicFlag>false</PublicFlag>
 		<PresentationFlag>true</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gcList]]></Name>
+			<Type><![CDATA[List<GridConnection>]]></Type>
+		</Parameter>
 		<Parameter>
 			<Name><![CDATA[sliderElectricTrucks]]></Name>
 			<Type><![CDATA[ShapeSlider]]></Type>
@@ -256,6 +284,10 @@
 		<PublicFlag>false</PublicFlag>
 		<PresentationFlag>true</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gcList]]></Name>
+			<Type><![CDATA[List<GridConnection>]]></Type>
+		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
 	<Function AccessType="default" StaticFunction="false">
@@ -272,6 +304,10 @@
 		<PublicFlag>false</PublicFlag>
 		<PresentationFlag>true</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gcList]]></Name>
+			<Type><![CDATA[List<GridConnection>]]></Type>
+		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
 	<Function AccessType="default" StaticFunction="false">
@@ -288,6 +324,10 @@
 		<PublicFlag>false</PublicFlag>
 		<PresentationFlag>true</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gcList]]></Name>
+			<Type><![CDATA[List<GridConnection>]]></Type>
+		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
 	<Function AccessType="default" StaticFunction="false">
@@ -304,6 +344,10 @@
 		<PublicFlag>false</PublicFlag>
 		<PresentationFlag>true</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gcList]]></Name>
+			<Type><![CDATA[List<GridConnection>]]></Type>
+		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
 	<Function AccessType="default" StaticFunction="false">
@@ -320,6 +364,10 @@
 		<PublicFlag>false</PublicFlag>
 		<PresentationFlag>true</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gcList]]></Name>
+			<Type><![CDATA[List<GridConnection>]]></Type>
+		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
 	<Function AccessType="default" StaticFunction="false">
@@ -336,6 +384,10 @@
 		<PublicFlag>false</PublicFlag>
 		<PresentationFlag>true</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gcList]]></Name>
+			<Type><![CDATA[List<GridConnection>]]></Type>
+		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
 	<Function AccessType="default" StaticFunction="false">
@@ -366,4 +418,28 @@
 		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
+		<ReturnType>Triple&lt;Integer, Integer, Integer&gt;</ReturnType>
+		<Id>1749134655530</Id>
+		<Name><![CDATA[f_calculateCurrentNumberOfTrucks]]></Name>
+		<X>20</X>
+		<Y>960</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gcList]]></Name>
+			<Type><![CDATA[List<GridConnection>]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[numberOfGhostVehicle_Trucks]]></Name>
+			<Type><![CDATA[Integer]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
 </Functions>
diff --git a/_alp/Agents/tabMobility/Levels/Level.level.xml b/_alp/Agents/tabMobility/Levels/Level.level.xml
index 601079e5..5adc270b 100644
--- a/_alp/Agents/tabMobility/Levels/Level.level.xml
+++ b/_alp/Agents/tabMobility/Levels/Level.level.xml
@@ -112,7 +112,7 @@
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
 					<ActionCode>sl_electricCars_pct.setValue(100 - sl_fossilFuelCars_pct.getIntValue(), false);
-f_setElectricCars( sl_electricCars_pct.getValue(), sl_electricCars_pct, sl_fossilFuelCars_pct );</ActionCode>
+f_setElectricCars( zero_Interface.energyModel.f_getGridConnections(), sl_electricCars_pct.getValue(), sl_electricCars_pct, sl_fossilFuelCars_pct );</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -141,7 +141,7 @@ f_setElectricCars( sl_electricCars_pct.getValue(), sl_electricCars_pct, sl_fossi
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
 					<ActionCode>f_setVehicleSliders( 0, sl_electricTrucks_pct, sl_hydrogenTrucks_pct, sl_fossilFuelTrucks_pct );
-f_setElectricTrucks( sl_electricTrucks_pct, sl_hydrogenTrucks_pct, sl_fossilFuelTrucks_pct);</ActionCode>
+f_setElectricTrucks( zero_Interface.energyModel.f_getGridConnections(), sl_electricTrucks_pct, sl_hydrogenTrucks_pct, sl_fossilFuelTrucks_pct );</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -296,7 +296,7 @@ f_setElectricTrucks( sl_electricTrucks_pct, sl_hydrogenTrucks_pct, sl_fossilFuel
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setDemandReduction( sl_mobilityDemandReduction_pct.getValue() );
+					<ActionCode>f_setDemandReduction( zero_Interface.energyModel.f_getGridConnections(), sl_mobilityDemandReduction_pct.getValue() );
 </ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
@@ -352,7 +352,7 @@ f_setElectricTrucks( sl_electricTrucks_pct, sl_hydrogenTrucks_pct, sl_fossilFuel
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
 					<ActionCode>f_setVehicleSliders( 1, sl_electricTrucks_pct, sl_hydrogenTrucks_pct, sl_fossilFuelTrucks_pct );
-f_setHydrogenTrucks( sl_electricTrucks_pct, sl_hydrogenTrucks_pct, sl_fossilFuelTrucks_pct);</ActionCode>
+f_setHydrogenTrucks( zero_Interface.energyModel.f_getGridConnections(), sl_electricTrucks_pct, sl_hydrogenTrucks_pct, sl_fossilFuelTrucks_pct );</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -432,7 +432,7 @@ f_setHydrogenTrucks( sl_electricTrucks_pct, sl_hydrogenTrucks_pct, sl_fossilFuel
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
 					<ActionCode>f_setVehicleSliders( 2, sl_electricTrucks_pct, sl_hydrogenTrucks_pct, sl_fossilFuelTrucks_pct );
-f_setDieselTrucks(sl_electricTrucks_pct, sl_hydrogenTrucks_pct, sl_fossilFuelTrucks_pct);</ActionCode>
+f_setDieselTrucks( zero_Interface.energyModel.f_getGridConnections(), sl_electricTrucks_pct, sl_hydrogenTrucks_pct, sl_fossilFuelTrucks_pct );</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -537,7 +537,7 @@ f_setDieselTrucks(sl_electricTrucks_pct, sl_hydrogenTrucks_pct, sl_fossilFuelTru
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
 					<ActionCode>sl_fossilFuelCars_pct.setValue(100 - sl_electricCars_pct.getIntValue(), false);
-f_setElectricCars( sl_electricCars_pct.getValue(), sl_electricCars_pct, sl_fossilFuelCars_pct );</ActionCode>
+f_setElectricCars( zero_Interface.energyModel.f_getGridConnections(), sl_electricCars_pct.getValue(), sl_electricCars_pct, sl_fossilFuelCars_pct );</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -642,7 +642,7 @@ f_setElectricCars( sl_electricCars_pct.getValue(), sl_electricCars_pct, sl_fossi
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
 					<ActionCode>sl_electricVans_pct.setValue(100 - sl_fossilFuelVans_pct.getIntValue(), false);
-f_setElectricVans( sl_electricVans_pct.getValue(), sl_electricVans_pct, sl_fossilFuelVans_pct );</ActionCode>
+f_setElectricVans( zero_Interface.energyModel.f_getGridConnections(), sl_electricVans_pct.getValue(), sl_electricVans_pct, sl_fossilFuelVans_pct );</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -722,7 +722,7 @@ f_setElectricVans( sl_electricVans_pct.getValue(), sl_electricVans_pct, sl_fossi
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
 					<ActionCode>sl_fossilFuelVans_pct.setValue(100 - sl_electricVans_pct.getIntValue(), false);
-f_setElectricVans( sl_electricVans_pct.getValue(), sl_electricVans_pct, sl_fossilFuelVans_pct );</ActionCode>
+f_setElectricVans( zero_Interface.energyModel.f_getGridConnections(), sl_electricVans_pct.getValue(), sl_electricVans_pct, sl_fossilFuelVans_pct );</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>

From 7863c2e3e9860e209ba8fb453e685609d4a43b8e Mon Sep 17 00:00:00 2001
From: Luc-Sol <luc@solidegroep.nl>
Date: Thu, 12 Jun 2025 13:00:48 +0200
Subject: [PATCH 6/7] rewriting van and car functions + bugfixes

---
 .../Agents/tabElectricity/Code/Functions.java |   70 +-
 _alp/Agents/tabHeating/Code/Functions.java    |    3 +-
 _alp/Agents/tabMobility/Code/Functions.java   | 1486 +++++++++--------
 _alp/Agents/tabMobility/Code/Functions.xml    |  418 +++--
 .../Agents/tabMobility/Levels/Level.level.xml |   12 +-
 _alp/Agents/tabMobility/Variables.xml         |    6 +-
 6 files changed, 1141 insertions(+), 854 deletions(-)

diff --git a/_alp/Agents/tabElectricity/Code/Functions.java b/_alp/Agents/tabElectricity/Code/Functions.java
index e75fce04..235a73c8 100644
--- a/_alp/Agents/tabElectricity/Code/Functions.java
+++ b/_alp/Agents/tabElectricity/Code/Functions.java
@@ -43,44 +43,42 @@
 ArrayList<GCHouse> houses = new ArrayList<GCHouse>(zero_Interface.c_orderedPVSystemsHouses.stream().filter(gcList::contains).toList());
 int nbHouses = houses.size();
 int nbHousesWithPV = count(houses, x -> x.v_liveAssetsMetaData.hasPV == true);
-
-if ( PV_pct / 100.0 * nbHouses < nbHousesWithPV ) {
-	while ( PV_pct / 100.0 * nbHouses < nbHousesWithPV ) { // remove excess PV systems
-		GCHouse house = findFirst(houses, x -> x.v_liveAssetsMetaData.hasPV == true);	
-		J_EA pvAsset = findFirst(house.c_productionAssets, p -> p.energyAssetType == OL_EnergyAssetType.PHOTOVOLTAIC );
-		if (pvAsset != null) {
-			pvAsset.removeEnergyAsset();
-			houses.remove(house);
-			zero_Interface.c_orderedPVSystemsHouses.remove(house);
-			zero_Interface.c_orderedPVSystemsHouses.add(0, house);
-			nbHousesWithPV --; 
-		}
-		else {
-			traceln(" cant find PV asset in house that should have PV asset in f_setPVHouses (Interface)");
-		}
+int nbHousesWithPVGoal = roundToInt(PV_pct / 100.0 * nbHouses);
+
+while ( nbHousesWithPVGoal < nbHousesWithPV ) { // remove excess PV systems
+	GCHouse house = findFirst(houses, x -> x.v_liveAssetsMetaData.hasPV == true);	
+	J_EA pvAsset = findFirst(house.c_productionAssets, p -> p.energyAssetType == OL_EnergyAssetType.PHOTOVOLTAIC );
+	if (pvAsset != null) {
+		pvAsset.removeEnergyAsset();
+		houses.remove(house);
+		zero_Interface.c_orderedPVSystemsHouses.remove(house);
+		zero_Interface.c_orderedPVSystemsHouses.add(0, house);
+		nbHousesWithPV --; 
+	}
+	else {
+		traceln(" cant find PV asset in house that should have PV asset in f_setPVHouses (Interface)");
 	}
 }
-else {
-	while ( PV_pct / 100.0 * nbHouses > nbHousesWithPV ) {
-		GCHouse house = findFirst(houses, x -> x.v_liveAssetsMetaData.hasPV == false);
-		if (house == null){
-			traceln("No gridconnection without PV panels found! Current PVsystems count: %s", nbHousesWithPV);
-			break;
-		}
-		else {
-			String assetName = "Rooftop PV";
-			double capacityHeat_kW = 0.0;
-			double yearlyProductionHydrogen_kWh = 0.0;
-			double yearlyProductionMethane_kWh = 0.0;
-			double outputTemperature_degC = 0.0;
-			double installedPVCapacity_kW = uniform(3,6);
-
-			J_EAProduction productionAsset = new J_EAProduction ( house, OL_EnergyAssetType.PHOTOVOLTAIC, assetName, installedPVCapacity_kW, capacityHeat_kW, yearlyProductionMethane_kWh, yearlyProductionHydrogen_kWh, zero_Interface.energyModel.p_timeStep_h, outputTemperature_degC, zero_Interface.energyModel.pp_solarPVproduction );
-			houses.remove(house);
-			zero_Interface.c_orderedPVSystemsHouses.remove(house);
-			zero_Interface.c_orderedPVSystemsHouses.add(0, house);
-			nbHousesWithPV ++;	
-		}
+
+while ( nbHousesWithPVGoal > nbHousesWithPV ) {
+	GCHouse house = findFirst(houses, x -> x.v_liveAssetsMetaData.hasPV == false);
+	if (house == null){
+		traceln("No gridconnection without PV panels found! Current PVsystems count: %s", nbHousesWithPV);
+		break;
+	}
+	else {
+		String assetName = "Rooftop PV";
+		double capacityHeat_kW = 0.0;
+		double yearlyProductionHydrogen_kWh = 0.0;
+		double yearlyProductionMethane_kWh = 0.0;
+		double outputTemperature_degC = 0.0;
+		double installedPVCapacity_kW = uniform(3,6);
+
+		J_EAProduction productionAsset = new J_EAProduction ( house, OL_EnergyAssetType.PHOTOVOLTAIC, assetName, installedPVCapacity_kW, capacityHeat_kW, yearlyProductionMethane_kWh, yearlyProductionHydrogen_kWh, zero_Interface.energyModel.p_timeStep_h, outputTemperature_degC, zero_Interface.energyModel.pp_solarPVproduction );
+		houses.remove(house);
+		zero_Interface.c_orderedPVSystemsHouses.remove(house);
+		zero_Interface.c_orderedPVSystemsHouses.add(0, house);
+		nbHousesWithPV ++;	
 	}
 }
 
diff --git a/_alp/Agents/tabHeating/Code/Functions.java b/_alp/Agents/tabHeating/Code/Functions.java
index 5fc986d4..570c23e3 100644
--- a/_alp/Agents/tabHeating/Code/Functions.java
+++ b/_alp/Agents/tabHeating/Code/Functions.java
@@ -302,7 +302,8 @@ Pair<Integer, Integer> f_calculateNumberOfGhostHeatingSystems(List<GCUtility> gc
 	}
 }
 if (gc.p_BuildingThermalAsset != null) {
-	peakHeatDemand_kW += gc.p_BuildingThermalAsset.getCapacityHeat_kW();
+	double maximalTemperatureDifference_K = 30.0; // Approximation
+	peakHeatDemand_kW += gc.p_BuildingThermalAsset.getLossFactor_WpK() * maximalTemperatureDifference_K / 1000;
 }
 return peakHeatDemand_kW;
 /*ALCODEEND*/}
diff --git a/_alp/Agents/tabMobility/Code/Functions.java b/_alp/Agents/tabMobility/Code/Functions.java
index cc8c008b..bdf01e64 100644
--- a/_alp/Agents/tabMobility/Code/Functions.java
+++ b/_alp/Agents/tabMobility/Code/Functions.java
@@ -1,165 +1,3 @@
-double f_setElectricTrucks_OUD(double pctElectricTrucksGoal,ShapeSlider sliderElectricTrucks,ShapeSlider sliderFFTrucks)
-{/*ALCODESTART::1722256088432*/
-//Update variable to change to custom scenario
-if(!zero_Interface.b_runningMainInterfaceScenarios){
-	zero_Interface.b_changeToCustomScenario = true;
-}
-
-//Get totals
-int nbEtruckCurrent = count(zero_Interface.energyModel.f_getEnergyAssets(), p->p.energyAssetType == OL_EnergyAssetType.ELECTRIC_TRUCK && !(p.getParentAgent() instanceof GCPublicCharger) && ((GridConnection)p.getParentAgent()).v_isActive) + v_totalNumberOfGhostVehicle_Trucks;
-int nbDieseltrucksCurrent = count(zero_Interface.energyModel.f_getEnergyAssets(), p->p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive);
-int nbElectricTrucksGoal = roundToInt((nbEtruckCurrent + nbDieseltrucksCurrent)*pctElectricTrucksGoal/100.0);
-//traceln("%s diesel trucks and %s eTrucks found", nbDieseltrucksCurrent, nbEtruckCurrent);
-
-//Remember how much vehicles there are initially
-int total_vehicles = nbEtruckCurrent + nbDieseltrucksCurrent;
-//traceln(total_vehicles);
-
-if( nbEtruckCurrent > nbElectricTrucksGoal){
-	while ( nbEtruckCurrent > nbElectricTrucksGoal && nbEtruckCurrent > 0) { // remove excess EVs systems !!!! Should also add diesel vehicle again!
-		J_EAEV ev = (J_EAEV)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.ELECTRIC_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive);
-		if (ev!=null) {
-			//traceln("Found eTrucks: " + ev);
-			GridConnection gc = (GridConnection)ev.getParentAgent();
-			
-			// update UI company
-			UI_company companyUI = null;
-			boolean isAdditionalVehicle = false;
-			if (zero_Interface.c_companyUIs.size()>0){
-				companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
-				if (companyUI != null && companyUI.c_ownedGridConnections.get(companyUI.v_currentSelectedGCnr) == gc) { // should also check the setting of selected GC
-					int ghostTrucks = 0;
-					if(gc.v_hasQuarterHourlyValues){
-						ghostTrucks = companyUI.v_minEVTruckSlider;
-					}
-					
-					int nbGCElectricTrucks = count(gc.c_vehicleAssets, p -> p.energyAssetType == OL_EnergyAssetType.ELECTRIC_TRUCK) + ghostTrucks;
-					int nbGCDieselTrucks = count(gc.c_vehicleAssets, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK);
-					if (companyUI.v_minEVTruckSlider >= nbGCElectricTrucks) {
-						traceln("Removed already existing Electric Truck from GC: " + companyUI.p_companyName);
-					}
-					else {
-						companyUI.sl_electricTrucksCompany.setValue(nbGCElectricTrucks-1, false);
-						companyUI.v_nbEVTrucks--;
-						companyUI.sl_dieselTrucksCompany.setValue(nbGCDieselTrucks+1, false);
-						companyUI.v_nbDieselTrucks++;
-					}
-					companyUI.rb_scenariosPrivateUI.setValue(2, false);
-					
-				}
-				if(companyUI != null){
-					for(GridConnection GC: companyUI.c_ownedGridConnections){
-						if(companyUI.c_additionalVehicles.get(GC).contains(ev)){
-							companyUI.c_additionalVehicles.get(GC).remove(ev);
-							isAdditionalVehicle = true;
-						}
-					}
-				}
-			}
-			
-			J_ActivityTrackerTrips tripTracker = ev.tripTracker;
-			boolean available = true;
-			available = ev.getAvailability();
-			zero_Interface.c_orderedVehicles.remove(ev);
-			ev.removeEnergyAsset();
-			//traceln("Removing EV from gridConnection:" + GC.p_gridConnectionID);
-		
-			// Re-add diesel vehicle
-			double energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgDieselConsumptionTruck_kWhpkm;
-			double vehicleScaling = 1.0;
-			J_EADieselVehicle dieselVehicle = new J_EADieselVehicle(gc, energyConsumption_kWhpkm, zero_Interface.energyModel.p_timeStep_h, vehicleScaling, OL_EnergyAssetType.DIESEL_TRUCK, tripTracker);
-			dieselVehicle.available = available;
-			
-			zero_Interface.c_orderedVehicles.add(0, dieselVehicle);
-			
-			//check if was additional vehicle in companyUI, if so: add to collection
-			if(companyUI != null && isAdditionalVehicle){
-				companyUI.c_additionalVehicles.get(gc).add(dieselVehicle);
-			}
-			
-			nbEtruckCurrent--; 
-			nbDieseltrucksCurrent++;
-		}
-		else{//No more vehicles to adjust: this is the minimum: set slider to minimum and do nothing else
-				int total_electricTrucks = count(zero_Interface.energyModel.f_getEnergyAssets(), p->p.energyAssetType == OL_EnergyAssetType.ELECTRIC_TRUCK && !(p.getParentAgent() instanceof GCPublicCharger)  && ((GridConnection)p.getParentAgent()).v_isActive) + v_totalNumberOfGhostVehicle_Trucks;
-				int min_pct_electricTruckSlider = roundToInt(100.0*total_electricTrucks/total_vehicles);
-				sliderElectricTrucks.setValue(min_pct_electricTruckSlider, false);
-				sliderFFTrucks.setValue(100-min_pct_electricTruckSlider, false);
-			return;
-		}
-	} 
-} else { 
-	while ( nbEtruckCurrent < nbElectricTrucksGoal && nbDieseltrucksCurrent > 0) {
-	
-		
-		// Remove diesel vehicle
-		J_EADieselVehicle dieselVehicle = (J_EADieselVehicle)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive);
-		//traceln("Found diesel vehicle: " + dieselVehicle);
-		if (dieselVehicle!=null) {
-			GridConnection gc = (GridConnection)dieselVehicle.getParentAgent();
-			
-			
-			// update UI company
-			UI_company companyUI = null;
-			boolean isAdditionalVehicle = false;
-			if (zero_Interface.c_companyUIs.size()>0){
-				companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
-				if (companyUI != null && companyUI.c_ownedGridConnections.get(companyUI.v_currentSelectedGCnr) == gc) { // should also check the setting of selected GC
-					int ghostTrucks = 0;
-					if(gc.v_hasQuarterHourlyValues){
-						ghostTrucks = companyUI.v_minEVTruckSlider;
-					}
-					int nbGCElectricTrucks = count(gc.c_vehicleAssets, p -> p.energyAssetType == OL_EnergyAssetType.ELECTRIC_TRUCK) + ghostTrucks;
-					int nbGCDieselTrucks = count(gc.c_vehicleAssets, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK);
-					companyUI.sl_electricTrucksCompany.setValue(nbGCElectricTrucks+1, false);
-					companyUI.v_nbEVTrucks++;
-					companyUI.sl_dieselTrucksCompany.setValue(nbGCDieselTrucks-1, false);
-					companyUI.v_nbDieselTrucks--;
-					companyUI.rb_scenariosPrivateUI.setValue(2, false);
-				}
-				if(companyUI != null){
-					for(GridConnection GC: companyUI.c_ownedGridConnections){
-						if(companyUI.c_additionalVehicles.get(GC).contains(dieselVehicle)){
-							companyUI.c_additionalVehicles.get(GC).remove(dieselVehicle);
-							isAdditionalVehicle = true;
-						}
-					}
-				}
-			}
-			
-			J_ActivityTrackerTrips tripTracker = dieselVehicle.tripTracker;
-			boolean available = true;
-			available = dieselVehicle.getAvailability();
-			zero_Interface.c_orderedVehicles.remove(dieselVehicle);
-			dieselVehicle.removeEnergyAsset();
-			//traceln("Removing household DIESEL VEHICLE from household:" + GC.p_gridConnectionID);
-	
-			double capacityElectric_kW = zero_Interface.energyModel.avgc_data.p_avgEVMaxChargePowerTruck_kW;
-			double storageCapacity_kWh = zero_Interface.energyModel.avgc_data.p_avgEVStorageTruck_kWh;
-			double initialStateOfCharge_r = 1.0;
-			double energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgEVEnergyConsumptionTruck_kWhpkm;
-			double vehicleScalingElectric = 1.0;
-			J_EAEV ev = new J_EAEV(gc, capacityElectric_kW, storageCapacity_kWh, initialStateOfCharge_r, zero_Interface.energyModel.p_timeStep_h, energyConsumption_kWhpkm, vehicleScalingElectric, OL_EnergyAssetType.ELECTRIC_TRUCK, tripTracker);  
-			ev.available = available;
-			
-			zero_Interface.c_orderedVehicles.add(0, ev);	
-			
-			//check if was additional vehicle in companyUI, if so: add to collection
-			if(companyUI != null && isAdditionalVehicle){
-				companyUI.c_additionalVehicles.get(gc).add(ev);
-			}
-			
-			nbEtruckCurrent++; 
-			nbDieseltrucksCurrent--;
-		}
-	}
-	
-}	
-
-//traceln("%s diesel trucks and %s eTrucks: ", nbDieseltrucksCurrent, nbEtruckCurrent);
-zero_Interface.f_resetSettings();
-/*ALCODEEND*/}
-
 double f_setVehicleSliders(int sliderIndex,ShapeSlider electricSlider,ShapeSlider hydrogenSlider,ShapeSlider fossilFuelSlider)
 {/*ALCODESTART::1722256088443*/
 double pct_electric = electricSlider.getValue();
@@ -221,338 +59,6 @@
 */
 /*ALCODEEND*/}
 
-double f_setElectricVans(List<GridConnection> gcList,double pctElectricVansGoal,ShapeSlider sliderElectricVans,ShapeSlider sliderFFVans)
-{/*ALCODESTART::1722256088451*/
-int numberOfGhostVehicle_Vans = f_calculateNumberOfGhostVehicles(gcList).getSecond();
-
-int nbEVansCurrent = numberOfGhostVehicle_Vans;
-int nbDieselVansCurrent = 0;
-for ( GridConnection gc : gcList ) {
-	nbEVansCurrent += count(gc.c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VAN && !(gc instanceof GCPublicCharger) && gc.v_isActive);
-	nbDieselVansCurrent += count(gc.c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.DIESEL_VAN && gc.v_isActive);
-}
-int total_vehicles = nbEVansCurrent + nbDieselVansCurrent;
-
-int nbElectricVansGoal = roundToInt((nbEVansCurrent + nbDieselVansCurrent)*pctElectricVansGoal/100.0);
-
-if( nbEVansCurrent > nbElectricVansGoal){
-	while ( nbEVansCurrent > nbElectricVansGoal && nbEVansCurrent > 0) { // remove excess EVs systems !!!! Should also add diesel vehicle again!
-		J_EAEV ev = (J_EAEV)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VAN && ((GridConnection)p.getParentAgent()).v_isActive && gcList.contains((GridConnection)p.getParentAgent()) );
-		if (ev!=null) {
-			//traceln("Found eTrucks: " + ev);
-			GridConnection gc = (GridConnection)ev.getParentAgent();
-			
-			// update UI company
-			UI_company companyUI = null;
-			boolean isAdditionalVehicle = false;
-			if (zero_Interface.c_companyUIs.size()>0){
-				companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
-				if (companyUI != null && companyUI.c_ownedGridConnections.get(companyUI.v_currentSelectedGCnr) == gc) { // should also check the setting of selected GC
-					int ghostVans = 0;
-					if(gc.v_hasQuarterHourlyValues){
-						ghostVans = companyUI.v_minEVVanSlider;
-					}
-					
-					int nbGCElectricVans = count(gc.c_vehicleAssets, p -> p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VAN) + ghostVans;
-					int nbGCDieselVans = count(gc.c_vehicleAssets, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_VAN);
-					if (companyUI.v_minEVVanSlider >= nbGCElectricVans) {
-						traceln("Removed already existing Electric Van from GC: " + companyUI.p_companyName);
-					}
-					else {
-						companyUI.sl_electricVansCompany.setValue(nbGCElectricVans-1, false);
-						companyUI.v_nbEVVans--;
-						companyUI.sl_dieselVansCompany.setValue(nbGCDieselVans+1, false);
-						companyUI.v_nbDieselVans++;
-					}
-					companyUI.rb_scenariosPrivateUI.setValue(2, false);
-				}
-				if(companyUI != null){
-					for(GridConnection GC: companyUI.c_ownedGridConnections){
-						if(companyUI.c_additionalVehicles.get(GC).contains(ev)){
-							companyUI.c_additionalVehicles.get(GC).remove(ev);
-							isAdditionalVehicle = true;
-						}
-					}
-				}
-			}
-			
-			J_ActivityTrackerTrips tripTracker = ev.tripTracker;
-			boolean available = true;
-			available = ev.getAvailability();
-			zero_Interface.c_orderedVehicles.remove(ev);
-			ev.removeEnergyAsset();
-			//traceln("Removing EV from gridConnection:" + GC.p_gridConnectionID);
-		
-			// Re-add diesel vehicle
-			double energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgDieselConsumptionVan_kWhpkm;
-			double vehicleScaling = 1.0;
-			J_EADieselVehicle dieselVehicle = new J_EADieselVehicle(gc, energyConsumption_kWhpkm, zero_Interface.energyModel.p_timeStep_h, vehicleScaling, OL_EnergyAssetType.DIESEL_VAN, tripTracker);
-			dieselVehicle.available = available;
-			
-			zero_Interface.c_orderedVehicles.add(0, dieselVehicle);
-
-			//check if was additional vehicle in companyUI, if so: add to collection
-			if(companyUI != null && isAdditionalVehicle){
-				companyUI.c_additionalVehicles.get(gc).add(dieselVehicle);
-			}
-			
-			nbEVansCurrent--;
-			nbDieselVansCurrent++;
-		}
-		else{//No more vehicles to adjust: this is the minimum: set slider to minimum and do nothing else
-			int total_electricVans = count(zero_Interface.energyModel.f_getEnergyAssets(), p->p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VAN && !(p.getParentAgent() instanceof GCPublicCharger)  && ((GridConnection)p.getParentAgent()).v_isActive && gcList.contains(((GridConnection)p.getParentAgent())) ) + numberOfGhostVehicle_Vans;
-			int min_pct_electricVanSlider = roundToInt(100.0*total_electricVans/total_vehicles);
-			sliderElectricVans.setValue(min_pct_electricVanSlider, false);
-			sliderFFVans.setValue(100-min_pct_electricVanSlider, false);
-			if(!zero_Interface.b_runningMainInterfaceScenarios){
-				zero_Interface.b_changeToCustomScenario = true;
-			}
-			zero_Interface.f_resetSettings();
-			return;
-		}
-	} 
-} else { 
-	while ( nbEVansCurrent < nbElectricVansGoal && nbDieselVansCurrent > 0) {
-
-		// Remove diesel vehicle
-		J_EADieselVehicle dieselVehicle = (J_EADieselVehicle)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_VAN && ((GridConnection)p.getParentAgent()).v_isActive && gcList.contains((GridConnection)p.getParentAgent()) );
-		//traceln("Found diesel vehicle: " + dieselVehicle);
-		if (dieselVehicle!=null) {
-			GridConnection gc = (GridConnection)dieselVehicle.getParentAgent();
-			
-			
-			// update UI company
-			UI_company companyUI = null;
-			boolean isAdditionalVehicle = false;
-			if (zero_Interface.c_companyUIs.size()>0){
-				companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
-				if (companyUI != null && companyUI.c_ownedGridConnections.get(companyUI.v_currentSelectedGCnr) == gc) { // should also check the setting of selected GC
-					int ghostVans = 0;
-					if(gc.v_hasQuarterHourlyValues){
-						ghostVans = companyUI.v_minEVVanSlider;
-					}
-					
-					int nbGCElectricVans = count(gc.c_vehicleAssets, p -> p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VAN) + ghostVans;
-					int nbGCDieselVans = count(gc.c_vehicleAssets, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_VAN);
-					companyUI.sl_electricVansCompany.setValue(nbGCElectricVans+1, false);	
-					companyUI.v_nbEVVans++;
-					companyUI.sl_dieselVansCompany.setValue(nbGCDieselVans-1, false);
-					companyUI.v_nbDieselVans--;
-					companyUI.rb_scenariosPrivateUI.setValue(2, false);
-				}
-				if(companyUI != null){
-					for(GridConnection GC: companyUI.c_ownedGridConnections){
-						if(companyUI.c_additionalVehicles.get(GC).contains(dieselVehicle)){
-							companyUI.c_additionalVehicles.get(GC).remove(dieselVehicle);
-							isAdditionalVehicle = true;
-						}
-					}
-				}
-			}
-			
-			J_ActivityTrackerTrips tripTracker = dieselVehicle.tripTracker;
-			boolean available = true;
-			available = dieselVehicle.getAvailability();
-			zero_Interface.c_orderedVehicles.remove(dieselVehicle);
-			dieselVehicle.removeEnergyAsset();
-			//traceln("Removing household DIESEL VEHICLE from household:" + GC.p_gridConnectionID);
-			
-			double capacityElectric_kW = zero_Interface.energyModel.avgc_data.p_avgEVMaxChargePowerVan_kW;
-			double storageCapacity_kWh = zero_Interface.energyModel.avgc_data.p_avgEVStorageVan_kWh;
-			double initialStateOfCharge_r = 1.0;
-			double energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgEVEnergyConsumptionVan_kWhpkm;
-			double vehicleScalingElectric = 1.0;
-			J_EAEV ev = new J_EAEV(gc, capacityElectric_kW, storageCapacity_kWh, initialStateOfCharge_r, zero_Interface.energyModel.p_timeStep_h, energyConsumption_kWhpkm, vehicleScalingElectric, OL_EnergyAssetType.ELECTRIC_VAN, tripTracker);  
-
-			ev.available = available;
-			
-			zero_Interface.c_orderedVehicles.add(0, ev);	
-			
-			//check if was additional vehicle in companyUI, if so: add to collection
-			if(companyUI != null && isAdditionalVehicle){
-				companyUI.c_additionalVehicles.get(gc).add(ev);
-			}
-			
-			nbEVansCurrent++;
-			nbDieselVansCurrent--;
-		}
-	}
-	
-}	
-
-//Update variable to change to custom scenario
-if(!zero_Interface.b_runningMainInterfaceScenarios){
-	zero_Interface.b_changeToCustomScenario = true;
-}
-zero_Interface.f_resetSettings();
-/*ALCODEEND*/}
-
-double f_setElectricCars(List<GridConnection> gcList,double pctEVsGoal,ShapeSlider sliderElectricCars,ShapeSlider sliderFFCars)
-{/*ALCODESTART::1722256088460*/
-int numberOfGhostVehicle_Cars = f_calculateNumberOfGhostVehicles(gcList).getFirst();
-
-int nbEVsCurrent = numberOfGhostVehicle_Cars;
-int nbDieselCarsCurrent = 0;
-for ( GridConnection gc : gcList ) {
-	nbEVsCurrent += count(gc.c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VEHICLE && !(gc instanceof GCPublicCharger) && gc.v_isActive);
-	nbDieselCarsCurrent += count(gc.c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.DIESEL_VEHICLE && gc.v_isActive);
-}
-int total_vehicles = nbEVsCurrent + nbDieselCarsCurrent;
-
-int nbEVsGoal = roundToInt((nbEVsCurrent + nbDieselCarsCurrent)*pctEVsGoal/100.0);
-
-if( nbEVsCurrent > nbEVsGoal){
-	while ( nbEVsCurrent > nbEVsGoal && nbEVsCurrent > 0) { // remove excess EVs systems !!!! Should also add diesel vehicle again!
-		J_EAEV ev = (J_EAEV)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VEHICLE && ((GridConnection)p.getParentAgent()).v_isActive && gcList.contains(((GridConnection)p.getParentAgent())) );
-		if (ev!=null) {
-			//traceln("Found eTrucks: " + ev);
-			GridConnection gc = (GridConnection)ev.getParentAgent();
-			
-			// update UI company
-			UI_company companyUI = null;
-			boolean isAdditionalVehicle = false;
-			if (zero_Interface.c_companyUIs.size()>0){
-				companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
-				if (companyUI != null && companyUI.c_ownedGridConnections.get(companyUI.v_currentSelectedGCnr) == gc) { // should also check the setting of selected GC
-					
-					int ghostCars = 0;
-					if(gc.v_hasQuarterHourlyValues){
-						ghostCars = companyUI.v_minEVCarSlider;
-					}
-					
-					int nbGCEVs = count(gc.c_vehicleAssets, p -> p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VEHICLE) + ghostCars;
-					int nbGCDieselCars = count(gc.c_vehicleAssets, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_VEHICLE);
-					if (companyUI.v_minEVCarSlider >= nbGCEVs) {
-						traceln("Removed already existing Electric Car from GC: " + companyUI.p_companyName);
-					}
-					else {
-						companyUI.sl_electricCarsCompany.setValue(nbGCEVs-1, false);
-						companyUI.v_nbEVCars--;
-						companyUI.sl_dieselCarsCompany.setValue(nbGCDieselCars+1, false);
-						companyUI.v_nbDieselCars++;
-					}
-					companyUI.rb_scenariosPrivateUI.setValue(2, false);
-				}
-				if(companyUI != null){
-					for(GridConnection GC: companyUI.c_ownedGridConnections){
-						if(companyUI.c_additionalVehicles.get(GC).contains(ev)){
-							companyUI.c_additionalVehicles.get(GC).remove(ev);
-							isAdditionalVehicle = true;		
-						}
-					}
-				}
-			}
-		
-			J_ActivityTrackerTrips tripTracker = ev.tripTracker;
-			boolean available = true;
-			available = ev.getAvailability();
-			zero_Interface.c_orderedVehicles.remove(ev);
-			ev.removeEnergyAsset();
-			//traceln("Removing EV from gridConnection:" + GC.p_gridConnectionID);
-		
-			// Re-add diesel vehicle
-			double energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgDieselConsumptionCar_kWhpkm;
-			double vehicleScaling = 1.0;	
-			J_EADieselVehicle dieselVehicle = new J_EADieselVehicle(gc, energyConsumption_kWhpkm, zero_Interface.energyModel.p_timeStep_h, vehicleScaling, OL_EnergyAssetType.DIESEL_VEHICLE, tripTracker);
-			dieselVehicle.available = available;
-			
-			zero_Interface.c_orderedVehicles.add(0, dieselVehicle);	
-				
-			//check if was additional vehicle in companyUI, if so: add to collection
-			if(companyUI != null && isAdditionalVehicle){
-				companyUI.c_additionalVehicles.get(gc).add(dieselVehicle);
-			}
-			
-			nbEVsCurrent--;
-			nbDieselCarsCurrent++;
-		}
-		else { //No more vehicles to adjust: this is the minimum: set slider to minimum and do nothing else
-			int total_electricCars = count(zero_Interface.energyModel.f_getEnergyAssets(), p->p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VEHICLE && !(p.getParentAgent() instanceof GCPublicCharger)  && ((GridConnection)p.getParentAgent()).v_isActive) + numberOfGhostVehicle_Cars;
-			int min_pct_electricCarSlider = roundToInt(100.0*total_electricCars/total_vehicles);
-			sliderElectricCars.setValue(min_pct_electricCarSlider, false);
-			sliderFFCars.setValue(100-min_pct_electricCarSlider, false);
-			if(!zero_Interface.b_runningMainInterfaceScenarios){
-				zero_Interface.b_changeToCustomScenario = true;
-			}
-			zero_Interface.f_resetSettings();
-			return;
-		}
-	} 
-} else { 
-	while ( nbEVsCurrent < nbEVsGoal && nbDieselCarsCurrent > 0) {
-		// Remove diesel vehicle
-		J_EADieselVehicle dieselVehicle = (J_EADieselVehicle)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_VEHICLE && ((GridConnection)p.getParentAgent()).v_isActive && gcList.contains(((GridConnection)p.getParentAgent())) );
-		//traceln("Found diesel vehicle: " + dieselVehicle);
-		if (dieselVehicle!=null) {
-			GridConnection gc = (GridConnection)dieselVehicle.getParentAgent();
-			
-			
-			// update UI company
-			UI_company companyUI = null;
-			boolean isAdditionalVehicle = false;
-			if (zero_Interface.c_companyUIs.size()>0){
-				companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
-				if (companyUI != null && companyUI.c_ownedGridConnections.get(companyUI.v_currentSelectedGCnr) == gc) { // should also check the setting of selected GC
-					
-					int ghostCars = 0;
-					if(gc.v_hasQuarterHourlyValues){
-						ghostCars = companyUI.v_minEVCarSlider;
-					}
-					
-					int nbGCEVs = count(gc.c_vehicleAssets, p -> p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VEHICLE) + ghostCars;
-					int nbGCDieselCars = count(gc.c_vehicleAssets, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_VEHICLE);
-					companyUI.sl_electricCarsCompany.setValue(nbGCEVs+1, false);
-					companyUI.v_nbEVCars++;
-					companyUI.sl_dieselCarsCompany.setValue(nbGCDieselCars-1, false);
-					companyUI.v_nbDieselCars--;
-					companyUI.rb_scenariosPrivateUI.setValue(2, false);
-				}
-				if(companyUI != null){
-					for(GridConnection GC: companyUI.c_ownedGridConnections){
-						if(companyUI.c_additionalVehicles.get(GC).contains(dieselVehicle)){
-							companyUI.c_additionalVehicles.get(GC).remove(dieselVehicle);
-							isAdditionalVehicle = true;
-						}
-					}
-				}
-			}
-			
-			J_ActivityTrackerTrips tripTracker = dieselVehicle.tripTracker;
-			boolean available = true;
-			available = dieselVehicle.getAvailability();
-			zero_Interface.c_orderedVehicles.remove(dieselVehicle);
-			dieselVehicle.removeEnergyAsset();
-			//traceln("Removing household DIESEL VEHICLE from household:" + GC.p_gridConnectionID);
-
-			double capacityElectric_kW = zero_Interface.energyModel.avgc_data.p_avgEVMaxChargePowerCar_kW;
-			double storageCapacity_kWh = zero_Interface.energyModel.avgc_data.p_avgEVStorageCar_kWh;
-			double initialStateOfCharge_r = 1.0;
-			double energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgEVEnergyConsumptionCar_kWhpkm;
-			double vehicleScalingElectric = 1.0;
-			J_EAEV ev = new J_EAEV(gc, capacityElectric_kW, storageCapacity_kWh, initialStateOfCharge_r, zero_Interface.energyModel.p_timeStep_h, energyConsumption_kWhpkm, vehicleScalingElectric, OL_EnergyAssetType.ELECTRIC_VEHICLE, tripTracker);  
-			ev.available = available;
-			
-			zero_Interface.c_orderedVehicles.add(0, ev);	
-
-			//check if was additional vehicle in companyUI, if so: add to collection
-			if(companyUI != null && isAdditionalVehicle){
-				companyUI.c_additionalVehicles.get(gc).add(ev);
-			}
-			
-			nbEVsCurrent++;
-			nbDieselCarsCurrent--;
-		}
-	}
-	
-}
-
-//Update variable to change to custom scenario
-if(!zero_Interface.b_runningMainInterfaceScenarios){
-	zero_Interface.b_changeToCustomScenario = true;
-}
-zero_Interface.f_resetSettings();
-/*ALCODEEND*/}
-
 double f_setDemandReduction(List<GridConnection> gcList,double demandReduction_pct)
 {/*ALCODESTART::1722342449665*/
 // TODO: when new triptrackers are created, for example in the company ui sliders,
@@ -606,17 +112,17 @@ Triple<Integer, Integer, Integer> f_calculateNumberOfGhostVehicles(List<GridConn
 return new Triple(numberOfGhostVehicle_Cars, numberOfGhostVehicle_Vans, numberOfGhostVehicle_Trucks);
 /*ALCODEEND*/}
 
-double f_setDieselTrucks(List<GridConnection> gcList,ShapeSlider sliderElectricTrucks,ShapeSlider sliderHydrogenTrucks,ShapeSlider sliderFFTrucks)
+double f_setDieselTrucks(List<GridConnection> gcList,ShapeSlider sliderElectricTrucks,ShapeSlider sliderHydrogenTrucks,ShapeSlider sliderFossilFuelTrucks)
 {/*ALCODESTART::1746008458894*/
-double pctDieselTrucksGoal = sliderFFTrucks.getValue();
+double pctDieselTrucksGoal = sliderFossilFuelTrucks.getValue();
 
 int numberOfGhostVehicle_Trucks = f_calculateNumberOfGhostVehicles(gcList).getThird();
 Triple<Integer, Integer, Integer> triple = f_calculateCurrentNumberOfTrucks( gcList, numberOfGhostVehicle_Trucks );
 
 int nbEtruckCurrent = triple.getFirst();
-int nbDieseltrucksCurrent = triple.getSecond();
-int nbHydrogentrucksCurrent = triple.getThird();
-int total_vehicles = nbEtruckCurrent + nbDieseltrucksCurrent + nbHydrogentrucksCurrent;
+int nbHydrogentrucksCurrent = triple.getSecond();
+int nbDieseltrucksCurrent = triple.getThird();
+int total_vehicles = nbEtruckCurrent + nbHydrogentrucksCurrent + nbDieseltrucksCurrent;
 
 int nbDieselTrucksGoal = roundToInt(total_vehicles*pctDieselTrucksGoal/100.0);
 boolean finishedLookingThroughElectricTrucks = false;
@@ -637,7 +143,7 @@ Triple<Integer, Integer, Integer> f_calculateNumberOfGhostVehicles(List<GridConn
 		else{// ( nbHydrogentrucksCurrent > 0 ) {
 			// replace hydrogen truck with diesel truck
 			if (!f_hydrogenToDieselTruck(gcList)) {
-				f_setTruckSlidersToCurrentEngineState(sliderElectricTrucks, sliderHydrogenTrucks, sliderFFTrucks);
+				f_setTruckSlidersToCurrentEngineState(gcList, sliderElectricTrucks, sliderHydrogenTrucks, sliderFossilFuelTrucks);
 				return;
 			}
 			nbDieseltrucksCurrent++;
@@ -655,7 +161,7 @@ Triple<Integer, Integer, Integer> f_calculateNumberOfGhostVehicles(List<GridConn
 	while ( nbDieseltrucksCurrent > nbDieselTrucksGoal ) {
 		// replace a diesel truck with an electric truck
 		if (!f_dieselToElectricTruck(gcList)) {
-			f_setTruckSlidersToCurrentEngineState(sliderElectricTrucks, sliderHydrogenTrucks, sliderFFTrucks);
+			f_setTruckSlidersToCurrentEngineState(gcList, sliderElectricTrucks, sliderHydrogenTrucks, sliderFossilFuelTrucks);
 			return;
 		}
 		nbDieseltrucksCurrent--;
@@ -671,7 +177,7 @@ Triple<Integer, Integer, Integer> f_calculateNumberOfGhostVehicles(List<GridConn
 zero_Interface.f_resetSettings();
 /*ALCODEEND*/}
 
-double f_setHydrogenTrucks(List<GridConnection> gcList,ShapeSlider sliderElectricTrucks,ShapeSlider sliderHydrogenTrucks,ShapeSlider sliderFFTrucks)
+double f_setHydrogenTrucks(List<GridConnection> gcList,ShapeSlider sliderElectricTrucks,ShapeSlider sliderHydrogenTrucks,ShapeSlider sliderFossilFuelTrucks)
 {/*ALCODESTART::1746008458907*/
 double pctHydrogenTrucksGoal = sliderHydrogenTrucks.getValue();
 
@@ -679,9 +185,9 @@ Triple<Integer, Integer, Integer> f_calculateNumberOfGhostVehicles(List<GridConn
 Triple<Integer, Integer, Integer> triple = f_calculateCurrentNumberOfTrucks( gcList, numberOfGhostVehicle_Trucks );
 
 int nbEtruckCurrent = triple.getFirst();
-int nbDieseltrucksCurrent = triple.getSecond();
-int nbHydrogentrucksCurrent = triple.getThird();
-int total_vehicles = nbEtruckCurrent + nbDieseltrucksCurrent + nbHydrogentrucksCurrent;
+int nbHydrogentrucksCurrent = triple.getSecond();
+int nbDieseltrucksCurrent = triple.getThird();
+int total_vehicles = nbEtruckCurrent + nbHydrogentrucksCurrent + nbDieseltrucksCurrent;
 
 int nbHydrogenTrucksGoal = roundToInt(total_vehicles*pctHydrogenTrucksGoal/100.0);
 boolean finishedLookingThroughDieselTrucks = false;
@@ -702,7 +208,7 @@ Triple<Integer, Integer, Integer> f_calculateNumberOfGhostVehicles(List<GridConn
 		else{// ( nbEtruckCurrent > v_totalNumberOfGhostVehicle_Trucks ) {
 			// replace an electric truck with a hydrogen truck
 			if (!f_electricToHydrogenTruck(gcList)) {
-				f_setTruckSlidersToCurrentEngineState(sliderElectricTrucks, sliderHydrogenTrucks, sliderFFTrucks);
+				f_setTruckSlidersToCurrentEngineState(gcList, sliderElectricTrucks, sliderHydrogenTrucks, sliderFossilFuelTrucks);
 				return;
 			}
 			nbHydrogentrucksCurrent++;
@@ -718,7 +224,7 @@ Triple<Integer, Integer, Integer> f_calculateNumberOfGhostVehicles(List<GridConn
 	while ( nbHydrogentrucksCurrent > nbHydrogenTrucksGoal ) {
 		// replace a hydrogen truck with a diesel truck
 		if (!f_hydrogenToDieselTruck(gcList)) {
-			f_setTruckSlidersToCurrentEngineState(sliderElectricTrucks, sliderHydrogenTrucks, sliderFFTrucks);
+			f_setTruckSlidersToCurrentEngineState(gcList, sliderElectricTrucks, sliderHydrogenTrucks, sliderFossilFuelTrucks);
 			return;
 		}
 		nbHydrogentrucksCurrent--;
@@ -734,7 +240,7 @@ Triple<Integer, Integer, Integer> f_calculateNumberOfGhostVehicles(List<GridConn
 zero_Interface.f_resetSettings();
 /*ALCODEEND*/}
 
-double f_setElectricTrucks(List<GridConnection> gcList,ShapeSlider sliderElectricTrucks,ShapeSlider sliderHydrogenTrucks,ShapeSlider sliderFFTrucks)
+double f_setElectricTrucks(List<GridConnection> gcList,ShapeSlider sliderElectricTrucks,ShapeSlider sliderHydrogenTrucks,ShapeSlider sliderFossilFuelTrucks)
 {/*ALCODESTART::1746008458917*/
 double pctElectricTrucksGoal = sliderElectricTrucks.getValue();
 
@@ -742,9 +248,9 @@ Triple<Integer, Integer, Integer> f_calculateNumberOfGhostVehicles(List<GridConn
 Triple<Integer, Integer, Integer> triple = f_calculateCurrentNumberOfTrucks( gcList, numberOfGhostVehicle_Trucks );
 
 int nbEtruckCurrent = triple.getFirst();
-int nbDieseltrucksCurrent = triple.getSecond();
-int nbHydrogentrucksCurrent = triple.getThird();
-int total_vehicles = nbEtruckCurrent + nbDieseltrucksCurrent + nbHydrogentrucksCurrent;
+int nbHydrogentrucksCurrent = triple.getSecond();
+int nbDieseltrucksCurrent = triple.getThird();
+int total_vehicles = nbEtruckCurrent + nbHydrogentrucksCurrent + nbDieseltrucksCurrent;
 
 int nbElectricTrucksGoal = roundToInt(total_vehicles*pctElectricTrucksGoal/100.0);
 boolean finishedLookingThroughDieselTrucks = false;
@@ -765,7 +271,7 @@ Triple<Integer, Integer, Integer> f_calculateNumberOfGhostVehicles(List<GridConn
 		else{// if ( nbHydrogentrucksCurrent > 0 ) {
 			// replace a hydrogen truck with an electric truck
 			if (!f_hydrogenToElectricTruck(gcList)) {
-				f_setTruckSlidersToCurrentEngineState(sliderElectricTrucks, sliderHydrogenTrucks, sliderFFTrucks);
+				f_setTruckSlidersToCurrentEngineState(gcList, sliderElectricTrucks, sliderHydrogenTrucks, sliderFossilFuelTrucks);
 				return;
 			}
 			nbEtruckCurrent++;
@@ -782,7 +288,7 @@ Triple<Integer, Integer, Integer> f_calculateNumberOfGhostVehicles(List<GridConn
 	while ( nbEtruckCurrent > nbElectricTrucksGoal ) {
 		// replace an electric truck with a diesel truck
 		if (!f_electricToDieselTruck(gcList)) {
-			f_setTruckSlidersToCurrentEngineState(sliderElectricTrucks, sliderHydrogenTrucks, sliderFFTrucks);
+			f_setTruckSlidersToCurrentEngineState(gcList, sliderElectricTrucks, sliderHydrogenTrucks, sliderFossilFuelTrucks);
 			return;
 		}
 		nbEtruckCurrent--;
@@ -802,18 +308,22 @@ boolean f_dieselToElectricTruck(List<GridConnection> gcList)
 J_EADieselVehicle dieselTruck = null;
 boolean foundAdditionalVehicle = false;
 
-for (GridConnection gc : gcList ) {
-	UI_company companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
-	List<J_EAVehicle> totalList = new ArrayList<J_EAVehicle>();
-	for (List<J_EAVehicle> list : companyUI.c_additionalVehicles.values() ) {
-		totalList.addAll(list);
-	}
-	dieselTruck = (J_EADieselVehicle)findFirst(totalList, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK && gc.v_isActive);
-	if ( dieselTruck != null ) {
-		foundAdditionalVehicle = true;
-		break;
+// find the diesel truck to remove, search through additional vehicles first
+if (zero_Interface.c_companyUIs.size() > 0 ) {
+	for (GridConnection gc : gcList ) {
+		UI_company companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
+		List<J_EAVehicle> totalList = new ArrayList<J_EAVehicle>();
+		for (List<J_EAVehicle> list : companyUI.c_additionalVehicles.values() ) {
+			totalList.addAll(list);
+		}
+		dieselTruck = (J_EADieselVehicle)findFirst(totalList, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK && gc.v_isActive);
+		if ( dieselTruck != null ) {
+			foundAdditionalVehicle = true;
+			break;
+		}
 	}
 }
+// if no additional vehicle was found, search through the regular ordering of vehicles
 if (!foundAdditionalVehicle) {	
 	dieselTruck = (J_EADieselVehicle)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive && gcList.contains((GridConnection)p.getParentAgent()));
 }
@@ -822,41 +332,24 @@ boolean f_dieselToElectricTruck(List<GridConnection> gcList)
 	
 	// update UI company
 	UI_company companyUI = null;
-	boolean isAdditionalVehicle = false;
 	if (zero_Interface.c_companyUIs.size() > 0){
 		companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
 		if (companyUI != null && companyUI.c_ownedGridConnections.get(companyUI.v_currentSelectedGCnr) == gc) { // should also check the setting of selected GC						
-			int ghostTrucks = 0;
-			if(gc.v_hasQuarterHourlyValues){
-				ghostTrucks = companyUI.v_minEVTruckSlider;
-			}
-			
-			int nbGCDieselTrucks = count(gc.c_vehicleAssets, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK);						
-			int nbGCElectricTrucks = count(gc.c_vehicleAssets, p -> p.energyAssetType == OL_EnergyAssetType.ELECTRIC_TRUCK) + ghostTrucks;
-			
-			companyUI.sl_dieselTrucksCompany.setValue(nbGCDieselTrucks-1, false);
 			companyUI.v_nbDieselTrucks--;
-			companyUI.sl_electricTrucksCompany.setValue(nbGCElectricTrucks+1, false);
+			companyUI.sl_dieselTrucksCompany.setValue(companyUI.v_nbDieselTrucks, false);
 			companyUI.v_nbEVTrucks++;
+			companyUI.sl_electricTrucksCompany.setValue(companyUI.v_nbEVTrucks, false);
 			companyUI.rb_scenariosPrivateUI.setValue(2, false);
-			
-		}
-		if(companyUI != null){
-			for(GridConnection GC: companyUI.c_ownedGridConnections){
-				if(companyUI.c_additionalVehicles.get(GC).contains(dieselTruck)){
-					companyUI.c_additionalVehicles.get(GC).remove(dieselTruck);
-					isAdditionalVehicle = true;
-				}
+			if (foundAdditionalVehicle) {
+				companyUI.c_additionalVehicles.get(gc).remove(dieselTruck);
 			}
 		}
 	}
-	
+		
 	J_ActivityTrackerTrips tripTracker = dieselTruck.tripTracker;
-	boolean available = true;
-	available = dieselTruck.getAvailability();
+	boolean available = dieselTruck.getAvailability();
 	zero_Interface.c_orderedVehicles.remove(dieselTruck);
 	dieselTruck.removeEnergyAsset();
-	//traceln("Removing EV from gridConnection:" + GC.p_gridConnectionID);
 
 	// Re-add Electric vehicle
 	double capacityElectric_kW = zero_Interface.energyModel.avgc_data.p_avgEVMaxChargePowerTruck_kW;
@@ -870,7 +363,7 @@ boolean f_dieselToElectricTruck(List<GridConnection> gcList)
 	zero_Interface.c_orderedVehicles.add(0, electricTruck);
 	
 	//check if was additional vehicle in companyUI, if so: add to collection
-	if(companyUI != null && isAdditionalVehicle){
+	if(companyUI != null && foundAdditionalVehicle){
 		companyUI.c_additionalVehicles.get(gc).add(electricTruck);
 	}
 }
@@ -888,18 +381,22 @@ boolean f_hydrogenToElectricTruck(List<GridConnection> gcList)
 J_EAHydrogenVehicle hydrogenTruck = null;
 boolean foundAdditionalVehicle = false;
 
-for (GridConnection gc : gcList ) {
-	UI_company companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
-	List<J_EAVehicle> totalList = new ArrayList<J_EAVehicle>();
-	for (List<J_EAVehicle> list : companyUI.c_additionalVehicles.values() ) {
-		totalList.addAll(list);
-	}
-	hydrogenTruck = (J_EAHydrogenVehicle)findFirst(totalList, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive);
-	if ( hydrogenTruck != null ) {
-		foundAdditionalVehicle = true;
-		break;
+// find the hydrogen truck to remove, search through additional vehicles first
+if (zero_Interface.c_companyUIs.size() > 0 ) {
+	for (GridConnection gc : gcList ) {
+		UI_company companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
+		List<J_EAVehicle> totalList = new ArrayList<J_EAVehicle>();
+		for (List<J_EAVehicle> list : companyUI.c_additionalVehicles.values() ) {
+			totalList.addAll(list);
+		}
+		hydrogenTruck = (J_EAHydrogenVehicle)findFirst(totalList, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive);
+		if ( hydrogenTruck != null ) {
+			foundAdditionalVehicle = true;
+			break;
+		}
 	}
 }
+// if no additional vehicle was found, search through the regular ordering of vehicles
 if (!foundAdditionalVehicle) {
 	hydrogenTruck = (J_EAHydrogenVehicle)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.HYDROGEN_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive && gcList.contains((GridConnection)p.getParentAgent()));
 }
@@ -908,32 +405,17 @@ boolean f_hydrogenToElectricTruck(List<GridConnection> gcList)
 	
 	// update UI company
 	UI_company companyUI = null;
-	boolean isAdditionalVehicle = false;
 	if (zero_Interface.c_companyUIs.size() > 0){
 		companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
 		if (companyUI != null && companyUI.c_ownedGridConnections.get(companyUI.v_currentSelectedGCnr) == gc) { // should also check the setting of selected GC
-			int ghostTrucks = 0;
-			if(gc.v_hasQuarterHourlyValues){
-				ghostTrucks = companyUI.v_minEVTruckSlider;
-			}
-			
-			int nbGCHydrogenTrucks = count(gc.c_vehicleAssets, p -> p.energyAssetType == OL_EnergyAssetType.HYDROGEN_TRUCK);
-			int nbGCElectricTrucks = count(gc.c_vehicleAssets, p -> p.energyAssetType == OL_EnergyAssetType.ELECTRIC_TRUCK) + ghostTrucks;
-
-			companyUI.sl_hydrogenTrucksCompany.setValue(nbGCHydrogenTrucks-1, false);
 			companyUI.v_nbHydrogenTrucks--;
-			companyUI.sl_electricTrucksCompany.setValue(nbGCElectricTrucks+1, false);
-			companyUI.v_nbEVTrucks++;						
-			companyUI.rb_scenariosPrivateUI.setValue(2, false);
-			
+			companyUI.sl_hydrogenTrucksCompany.setValue(companyUI.v_nbHydrogenTrucks, false);
+			companyUI.v_nbEVTrucks++;
+			companyUI.sl_electricTrucksCompany.setValue(companyUI.v_nbEVTrucks, false);
+			companyUI.rb_scenariosPrivateUI.setValue(2, false);	
 		}
-		if(companyUI != null){
-			for(GridConnection GC: companyUI.c_ownedGridConnections){
-				if(companyUI.c_additionalVehicles.get(GC).contains(hydrogenTruck)){
-					companyUI.c_additionalVehicles.get(GC).remove(hydrogenTruck);
-					isAdditionalVehicle = true;
-				}
-			}
+		if(foundAdditionalVehicle){
+			companyUI.c_additionalVehicles.get(gc).remove(hydrogenTruck);
 		}
 	}
 	
@@ -956,7 +438,7 @@ boolean f_hydrogenToElectricTruck(List<GridConnection> gcList)
 	zero_Interface.c_orderedVehicles.add(0, electricTruck);
 	
 	//check if was additional vehicle in companyUI, if so: add to collection
-	if(companyUI != null && isAdditionalVehicle){
+	if(companyUI != null && foundAdditionalVehicle){
 		companyUI.c_additionalVehicles.get(gc).add(electricTruck);
 	}
 }
@@ -973,18 +455,22 @@ boolean f_electricToHydrogenTruck(List<GridConnection> gcList)
 J_EAEV electricTruck = null;
 boolean foundAdditionalVehicle = false;
 
-for (GridConnection gc : gcList ) {
-	UI_company companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
-	List<J_EAVehicle> totalList = new ArrayList<J_EAVehicle>();
-	for (List<J_EAVehicle> list : companyUI.c_additionalVehicles.values() ) {
-		totalList.addAll(list);
-	}
-	electricTruck = (J_EAEV)findFirst(totalList, p -> p.energyAssetType == OL_EnergyAssetType.ELECTRIC_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive);
-	if ( electricTruck != null ) {
-		foundAdditionalVehicle = true;
-		break;
+// find the electric truck to remove, search through additional vehicles first
+if (zero_Interface.c_companyUIs.size() > 0 ) {
+	for (GridConnection gc : gcList ) {
+		UI_company companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
+		List<J_EAVehicle> totalList = new ArrayList<J_EAVehicle>();
+		for (List<J_EAVehicle> list : companyUI.c_additionalVehicles.values() ) {
+			totalList.addAll(list);
+		}
+		electricTruck = (J_EAEV)findFirst(totalList, p -> p.energyAssetType == OL_EnergyAssetType.ELECTRIC_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive);
+		if ( electricTruck != null ) {
+			foundAdditionalVehicle = true;
+			break;
+		}
 	}
 }
+// if no additional vehicle was found, search through the regular ordering of vehicle
 if (!foundAdditionalVehicle) {
 	electricTruck = (J_EAEV)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.ELECTRIC_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive && gcList.contains((GridConnection)p.getParentAgent()));
 }
@@ -993,32 +479,18 @@ boolean f_electricToHydrogenTruck(List<GridConnection> gcList)
 	
 	// update UI company
 	UI_company companyUI = null;
-	boolean isAdditionalVehicle = false;
 	if (zero_Interface.c_companyUIs.size() > 0){
 		companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
 		if (companyUI != null && companyUI.c_ownedGridConnections.get(companyUI.v_currentSelectedGCnr) == gc) { // should also check the setting of selected GC						
-			int ghostTrucks = 0;
-			if(gc.v_hasQuarterHourlyValues){
-				ghostTrucks = companyUI.v_minEVTruckSlider;
-			}
-			
-			int nbGCElectricTrucks = count(gc.c_vehicleAssets, p -> p.energyAssetType == OL_EnergyAssetType.ELECTRIC_TRUCK);						
-			int nbGCHydrogenTrucks = count(gc.c_vehicleAssets, p -> p.energyAssetType == OL_EnergyAssetType.HYDROGEN_TRUCK);
-			
-			companyUI.sl_electricTrucksCompany.setValue(nbGCElectricTrucks-1, false);
 			companyUI.v_nbEVTrucks--;
-			companyUI.sl_hydrogenTrucksCompany.setValue(nbGCHydrogenTrucks+1, false);
+			companyUI.sl_electricTrucksCompany.setValue(companyUI.v_nbEVTrucks, false);
 			companyUI.v_nbHydrogenTrucks++;
+			companyUI.sl_hydrogenTrucksCompany.setValue(companyUI.v_nbHydrogenTrucks, false);
 			companyUI.rb_scenariosPrivateUI.setValue(2, false);
 			
 		}
-		if(companyUI != null){
-			for(GridConnection GC: companyUI.c_ownedGridConnections){
-				if(companyUI.c_additionalVehicles.get(GC).contains(electricTruck)){
-					companyUI.c_additionalVehicles.get(GC).remove(electricTruck);
-					isAdditionalVehicle = true;
-				}
-			}
+		if(foundAdditionalVehicle){
+			companyUI.c_additionalVehicles.get(gc).remove(electricTruck);
 		}
 	}
 	
@@ -1027,7 +499,6 @@ boolean f_electricToHydrogenTruck(List<GridConnection> gcList)
 	available = electricTruck.getAvailability();
 	zero_Interface.c_orderedVehicles.remove(electricTruck);
 	electricTruck.removeEnergyAsset();
-	//traceln("Removing EV from gridConnection:" + GC.p_gridConnectionID);
 
 	// Re-add hydrogen vehicle
 	double energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgHydrogenConsumptionTruck_kWhpkm;			
@@ -1038,7 +509,7 @@ boolean f_electricToHydrogenTruck(List<GridConnection> gcList)
 	zero_Interface.c_orderedVehicles.add(0, hydrogenVehicle);
 	
 	//check if was additional vehicle in companyUI, if so: add to collection
-	if(companyUI != null && isAdditionalVehicle){
+	if(companyUI != null && foundAdditionalVehicle){
 		companyUI.c_additionalVehicles.get(gc).add(hydrogenVehicle);
 	}
 }				
@@ -1055,18 +526,22 @@ boolean f_dieselToHydrogenTruck(List<GridConnection> gcList)
 J_EADieselVehicle dieselTruck = null;
 boolean foundAdditionalVehicle = false;
 
-for (GridConnection gc : gcList ) {
-	UI_company companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
-	List<J_EAVehicle> totalList = new ArrayList<J_EAVehicle>();
-	for (List<J_EAVehicle> list : companyUI.c_additionalVehicles.values() ) {
-		totalList.addAll(list);
-	}
-	dieselTruck = (J_EADieselVehicle)findFirst(totalList, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive);
-	if ( dieselTruck != null ) {
-		foundAdditionalVehicle = true;
-		break;
+// find the diesel truck to remove, search through additional vehicles first
+if (zero_Interface.c_companyUIs.size() > 0 ) {
+	for (GridConnection gc : gcList ) {
+		UI_company companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
+		List<J_EAVehicle> totalList = new ArrayList<J_EAVehicle>();
+		for (List<J_EAVehicle> list : companyUI.c_additionalVehicles.values() ) {
+			totalList.addAll(list);
+		}
+		dieselTruck = (J_EADieselVehicle)findFirst(totalList, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive);
+		if ( dieselTruck != null ) {
+			foundAdditionalVehicle = true;
+			break;
+		}
 	}
 }
+// if no additional vehicle was found, search through the regular ordering of vehicles
 if (!foundAdditionalVehicle) {
 	dieselTruck = (J_EADieselVehicle)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive && gcList.contains((GridConnection)p.getParentAgent()));
 }
@@ -1075,28 +550,18 @@ boolean f_dieselToHydrogenTruck(List<GridConnection> gcList)
 	
 	// update UI company
 	UI_company companyUI = null;
-	boolean isAdditionalVehicle = false;
 	if (zero_Interface.c_companyUIs.size() > 0){
 		companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
 		if (companyUI != null && companyUI.c_ownedGridConnections.get(companyUI.v_currentSelectedGCnr) == gc) { // should also check the setting of selected GC						
-			
-			int nbGCDieselTrucks = count(gc.c_vehicleAssets, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK);						
-			int nbGCHydrogenTrucks = count(gc.c_vehicleAssets, p -> p.energyAssetType == OL_EnergyAssetType.HYDROGEN_TRUCK);
-			
-			companyUI.sl_dieselTrucksCompany.setValue(nbGCDieselTrucks-1, false);
 			companyUI.v_nbDieselTrucks--;
-			companyUI.sl_hydrogenTrucksCompany.setValue(nbGCHydrogenTrucks+1, false);
+			companyUI.sl_dieselTrucksCompany.setValue(companyUI.v_nbDieselTrucks, false);
 			companyUI.v_nbHydrogenTrucks++;
+			companyUI.sl_hydrogenTrucksCompany.setValue(companyUI.v_nbHydrogenTrucks, false);
 			companyUI.rb_scenariosPrivateUI.setValue(2, false);
 			
 		}
-		if(companyUI != null){
-			for(GridConnection GC: companyUI.c_ownedGridConnections){
-				if(companyUI.c_additionalVehicles.get(GC).contains(dieselTruck)){
-					companyUI.c_additionalVehicles.get(GC).remove(dieselTruck);
-					isAdditionalVehicle = true;
-				}
-			}
+		if(foundAdditionalVehicle){
+			companyUI.c_additionalVehicles.get(gc).remove(dieselTruck);
 		}
 	}
 	
@@ -1105,7 +570,6 @@ boolean f_dieselToHydrogenTruck(List<GridConnection> gcList)
 	available = dieselTruck.getAvailability();
 	zero_Interface.c_orderedVehicles.remove(dieselTruck);
 	dieselTruck.removeEnergyAsset();
-	//traceln("Removing EV from gridConnection:" + GC.p_gridConnectionID);
 
 	// Re-add hydrogen vehicle
 	double energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgHydrogenConsumptionTruck_kWhpkm;			
@@ -1116,7 +580,7 @@ boolean f_dieselToHydrogenTruck(List<GridConnection> gcList)
 	zero_Interface.c_orderedVehicles.add(0, hydrogenVehicle);
 	
 	//check if was additional vehicle in companyUI, if so: add to collection
-	if(companyUI != null && isAdditionalVehicle){
+	if(companyUI != null && foundAdditionalVehicle){
 		companyUI.c_additionalVehicles.get(gc).add(hydrogenVehicle);
 	}
 }
@@ -1133,18 +597,22 @@ boolean f_electricToDieselTruck(List<GridConnection> gcList)
 J_EAEV electricTruck = null;
 boolean foundAdditionalVehicle = false;
 
-for (GridConnection gc : gcList ) {
-	UI_company companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
-	List<J_EAVehicle> totalList = new ArrayList<J_EAVehicle>();
-	for (List<J_EAVehicle> list : companyUI.c_additionalVehicles.values() ) {
-		totalList.addAll(list);
-	}
-	electricTruck = (J_EAEV)findFirst(totalList, p -> p.energyAssetType == OL_EnergyAssetType.ELECTRIC_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive);
-	if ( electricTruck != null ) {
-		foundAdditionalVehicle = true;
-		break;
+// find the electric truck to remove, search through additional vehicles first
+if (zero_Interface.c_companyUIs.size() > 0 ) {
+	for (GridConnection gc : gcList ) {
+		UI_company companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
+		List<J_EAVehicle> totalList = new ArrayList<J_EAVehicle>();
+		for (List<J_EAVehicle> list : companyUI.c_additionalVehicles.values() ) {
+			totalList.addAll(list);
+		}
+		electricTruck = (J_EAEV)findFirst(totalList, p -> p.energyAssetType == OL_EnergyAssetType.ELECTRIC_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive);
+		if ( electricTruck != null ) {
+			foundAdditionalVehicle = true;
+			break;
+		}
 	}
 }
+// if no additional vehicle was found, search through the regular ordering of vehicles
 if (!foundAdditionalVehicle) {
 	electricTruck = (J_EAEV)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.ELECTRIC_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive && gcList.contains((GridConnection)p.getParentAgent()));
 }
@@ -1153,36 +621,23 @@ boolean f_electricToDieselTruck(List<GridConnection> gcList)
 	
 	// update UI company
 	UI_company companyUI = null;
-	boolean isAdditionalVehicle = false;
 	if (zero_Interface.c_companyUIs.size() > 0){
 		companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
 		if (companyUI != null && companyUI.c_ownedGridConnections.get(companyUI.v_currentSelectedGCnr) == gc) { // should also check the setting of selected GC
-			int ghostTrucks = 0;
-			if(gc.v_hasQuarterHourlyValues){
-				ghostTrucks = companyUI.v_minEVTruckSlider;
-			}
-			
-			int nbGCElectricTrucks = count(gc.c_vehicleAssets, p -> p.energyAssetType == OL_EnergyAssetType.ELECTRIC_TRUCK) + ghostTrucks;
-			int nbGCDieselTrucks = count(gc.c_vehicleAssets, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK);
-			if (companyUI.v_minEVTruckSlider >= nbGCElectricTrucks) {
+			if (companyUI.v_minEVTruckSlider >= companyUI.v_nbEVTrucks) {
 				traceln("Removed already existing Electric Truck from GC: " + companyUI.p_companyName);
 			}
 			else {
-				companyUI.sl_electricTrucksCompany.setValue(nbGCElectricTrucks-1, false);
 				companyUI.v_nbEVTrucks--;
-				companyUI.sl_dieselTrucksCompany.setValue(nbGCDieselTrucks+1, false);
+				companyUI.sl_electricTrucksCompany.setValue(companyUI.v_nbEVTrucks, false);
 				companyUI.v_nbDieselTrucks++;
+				companyUI.sl_dieselTrucksCompany.setValue(companyUI.v_nbDieselTrucks, false);
 			}
 			companyUI.rb_scenariosPrivateUI.setValue(2, false);
 			
 		}
-		if(companyUI != null){
-			for(GridConnection GC: companyUI.c_ownedGridConnections){
-				if(companyUI.c_additionalVehicles.get(GC).contains(electricTruck)){
-					companyUI.c_additionalVehicles.get(GC).remove(electricTruck);
-					isAdditionalVehicle = true;
-				}
-			}
+		if(foundAdditionalVehicle){
+			companyUI.c_additionalVehicles.get(gc).remove(electricTruck);
 		}
 	}
 	
@@ -1201,7 +656,7 @@ boolean f_electricToDieselTruck(List<GridConnection> gcList)
 	zero_Interface.c_orderedVehicles.add(0, dieselVehicle);
 	
 	//check if was additional vehicle in companyUI, if so: add to collection
-	if(companyUI != null && isAdditionalVehicle){
+	if(companyUI != null && foundAdditionalVehicle){
 		companyUI.c_additionalVehicles.get(gc).add(dieselVehicle);
 	}
 }
@@ -1218,18 +673,22 @@ boolean f_hydrogenToDieselTruck(List<GridConnection> gcList)
 J_EAHydrogenVehicle hydrogenTruck = null;
 boolean foundAdditionalVehicle = false;
 
-for (GridConnection gc : gcList ) {
-	UI_company companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
-	List<J_EAVehicle> totalList = new ArrayList<J_EAVehicle>();
-	for (List<J_EAVehicle> list : companyUI.c_additionalVehicles.values() ) {
-		totalList.addAll(list);
-	}
-	hydrogenTruck = (J_EAHydrogenVehicle)findFirst(totalList, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive);
-	if ( hydrogenTruck != null ) {
-		foundAdditionalVehicle = true;
-		break;
+// find the hydrogen truck to remove, search through additional vehicles first
+if (zero_Interface.c_companyUIs.size() > 0 ) {
+	for (GridConnection gc : gcList ) {
+		UI_company companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
+		List<J_EAVehicle> totalList = new ArrayList<J_EAVehicle>();
+		for (List<J_EAVehicle> list : companyUI.c_additionalVehicles.values() ) {
+			totalList.addAll(list);
+		}
+		hydrogenTruck = (J_EAHydrogenVehicle)findFirst(totalList, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive);
+		if ( hydrogenTruck != null ) {
+			foundAdditionalVehicle = true;
+			break;
+		}
 	}
 }
+// if no additional vehicle was found, search through the regular ordering of vehicles
 if (!foundAdditionalVehicle) {
 	hydrogenTruck = (J_EAHydrogenVehicle)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.HYDROGEN_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive && gcList.contains((GridConnection)p.getParentAgent()));
 }
@@ -1238,28 +697,17 @@ boolean f_hydrogenToDieselTruck(List<GridConnection> gcList)
 	
 	// update UI company
 	UI_company companyUI = null;
-	boolean isAdditionalVehicle = false;
 	if (zero_Interface.c_companyUIs.size() > 0){
 		companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
 		if (companyUI != null && companyUI.c_ownedGridConnections.get(companyUI.v_currentSelectedGCnr) == gc) { // should also check the setting of selected GC
-			
-			int nbGCHydrogenTrucks = count(gc.c_vehicleAssets, p -> p.energyAssetType == OL_EnergyAssetType.HYDROGEN_TRUCK);
-			int nbGCDieselTrucks = count(gc.c_vehicleAssets, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK);
-
-			companyUI.sl_hydrogenTrucksCompany.setValue(nbGCHydrogenTrucks-1, false);
 			companyUI.v_nbHydrogenTrucks--;
-			companyUI.sl_dieselTrucksCompany.setValue(nbGCDieselTrucks+1, false);
-			companyUI.v_nbDieselTrucks++;						
+			companyUI.sl_hydrogenTrucksCompany.setValue(companyUI.v_nbHydrogenTrucks, false);
+			companyUI.v_nbDieselTrucks++;
+			companyUI.sl_dieselTrucksCompany.setValue(companyUI.v_nbDieselTrucks, false);
 			companyUI.rb_scenariosPrivateUI.setValue(2, false);
-			
 		}
-		if(companyUI != null){
-			for(GridConnection GC: companyUI.c_ownedGridConnections){
-				if(companyUI.c_additionalVehicles.get(GC).contains(hydrogenTruck)){
-					companyUI.c_additionalVehicles.get(GC).remove(hydrogenTruck);
-					isAdditionalVehicle = true;
-				}
-			}
+		if(foundAdditionalVehicle){
+			companyUI.c_additionalVehicles.get(gc).remove(hydrogenTruck);
 		}
 	}
 	
@@ -1278,7 +726,7 @@ boolean f_hydrogenToDieselTruck(List<GridConnection> gcList)
 	zero_Interface.c_orderedVehicles.add(0, dieselVehicle);
 	
 	//check if was additional vehicle in companyUI, if so: add to collection
-	if(companyUI != null && isAdditionalVehicle){
+	if(companyUI != null && foundAdditionalVehicle){
 		companyUI.c_additionalVehicles.get(gc).add(dieselVehicle);
 	}
 }
@@ -1288,26 +736,38 @@ boolean f_hydrogenToDieselTruck(List<GridConnection> gcList)
 }
 
 return true;
-
 /*ALCODEEND*/}
 
-double f_setTruckSlidersToCurrentEngineState(ShapeSlider sliderElectricTrucks,ShapeSlider sliderHydrogenTrucks,ShapeSlider sliderFFTrucks)
+double f_setTruckSlidersToCurrentEngineState(List<GridConnection> gcList,ShapeSlider sliderElectricTrucks,ShapeSlider sliderHydrogenTrucks,ShapeSlider sliderFossilFuelTrucks)
 {/*ALCODESTART::1746018501114*/
-int nbEtrucksCurrent = count(zero_Interface.energyModel.f_getEnergyAssets(), p->p.energyAssetType == OL_EnergyAssetType.ELECTRIC_TRUCK && !(p.getParentAgent() instanceof GCPublicCharger) && ((GridConnection)p.getParentAgent()).v_isActive) + v_totalNumberOfGhostVehicle_Trucks;
-int nbDieseltrucksCurrent = count(zero_Interface.energyModel.f_getEnergyAssets(), p->p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive);
-int nbHydrogentrucksCurrent = count(zero_Interface.energyModel.f_getEnergyAssets(), p->p.energyAssetType == OL_EnergyAssetType.HYDROGEN_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive);
+List<J_EAVehicle> vehicles = new ArrayList<J_EAVehicle>();
+for (GridConnection gc : gcList) {
+	if (gc.v_isActive) {
+		vehicles.addAll(gc.c_vehicleAssets);
+	}
+}
+
+int numberOfGhostVehicle_Trucks = f_calculateNumberOfGhostVehicles(gcList).getThird();
+
+int nbElectricTrucksCurrent = count(vehicles, p->p.energyAssetType == OL_EnergyAssetType.ELECTRIC_TRUCK && !(p.getParentAgent() instanceof GCPublicCharger)) + numberOfGhostVehicle_Trucks;
+int nbDieseltrucksCurrent = count(vehicles, p->p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK);
+int nbHydrogentrucksCurrent = count(vehicles, p->p.energyAssetType == OL_EnergyAssetType.HYDROGEN_TRUCK);
 
-int totalVehicles = nbEtrucksCurrent + nbDieseltrucksCurrent + nbHydrogentrucksCurrent;
+int totalVehicles = nbElectricTrucksCurrent + nbDieseltrucksCurrent + nbHydrogentrucksCurrent;
 
 
 
-int pct_electricTruckSlider = roundToInt(100.0*nbEtrucksCurrent/totalVehicles);
+int pct_electricTruckSlider = roundToInt(100.0*nbElectricTrucksCurrent/totalVehicles);
 int pct_hydrogenTruckSlider = roundToInt(100.0*nbHydrogentrucksCurrent/totalVehicles);
 int pct_dieselTruckSlider = roundToInt(100.0*nbDieseltrucksCurrent/totalVehicles);
 
 sliderElectricTrucks.setValue(pct_electricTruckSlider, false);
-sliderHydrogenTrucks.setValue(pct_hydrogenTruckSlider, false);
-sliderFFTrucks.setValue(pct_dieselTruckSlider, false);
+if ( sliderHydrogenTrucks != null ) {
+	sliderHydrogenTrucks.setValue(pct_hydrogenTruckSlider, false);
+}
+else if ( sliderHydrogenTrucks == null && pct_hydrogenTruckSlider != 0 ) {
+	throw new RuntimeException("Hydrogen trucks found but no hydrogen slider passed to f_setTruckSlidersToCurrentEngineState");
+}sliderFossilFuelTrucks.setValue(pct_dieselTruckSlider, false);
 
 
 //Update variable to change to custom scenario
@@ -1324,14 +784,630 @@ Triple<Integer, Integer, Integer> f_calculateCurrentNumberOfTrucks(List<GridConn
 }
 
 int nbEtruckCurrent = numberOfGhostVehicle_Trucks;
-int nbDieseltrucksCurrent = 0;
-int nbHydrogentrucksCurrent = 0;
+int nbHydrogenTrucksCurrent = 0;
+int nbDieselTrucksCurrent = 0;
 for ( GridConnection gc : gcList ) {
 	nbEtruckCurrent += count(gc.c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.ELECTRIC_TRUCK && !(gc instanceof GCPublicCharger) && gc.v_isActive);
-	nbDieseltrucksCurrent += count(gc.c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK && gc.v_isActive);
-	nbHydrogentrucksCurrent += count(gc.c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.HYDROGEN_TRUCK && gc.v_isActive);
+	nbHydrogenTrucksCurrent += count(gc.c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.HYDROGEN_TRUCK && gc.v_isActive);
+	nbDieselTrucksCurrent += count(gc.c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK && gc.v_isActive);
+}
+
+return new Triple(nbEtruckCurrent, nbHydrogenTrucksCurrent, nbDieselTrucksCurrent);
+/*ALCODEEND*/}
+
+boolean f_dieselToElectricVan(List<GridConnection> gcList)
+{/*ALCODESTART::1749645625091*/
+J_EADieselVehicle dieselVan = null;
+boolean foundAdditionalVehicle = false;
+
+// find the diesel van to remove, search through additional vehicles first
+if (zero_Interface.c_companyUIs.size() > 0 ) {
+	for (GridConnection gc : gcList ) {
+		UI_company companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
+		List<J_EAVehicle> totalList = new ArrayList<J_EAVehicle>();
+		for (List<J_EAVehicle> list : companyUI.c_additionalVehicles.values() ) {
+			totalList.addAll(list);
+		}
+		dieselVan = (J_EADieselVehicle)findFirst(totalList, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_VAN && gc.v_isActive);
+		if ( dieselVan != null ) {
+			foundAdditionalVehicle = true;
+			break;
+		}
+	}
+}
+// if no additional vehicle was found, search through the regular ordering of vehicles
+if (!foundAdditionalVehicle) {	
+	dieselVan = (J_EADieselVehicle)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_VAN && ((GridConnection)p.getParentAgent()).v_isActive && gcList.contains((GridConnection)p.getParentAgent()));
+}
+if (dieselVan!=null) {
+	GridConnection gc = (GridConnection)dieselVan.getParentAgent();
+	
+	// update UI company
+	UI_company companyUI = null;
+	if (zero_Interface.c_companyUIs.size() > 0){
+		companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
+		if (companyUI != null && companyUI.c_ownedGridConnections.get(companyUI.v_currentSelectedGCnr) == gc) { // should also check the setting of selected GC						
+			companyUI.v_nbDieselVans--;
+			companyUI.sl_dieselVansCompany.setValue(companyUI.v_nbDieselVans, false);
+			companyUI.v_nbEVVans++;
+			companyUI.sl_electricVansCompany.setValue(companyUI.v_nbEVVans, false);
+			companyUI.rb_scenariosPrivateUI.setValue(2, false);
+			if (foundAdditionalVehicle) {
+				companyUI.c_additionalVehicles.get(gc).remove(dieselVan);
+			}
+		}
+	}
+		
+	J_ActivityTrackerTrips tripTracker = dieselVan.tripTracker;
+	boolean available = dieselVan.getAvailability();
+	zero_Interface.c_orderedVehicles.remove(dieselVan);
+	dieselVan.removeEnergyAsset();
+
+	// Re-add Electric vehicle
+	double capacityElectric_kW = zero_Interface.energyModel.avgc_data.p_avgEVMaxChargePowerVan_kW;
+	double storageCapacity_kWh = zero_Interface.energyModel.avgc_data.p_avgEVStorageVan_kWh;
+	double initialStateOfCharge_r = 1.0;
+	double energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgEVEnergyConsumptionVan_kWhpkm;
+	double vehicleScalingElectric = 1.0;
+	J_EAEV electricVan = new J_EAEV(gc, capacityElectric_kW, storageCapacity_kWh, initialStateOfCharge_r, zero_Interface.energyModel.p_timeStep_h, energyConsumption_kWhpkm, vehicleScalingElectric, OL_EnergyAssetType.ELECTRIC_VAN, tripTracker);  
+	electricVan.available = available;
+	
+	zero_Interface.c_orderedVehicles.add(0, electricVan);
+	
+	//check if was additional vehicle in companyUI, if so: add to collection
+	if(companyUI != null && foundAdditionalVehicle){
+		companyUI.c_additionalVehicles.get(gc).add(electricVan);
+	}
+}
+
+else {
+	return false;
+	//throw new RuntimeException("Numbers suggest there is a diesel van left, but could not find it.");
 }
 
-return new Triple(nbDieseltrucksCurrent, nbHydrogentrucksCurrent, nbEtruckCurrent);
+return true;
+/*ALCODEEND*/}
+
+boolean f_electricToDieselVan(List<GridConnection> gcList)
+{/*ALCODESTART::1749645629101*/
+J_EAEV electricVan = null;
+boolean foundAdditionalVehicle = false;
+
+// find the electric van to remove, search through additional vehicles first
+if (zero_Interface.c_companyUIs.size() > 0 ) {
+	for (GridConnection gc : gcList ) {
+		UI_company companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
+		List<J_EAVehicle> totalList = new ArrayList<J_EAVehicle>();
+		for (List<J_EAVehicle> list : companyUI.c_additionalVehicles.values() ) {
+			totalList.addAll(list);
+		}
+		electricVan = (J_EAEV)findFirst(totalList, p -> p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VAN && ((GridConnection)p.getParentAgent()).v_isActive);
+		if ( electricVan != null ) {
+			foundAdditionalVehicle = true;
+			break;
+		}
+	}
+}
+// if no additional vehicle was found, search through the regular ordering of vehicles
+if (!foundAdditionalVehicle) {
+	electricVan = (J_EAEV)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VAN && ((GridConnection)p.getParentAgent()).v_isActive && gcList.contains((GridConnection)p.getParentAgent()));
+}
+if ( electricVan != null ) {
+	GridConnection gc = (GridConnection)electricVan.getParentAgent();
+	
+	// update UI company
+	UI_company companyUI = null;
+	if (zero_Interface.c_companyUIs.size() > 0){
+		companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
+		if (companyUI != null && companyUI.c_ownedGridConnections.get(companyUI.v_currentSelectedGCnr) == gc) { // should also check the setting of selected GC
+			if (companyUI.v_minEVVanSlider >= companyUI.v_nbEVVans) {
+				traceln("Removed already existing Electric Van from GC: " + companyUI.p_companyName);
+			}
+			else {
+				companyUI.v_nbEVVans--;
+				companyUI.sl_electricVansCompany.setValue(companyUI.v_nbEVVans, false);
+				companyUI.v_nbDieselVans++;
+				companyUI.sl_dieselVansCompany.setValue(companyUI.v_nbDieselVans, false);
+			}
+			companyUI.rb_scenariosPrivateUI.setValue(2, false);
+			
+		}
+		if(foundAdditionalVehicle){
+			companyUI.c_additionalVehicles.get(gc).remove(electricVan);
+		}
+	}
+	
+	J_ActivityTrackerTrips tripTracker = electricVan.tripTracker;
+	boolean available = true;
+	available = electricVan.getAvailability();
+	zero_Interface.c_orderedVehicles.remove(electricVan);
+	electricVan.removeEnergyAsset();
+
+	// Re-add diesel vehicle
+	double energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgDieselConsumptionTruck_kWhpkm;
+	double vehicleScaling = 1.0;
+	J_EADieselVehicle dieselVehicle = new J_EADieselVehicle(gc, energyConsumption_kWhpkm, zero_Interface.energyModel.p_timeStep_h, vehicleScaling, OL_EnergyAssetType.DIESEL_VAN, tripTracker);
+	dieselVehicle.available = available;
+	
+	zero_Interface.c_orderedVehicles.add(0, dieselVehicle);
+	
+	//check if was additional vehicle in companyUI, if so: add to collection
+	if(companyUI != null && foundAdditionalVehicle){
+		companyUI.c_additionalVehicles.get(gc).add(dieselVehicle);
+	}
+}
+else {
+	return false;
+	//throw new RuntimeException("Numbers suggest there is an electric van left, but could not find it.");
+}
+
+return true;
+/*ALCODEEND*/}
+
+boolean f_dieselToElectricCar(List<GridConnection> gcList)
+{/*ALCODESTART::1749646233660*/
+J_EADieselVehicle dieselCar = null;
+boolean foundAdditionalVehicle = false;
+
+// find the diesel car to remove, search through additional vehicles first
+if (zero_Interface.c_companyUIs.size() > 0 ) {
+	for (GridConnection gc : gcList ) {
+		UI_company companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
+		List<J_EAVehicle> totalList = new ArrayList<J_EAVehicle>();
+		for (List<J_EAVehicle> list : companyUI.c_additionalVehicles.values() ) {
+			totalList.addAll(list);
+		}
+		dieselCar = (J_EADieselVehicle)findFirst(totalList, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_VEHICLE && gc.v_isActive);
+		if ( dieselCar != null ) {
+			foundAdditionalVehicle = true;
+			break;
+		}
+	}
+}
+// if no additional vehicle was found, search through the regular ordering of vehicles
+if (!foundAdditionalVehicle) {	
+	dieselCar = (J_EADieselVehicle)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_VEHICLE && ((GridConnection)p.getParentAgent()).v_isActive && gcList.contains((GridConnection)p.getParentAgent()));
+}
+if (dieselCar!=null) {
+	GridConnection gc = (GridConnection)dieselCar.getParentAgent();
+	
+	// update UI company
+	UI_company companyUI = null;
+	if (zero_Interface.c_companyUIs.size() > 0){
+		companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
+		if (companyUI != null && companyUI.c_ownedGridConnections.get(companyUI.v_currentSelectedGCnr) == gc) { // should also check the setting of selected GC						
+			companyUI.v_nbDieselCars--;
+			companyUI.sl_dieselCarsCompany.setValue(companyUI.v_nbDieselCars, false);
+			companyUI.v_nbEVCars++;
+			companyUI.sl_electricCarsCompany.setValue(companyUI.v_nbEVCars, false);
+			companyUI.rb_scenariosPrivateUI.setValue(2, false);
+			if (foundAdditionalVehicle) {
+				companyUI.c_additionalVehicles.get(gc).remove(dieselCar);
+			}
+		}
+	}
+		
+	J_ActivityTrackerTrips tripTracker = dieselCar.tripTracker;
+	boolean available = dieselCar.getAvailability();
+	zero_Interface.c_orderedVehicles.remove(dieselCar);
+	dieselCar.removeEnergyAsset();
+
+	// Re-add Electric vehicle
+	double capacityElectric_kW = zero_Interface.energyModel.avgc_data.p_avgEVMaxChargePowerCar_kW;
+	double storageCapacity_kWh = zero_Interface.energyModel.avgc_data.p_avgEVStorageCar_kWh;
+	double initialStateOfCharge_r = 1.0;
+	double energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgEVEnergyConsumptionCar_kWhpkm;
+	double vehicleScalingElectric = 1.0;
+	J_EAEV electricCar = new J_EAEV(gc, capacityElectric_kW, storageCapacity_kWh, initialStateOfCharge_r, zero_Interface.energyModel.p_timeStep_h, energyConsumption_kWhpkm, vehicleScalingElectric, OL_EnergyAssetType.ELECTRIC_VEHICLE, tripTracker);  
+	electricCar.available = available;
+	
+	zero_Interface.c_orderedVehicles.add(0, electricCar);
+	
+	//check if was additional vehicle in companyUI, if so: add to collection
+	if(companyUI != null && foundAdditionalVehicle){
+		companyUI.c_additionalVehicles.get(gc).add(electricCar);
+	}
+}
+
+else {
+	return false;
+	//throw new RuntimeException("Numbers suggest there is a diesel car left, but could not find it.");
+}
+
+return true;
+/*ALCODEEND*/}
+
+boolean f_electricToDieselCar(List<GridConnection> gcList)
+{/*ALCODESTART::1749646235580*/
+J_EAEV electricCar = null;
+boolean foundAdditionalVehicle = false;
+
+// find the electric car to remove, search through additional vehicles first
+if (zero_Interface.c_companyUIs.size() > 0 ) {
+	for (GridConnection gc : gcList ) {
+		UI_company companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
+		List<J_EAVehicle> totalList = new ArrayList<J_EAVehicle>();
+		for (List<J_EAVehicle> list : companyUI.c_additionalVehicles.values() ) {
+			totalList.addAll(list);
+		}
+		electricCar = (J_EAEV)findFirst(totalList, p -> p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VEHICLE && ((GridConnection)p.getParentAgent()).v_isActive);
+		if ( electricCar != null ) {
+			foundAdditionalVehicle = true;
+			break;
+		}
+	}
+}
+// if no additional vehicle was found, search through the regular ordering of vehicles
+if (!foundAdditionalVehicle) {
+	electricCar = (J_EAEV)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VEHICLE && ((GridConnection)p.getParentAgent()).v_isActive && gcList.contains((GridConnection)p.getParentAgent()));
+}
+if ( electricCar != null ) {
+	GridConnection gc = (GridConnection)electricCar.getParentAgent();
+	
+	// update UI company
+	UI_company companyUI = null;
+	if (zero_Interface.c_companyUIs.size() > 0){
+		companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
+		if (companyUI != null && companyUI.c_ownedGridConnections.get(companyUI.v_currentSelectedGCnr) == gc) { // should also check the setting of selected GC
+			if (companyUI.v_minEVCarSlider >= companyUI.v_nbEVCars) {
+				traceln("Removed already existing Electric Car from GC: " + companyUI.p_companyName);
+			}
+			else {
+				companyUI.v_nbEVCars--;
+				companyUI.sl_electricCarsCompany.setValue(companyUI.v_nbEVCars, false);
+				companyUI.v_nbDieselCars++;
+				companyUI.sl_dieselCarsCompany.setValue(companyUI.v_nbDieselCars, false);
+			}
+			companyUI.rb_scenariosPrivateUI.setValue(2, false);
+			
+		}
+		if(foundAdditionalVehicle){
+			companyUI.c_additionalVehicles.get(gc).remove(electricCar);
+		}
+	}
+	
+	J_ActivityTrackerTrips tripTracker = electricCar.tripTracker;
+	boolean available = true;
+	available = electricCar.getAvailability();
+	zero_Interface.c_orderedVehicles.remove(electricCar);
+	electricCar.removeEnergyAsset();
+
+	// Re-add diesel vehicle
+	double energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgDieselConsumptionTruck_kWhpkm;
+	double vehicleScaling = 1.0;
+	J_EADieselVehicle dieselVehicle = new J_EADieselVehicle(gc, energyConsumption_kWhpkm, zero_Interface.energyModel.p_timeStep_h, vehicleScaling, OL_EnergyAssetType.DIESEL_VEHICLE, tripTracker);
+	dieselVehicle.available = available;
+	
+	zero_Interface.c_orderedVehicles.add(0, dieselVehicle);
+	
+	//check if was additional vehicle in companyUI, if so: add to collection
+	if(companyUI != null && foundAdditionalVehicle){
+		companyUI.c_additionalVehicles.get(gc).add(dieselVehicle);
+	}
+}
+else {
+	return false;
+	//throw new RuntimeException("Numbers suggest there is an electric car left, but could not find it.");
+}
+
+return true;
+/*ALCODEEND*/}
+
+Triple<Integer, Integer, Integer> f_calculateCurrentNumberOfVans(List<GridConnection> gcList,Integer numberOfGhostVehicle_Vans)
+{/*ALCODESTART::1749655535164*/
+if (numberOfGhostVehicle_Vans == null) {
+	numberOfGhostVehicle_Vans = f_calculateNumberOfGhostVehicles(gcList).getSecond();
+}
+
+int nbEVansCurrent = numberOfGhostVehicle_Vans;
+int nbHydrogenVansCurrent = 0;
+int nbDieselVansCurrent = 0;
+for ( GridConnection gc : gcList ) {
+	nbEVansCurrent += count(gc.c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VAN && !(gc instanceof GCPublicCharger) && gc.v_isActive);
+	nbHydrogenVansCurrent += count(gc.c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.HYDROGEN_VAN && gc.v_isActive);
+	nbDieselVansCurrent += count(gc.c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.DIESEL_VAN && gc.v_isActive);
+}
+
+return new Triple(nbEVansCurrent, nbHydrogenVansCurrent, nbDieselVansCurrent);
+/*ALCODEEND*/}
+
+Triple<Integer, Integer, Integer> f_calculateCurrentNumberOfCars(List<GridConnection> gcList,Integer numberOfGhostVehicle_Cars)
+{/*ALCODESTART::1749655667960*/
+if (numberOfGhostVehicle_Cars == null) {
+	numberOfGhostVehicle_Cars = f_calculateNumberOfGhostVehicles(gcList).getSecond();
+}
+
+int nbEVsCurrent = numberOfGhostVehicle_Cars;
+int nbHydrogenCarsCurrent = 0;
+int nbDieselCarsCurrent = 0;
+for ( GridConnection gc : gcList ) {
+	nbEVsCurrent += count(gc.c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VEHICLE && !(gc instanceof GCPublicCharger) && gc.v_isActive);
+	nbHydrogenCarsCurrent += count(gc.c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.HYDROGEN_VEHICLE && gc.v_isActive);
+	nbDieselCarsCurrent += count(gc.c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.DIESEL_VEHICLE && gc.v_isActive);
+}
+
+return new Triple(nbEVsCurrent, nbHydrogenCarsCurrent, nbDieselCarsCurrent);
+/*ALCODEEND*/}
+
+double f_setDieselVans(List<GridConnection> gcList,ShapeSlider sliderElectricVans,ShapeSlider sliderFossilFuelVans)
+{/*ALCODESTART::1749655752858*/
+double pctDieselVansGoal = sliderFossilFuelVans.getValue();
+
+int numberOfGhostVehicle_Vans = f_calculateNumberOfGhostVehicles(gcList).getSecond();
+Triple<Integer, Integer, Integer> triple = f_calculateCurrentNumberOfVans( gcList, numberOfGhostVehicle_Vans );
+
+int nbEvanCurrent = triple.getFirst();
+int nbDieselvansCurrent = triple.getThird();
+
+int total_vehicles = nbEvanCurrent + nbDieselvansCurrent;
+
+int nbDieselVansGoal = roundToInt(total_vehicles*pctDieselVansGoal/100.0);
+
+if (nbDieselvansCurrent < nbDieselVansGoal) {
+	// Add Diesel Vans
+	while ( nbDieselvansCurrent < nbDieselVansGoal ) {
+		if ( nbEvanCurrent > numberOfGhostVehicle_Vans ) {
+			// replace electric van with a diesel van
+			if (!f_electricToDieselVan(gcList)) {
+				f_setVanSlidersToCurrentEngineState(gcList, sliderElectricVans, null, sliderFossilFuelVans);
+				return;
+			}
+			else {
+				nbDieselvansCurrent++;
+				nbEvanCurrent--;
+			}
+		}
+	}
+}
+else {
+	// Remove Diesel Vans
+	while ( nbDieselvansCurrent > nbDieselVansGoal ) {
+		// replace a diesel van with an electric van
+		if (!f_dieselToElectricVan(gcList)) {
+			f_setVanSlidersToCurrentEngineState(gcList, sliderElectricVans, null, sliderFossilFuelVans);
+			return;
+		}
+		nbDieselvansCurrent--;
+		nbEvanCurrent++;
+	}
+}
+
+
+//Update variable to change to custom scenario
+if(!zero_Interface.b_runningMainInterfaceScenarios){
+	zero_Interface.b_changeToCustomScenario = true;
+}
+zero_Interface.f_resetSettings();
+/*ALCODEEND*/}
+
+double f_setElectricVans(List<GridConnection> gcList,ShapeSlider sliderElectricVans,ShapeSlider sliderFossilFuelVans)
+{/*ALCODESTART::1749656346356*/
+double pctElectricVansGoal = sliderElectricVans.getValue();
+
+int numberOfGhostVehicle_Vans = f_calculateNumberOfGhostVehicles(gcList).getSecond();
+Triple<Integer, Integer, Integer> triple = f_calculateCurrentNumberOfVans( gcList, numberOfGhostVehicle_Vans );
+
+int nbEvanCurrent = triple.getFirst();
+int nbDieselvansCurrent = triple.getThird();
+
+int total_vehicles = nbEvanCurrent + nbDieselvansCurrent;
+
+int nbElectricVansGoal = roundToInt(total_vehicles*pctElectricVansGoal/100.0);
+
+if (nbEvanCurrent < nbElectricVansGoal) {
+	// Add Electric Vans
+	while ( nbEvanCurrent < nbElectricVansGoal ) {
+		if ( nbDieselvansCurrent > 0 ) {
+			// replace a diesel van with an electric van
+			if (!f_dieselToElectricVan(gcList)) {
+				f_setVanSlidersToCurrentEngineState(gcList, sliderElectricVans, null, sliderFossilFuelVans);
+				return;
+			}
+			else {
+				nbEvanCurrent++;
+				nbDieselvansCurrent--;
+			}
+		}
+	}
+}
+else {
+	// Remove Electric Vans
+	while ( nbEvanCurrent > nbElectricVansGoal ) {
+		// replace an electric van with a diesel van
+		if (!f_electricToDieselVan(gcList)) {
+			f_setVanSlidersToCurrentEngineState(gcList, sliderElectricVans, null, sliderFossilFuelVans);
+			return;
+		}
+		nbEvanCurrent--;
+		nbDieselvansCurrent++;
+	}
+}
+
+//Update variable to change to custom scenario
+if(!zero_Interface.b_runningMainInterfaceScenarios){
+	zero_Interface.b_changeToCustomScenario = true;
+}
+zero_Interface.f_resetSettings();
+/*ALCODEEND*/}
+
+double f_setDieselCars(List<GridConnection> gcList,ShapeSlider sliderElectricCars,ShapeSlider sliderFossilFuelCars)
+{/*ALCODESTART::1749717776391*/
+double pctDieselCarsGoal = sliderFossilFuelCars.getValue();
+
+int numberOfGhostVehicle_Cars = f_calculateNumberOfGhostVehicles(gcList).getSecond();
+Triple<Integer, Integer, Integer> triple = f_calculateCurrentNumberOfCars( gcList, numberOfGhostVehicle_Cars );
+
+int nbEcarCurrent = triple.getFirst();
+int nbDieselcarsCurrent = triple.getThird();
+
+int total_vehicles = nbEcarCurrent + nbDieselcarsCurrent;
+
+int nbDieselCarsGoal = roundToInt(total_vehicles*pctDieselCarsGoal/100.0);
+
+if (nbDieselcarsCurrent < nbDieselCarsGoal) {
+	// Add Diesel Cars
+	while ( nbDieselcarsCurrent < nbDieselCarsGoal ) {
+		if ( nbEcarCurrent > numberOfGhostVehicle_Cars ) {
+			// replace electric car with a diesel car
+			if (!f_electricToDieselCar(gcList)) {
+				f_setCarSlidersToCurrentEngineState(gcList, sliderElectricCars, null, sliderFossilFuelCars);
+				return;
+			}
+			else {
+				nbDieselcarsCurrent++;
+				nbEcarCurrent--;
+			}
+		}
+	}
+}
+else {
+	// Remove Diesel Cars
+	while ( nbDieselcarsCurrent > nbDieselCarsGoal ) {
+		// replace a diesel car with an electric car
+		if (!f_dieselToElectricCar(gcList)) {
+			f_setCarSlidersToCurrentEngineState(gcList, sliderElectricCars, null, sliderFossilFuelCars);
+			return;
+		}
+		nbDieselcarsCurrent--;
+		nbEcarCurrent++;
+	}
+}
+
+
+//Update variable to change to custom scenario
+if(!zero_Interface.b_runningMainInterfaceScenarios){
+	zero_Interface.b_changeToCustomScenario = true;
+}
+zero_Interface.f_resetSettings();
+/*ALCODEEND*/}
+
+double f_setElectricCars(List<GridConnection> gcList,ShapeSlider sliderElectricCars,ShapeSlider sliderFossilFuelCars)
+{/*ALCODESTART::1749717779317*/
+double pctElectricCarsGoal = sliderElectricCars.getValue();
+
+int numberOfGhostVehicle_Cars = f_calculateNumberOfGhostVehicles(gcList).getSecond();
+Triple<Integer, Integer, Integer> triple = f_calculateCurrentNumberOfCars( gcList, numberOfGhostVehicle_Cars );
+
+int nbEcarCurrent = triple.getFirst();
+int nbDieselcarsCurrent = triple.getThird();
+
+int total_vehicles = nbEcarCurrent + nbDieselcarsCurrent;
+
+int nbElectricCarsGoal = roundToInt(total_vehicles*pctElectricCarsGoal/100.0);
+
+if (nbEcarCurrent < nbElectricCarsGoal) {
+	// Add Electric Cars
+	while ( nbEcarCurrent < nbElectricCarsGoal ) {
+		if ( nbDieselcarsCurrent > 0 ) {
+			// replace a diesel car with an electric car
+			if (!f_dieselToElectricCar(gcList)) {
+				f_setCarSlidersToCurrentEngineState(gcList, sliderElectricCars, null, sliderFossilFuelCars);
+				return;
+			}
+			else {
+				nbEcarCurrent++;
+				nbDieselcarsCurrent--;
+			}
+		}
+	}
+}
+else {
+	// Remove Electric Cars
+	while ( nbEcarCurrent > nbElectricCarsGoal ) {
+		// replace an electric car with a diesel car
+		if (!f_electricToDieselCar(gcList)) {
+			f_setCarSlidersToCurrentEngineState(gcList, sliderElectricCars, null, sliderFossilFuelCars);
+			return;
+		}
+		nbEcarCurrent--;
+		nbDieselcarsCurrent++;
+	}
+}
+
+//Update variable to change to custom scenario
+if(!zero_Interface.b_runningMainInterfaceScenarios){
+	zero_Interface.b_changeToCustomScenario = true;
+}
+zero_Interface.f_resetSettings();
+/*ALCODEEND*/}
+
+double f_setVanSlidersToCurrentEngineState(List<GridConnection> gcList,ShapeSlider sliderElectricVans,ShapeSlider sliderHydrogenVans,ShapeSlider sliderFossilFuelVans)
+{/*ALCODESTART::1749717909708*/
+List<J_EAVehicle> vehicles = new ArrayList<J_EAVehicle>();
+for (GridConnection gc : gcList) {
+	if (gc.v_isActive) {
+		vehicles.addAll(gc.c_vehicleAssets);
+	}
+}
+
+int numberOfGhostVehicle_Vans = f_calculateNumberOfGhostVehicles(gcList).getThird();
+
+int nbElectricVansCurrent = count(vehicles, p->p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VAN && !(p.getParentAgent() instanceof GCPublicCharger)) + numberOfGhostVehicle_Vans;
+int nbDieselvansCurrent = count(vehicles, p->p.energyAssetType == OL_EnergyAssetType.DIESEL_VAN);
+int nbHydrogenvansCurrent = count(vehicles, p->p.energyAssetType == OL_EnergyAssetType.HYDROGEN_VAN);
+
+int totalVehicles = nbElectricVansCurrent + nbDieselvansCurrent + nbHydrogenvansCurrent;
+
+
+
+int pct_electricVanSlider = roundToInt(100.0*nbElectricVansCurrent/totalVehicles);
+int pct_hydrogenVanSlider = roundToInt(100.0*nbHydrogenvansCurrent/totalVehicles);
+int pct_dieselVanSlider = roundToInt(100.0*nbDieselvansCurrent/totalVehicles);
+
+sliderElectricVans.setValue(pct_electricVanSlider, false);
+if ( sliderHydrogenVans != null ) {
+	sliderHydrogenVans.setValue(pct_hydrogenVanSlider, false);
+}
+else if ( sliderHydrogenVans == null && pct_hydrogenVanSlider != 0 ) {
+	throw new RuntimeException("Hydrogen vans found but no hydrogen slider passed to f_setVanSlidersToCurrentEngineState");
+}
+sliderFossilFuelVans.setValue(pct_dieselVanSlider, false);
+
+
+//Update variable to change to custom scenario
+if(!zero_Interface.b_runningMainInterfaceScenarios){
+	zero_Interface.b_changeToCustomScenario = true;
+}
+zero_Interface.f_resetSettings();
+/*ALCODEEND*/}
+
+double f_setCarSlidersToCurrentEngineState(List<GridConnection> gcList,ShapeSlider sliderElectricCars,ShapeSlider sliderHydrogenCars,ShapeSlider sliderFossilFuelCars)
+{/*ALCODESTART::1749717987139*/
+List<J_EAVehicle> vehicles = new ArrayList<J_EAVehicle>();
+for (GridConnection gc : gcList) {
+	if (gc.v_isActive) {
+		vehicles.addAll(gc.c_vehicleAssets);
+	}
+}
+
+int numberOfGhostVehicle_Cars = f_calculateNumberOfGhostVehicles(gcList).getThird();
+
+int nbElectricCarsCurrent = count(vehicles, p->p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VEHICLE && !(p.getParentAgent() instanceof GCPublicCharger)) + numberOfGhostVehicle_Cars;
+int nbDieselcarsCurrent = count(vehicles, p->p.energyAssetType == OL_EnergyAssetType.DIESEL_VEHICLE);
+int nbHydrogencarsCurrent = count(vehicles, p->p.energyAssetType == OL_EnergyAssetType.HYDROGEN_VEHICLE);
+
+int totalVehicles = nbElectricCarsCurrent + nbDieselcarsCurrent + nbHydrogencarsCurrent;
+
+
+
+int pct_electricCarSlider = roundToInt(100.0*nbElectricCarsCurrent/totalVehicles);
+int pct_hydrogenCarSlider = roundToInt(100.0*nbHydrogencarsCurrent/totalVehicles);
+int pct_dieselCarSlider = roundToInt(100.0*nbDieselcarsCurrent/totalVehicles);
+
+sliderElectricCars.setValue(pct_electricCarSlider, false);
+if ( sliderHydrogenCars != null ) {
+	sliderHydrogenCars.setValue(pct_hydrogenCarSlider, false);
+}
+else if ( sliderHydrogenCars == null && pct_hydrogenCarSlider != 0 ) {
+	throw new RuntimeException("Hydrogen cars found but no hydrogen slider passed to f_setCarSlidersToCurrentEngineState");
+}
+sliderFossilFuelCars.setValue(pct_dieselCarSlider, false);
+
+
+//Update variable to change to custom scenario
+if(!zero_Interface.b_runningMainInterfaceScenarios){
+	zero_Interface.b_changeToCustomScenario = true;
+}
+zero_Interface.f_resetSettings();
 /*ALCODEEND*/}
 
diff --git a/_alp/Agents/tabMobility/Code/Functions.xml b/_alp/Agents/tabMobility/Code/Functions.xml
index 4e8ae69f..e229478b 100644
--- a/_alp/Agents/tabMobility/Code/Functions.xml
+++ b/_alp/Agents/tabMobility/Code/Functions.xml
@@ -1,35 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Functions>
-	<Function AccessType="protected" StaticFunction="false">
-		<ReturnModificator>VOID</ReturnModificator>
-		<ReturnType>double</ReturnType>
-		<Id>1722256088432</Id>
-		<Name><![CDATA[f_setElectricTrucks_OUD]]></Name>
-		<Description><![CDATA[Function that adds or removes electric trucks to gridconnections. Takes a percentage as a parameter and runs untill that percentage of all the trucks is an electric truck. If a new electric truck is created it gets its characteristics from the AVGC data and keeps the triptracker from the fossil truck. The function also updates the sliders in the company UI.]]></Description>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>20</X>
-		<Y>1120</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Parameter>
-			<Name><![CDATA[pctElectricTrucksGoal]]></Name>
-			<Type><![CDATA[double]]></Type>
-		</Parameter>
-		<Parameter>
-			<Name><![CDATA[sliderElectricTrucks]]></Name>
-			<Type><![CDATA[ShapeSlider]]></Type>
-		</Parameter>
-		<Parameter>
-			<Name><![CDATA[sliderFFTrucks]]></Name>
-			<Type><![CDATA[ShapeSlider]]></Type>
-		</Parameter>
-		<Body xmlns:al="http://anylogic.com"/>
-	</Function>
 	<Function AccessType="protected" StaticFunction="false">
 		<ReturnModificator>VOID</ReturnModificator>
 		<ReturnType>double</ReturnType>
@@ -63,72 +33,6 @@
 		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
-	<Function AccessType="protected" StaticFunction="false">
-		<ReturnModificator>VOID</ReturnModificator>
-		<ReturnType>double</ReturnType>
-		<Id>1722256088451</Id>
-		<Name><![CDATA[f_setElectricVans]]></Name>
-		<Description><![CDATA[Function that adds or removes electric vans to gridconnections. Takes a percentage as a parameter and runs untill that percentage of all the vans is an electric van. If a new electric van is created it gets its characteristics from the AVGC data and keeps the triptracker from the fossil van. The function also updates the sliders in the company UI.]]></Description>
-		<X>70</X>
-		<Y>880</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Parameter>
-			<Name><![CDATA[gcList]]></Name>
-			<Type><![CDATA[List<GridConnection>]]></Type>
-		</Parameter>
-		<Parameter>
-			<Name><![CDATA[pctElectricVansGoal]]></Name>
-			<Type><![CDATA[double]]></Type>
-		</Parameter>
-		<Parameter>
-			<Name><![CDATA[sliderElectricVans]]></Name>
-			<Type><![CDATA[ShapeSlider]]></Type>
-		</Parameter>
-		<Parameter>
-			<Name><![CDATA[sliderFFVans]]></Name>
-			<Type><![CDATA[ShapeSlider]]></Type>
-		</Parameter>
-		<Body xmlns:al="http://anylogic.com"/>
-	</Function>
-	<Function AccessType="protected" StaticFunction="false">
-		<ReturnModificator>VOID</ReturnModificator>
-		<ReturnType>double</ReturnType>
-		<Id>1722256088460</Id>
-		<Name><![CDATA[f_setElectricCars]]></Name>
-		<Description><![CDATA[Function that adds or removes electric cars to gridconnections. Takes a percentage as a parameter and runs untill that percentage of all the cars is an electric car. If a new electric car is created it gets its characteristics from the AVGC data and keeps the triptracker from the fossil car. The function also updates the sliders in the company UI.]]></Description>
-		<X>70</X>
-		<Y>900</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Parameter>
-			<Name><![CDATA[gcList]]></Name>
-			<Type><![CDATA[List<GridConnection>]]></Type>
-		</Parameter>
-		<Parameter>
-			<Name><![CDATA[pctEVsGoal]]></Name>
-			<Type><![CDATA[double]]></Type>
-		</Parameter>
-		<Parameter>
-			<Name><![CDATA[sliderElectricCars]]></Name>
-			<Type><![CDATA[ShapeSlider]]></Type>
-		</Parameter>
-		<Parameter>
-			<Name><![CDATA[sliderFFCars]]></Name>
-			<Type><![CDATA[ShapeSlider]]></Type>
-		</Parameter>
-		<Body xmlns:al="http://anylogic.com"/>
-	</Function>
 	<Function AccessType="protected" StaticFunction="false">
 		<ReturnModificator>VOID</ReturnModificator>
 		<ReturnType>double</ReturnType>
@@ -160,7 +64,7 @@
 		<Id>1729168033110</Id>
 		<Name><![CDATA[f_calculateNumberOfGhostVehicles]]></Name>
 		<X>20</X>
-		<Y>1000</Y>
+		<Y>1080</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -201,7 +105,7 @@
 			<Type><![CDATA[ShapeSlider]]></Type>
 		</Parameter>
 		<Parameter>
-			<Name><![CDATA[sliderFFTrucks]]></Name>
+			<Name><![CDATA[sliderFossilFuelTrucks]]></Name>
 			<Type><![CDATA[ShapeSlider]]></Type>
 		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
@@ -233,7 +137,7 @@
 			<Type><![CDATA[ShapeSlider]]></Type>
 		</Parameter>
 		<Parameter>
-			<Name><![CDATA[sliderFFTrucks]]></Name>
+			<Name><![CDATA[sliderFossilFuelTrucks]]></Name>
 			<Type><![CDATA[ShapeSlider]]></Type>
 		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
@@ -265,7 +169,7 @@
 			<Type><![CDATA[ShapeSlider]]></Type>
 		</Parameter>
 		<Parameter>
-			<Name><![CDATA[sliderFFTrucks]]></Name>
+			<Name><![CDATA[sliderFossilFuelTrucks]]></Name>
 			<Type><![CDATA[ShapeSlider]]></Type>
 		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
@@ -396,7 +300,7 @@
 		<Id>1746018501114</Id>
 		<Name><![CDATA[f_setTruckSlidersToCurrentEngineState]]></Name>
 		<X>360</X>
-		<Y>890</Y>
+		<Y>1040</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -404,6 +308,10 @@
 		<PublicFlag>false</PublicFlag>
 		<PresentationFlag>true</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gcList]]></Name>
+			<Type><![CDATA[List<GridConnection>]]></Type>
+		</Parameter>
 		<Parameter>
 			<Name><![CDATA[sliderElectricTrucks]]></Name>
 			<Type><![CDATA[ShapeSlider]]></Type>
@@ -413,7 +321,7 @@
 			<Type><![CDATA[ShapeSlider]]></Type>
 		</Parameter>
 		<Parameter>
-			<Name><![CDATA[sliderFFTrucks]]></Name>
+			<Name><![CDATA[sliderFossilFuelTrucks]]></Name>
 			<Type><![CDATA[ShapeSlider]]></Type>
 		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
@@ -424,7 +332,7 @@
 		<Id>1749134655530</Id>
 		<Name><![CDATA[f_calculateCurrentNumberOfTrucks]]></Name>
 		<X>20</X>
-		<Y>960</Y>
+		<Y>1040</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -442,4 +350,308 @@
 		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
+		<ReturnType>boolean</ReturnType>
+		<Id>1749645625091</Id>
+		<Name><![CDATA[f_dieselToElectricVan]]></Name>
+		<X>590</X>
+		<Y>720</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gcList]]></Name>
+			<Type><![CDATA[List<GridConnection>]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
+		<ReturnType>boolean</ReturnType>
+		<Id>1749645629101</Id>
+		<Name><![CDATA[f_electricToDieselVan]]></Name>
+		<X>590</X>
+		<Y>740</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gcList]]></Name>
+			<Type><![CDATA[List<GridConnection>]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
+		<ReturnType>boolean</ReturnType>
+		<Id>1749646233660</Id>
+		<Name><![CDATA[f_dieselToElectricCar]]></Name>
+		<X>590</X>
+		<Y>780</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gcList]]></Name>
+			<Type><![CDATA[List<GridConnection>]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
+		<ReturnType>boolean</ReturnType>
+		<Id>1749646235580</Id>
+		<Name><![CDATA[f_electricToDieselCar]]></Name>
+		<X>590</X>
+		<Y>800</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gcList]]></Name>
+			<Type><![CDATA[List<GridConnection>]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
+		<ReturnType>Triple&lt;Integer, Integer, Integer&gt;</ReturnType>
+		<Id>1749655535164</Id>
+		<Name><![CDATA[f_calculateCurrentNumberOfVans]]></Name>
+		<X>20</X>
+		<Y>1020</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gcList]]></Name>
+			<Type><![CDATA[List<GridConnection>]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[numberOfGhostVehicle_Vans]]></Name>
+			<Type><![CDATA[Integer]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
+		<ReturnType>Triple&lt;Integer, Integer, Integer&gt;</ReturnType>
+		<Id>1749655667960</Id>
+		<Name><![CDATA[f_calculateCurrentNumberOfCars]]></Name>
+		<X>20</X>
+		<Y>1000</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gcList]]></Name>
+			<Type><![CDATA[List<GridConnection>]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[numberOfGhostVehicle_Cars]]></Name>
+			<Type><![CDATA[Integer]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="public" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1749655752858</Id>
+		<Name><![CDATA[f_setDieselVans]]></Name>
+		<X>70</X>
+		<Y>840</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gcList]]></Name>
+			<Type><![CDATA[List<GridConnection>]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[sliderElectricVans]]></Name>
+			<Type><![CDATA[ShapeSlider]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[sliderFossilFuelVans]]></Name>
+			<Type><![CDATA[ShapeSlider]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="public" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1749656346356</Id>
+		<Name><![CDATA[f_setElectricVans]]></Name>
+		<X>70</X>
+		<Y>860</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gcList]]></Name>
+			<Type><![CDATA[List<GridConnection>]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[sliderElectricVans]]></Name>
+			<Type><![CDATA[ShapeSlider]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[sliderFossilFuelVans]]></Name>
+			<Type><![CDATA[ShapeSlider]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="public" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1749717776391</Id>
+		<Name><![CDATA[f_setDieselCars]]></Name>
+		<X>70</X>
+		<Y>890</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gcList]]></Name>
+			<Type><![CDATA[List<GridConnection>]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[sliderElectricCars]]></Name>
+			<Type><![CDATA[ShapeSlider]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[sliderFossilFuelCars]]></Name>
+			<Type><![CDATA[ShapeSlider]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="public" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1749717779317</Id>
+		<Name><![CDATA[f_setElectricCars]]></Name>
+		<X>70</X>
+		<Y>910</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gcList]]></Name>
+			<Type><![CDATA[List<GridConnection>]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[sliderElectricCars]]></Name>
+			<Type><![CDATA[ShapeSlider]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[sliderFossilFuelCars]]></Name>
+			<Type><![CDATA[ShapeSlider]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1749717909708</Id>
+		<Name><![CDATA[f_setVanSlidersToCurrentEngineState]]></Name>
+		<X>360</X>
+		<Y>1020</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gcList]]></Name>
+			<Type><![CDATA[List<GridConnection>]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[sliderElectricVans]]></Name>
+			<Type><![CDATA[ShapeSlider]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[sliderHydrogenVans]]></Name>
+			<Type><![CDATA[ShapeSlider]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[sliderFossilFuelVans]]></Name>
+			<Type><![CDATA[ShapeSlider]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1749717987139</Id>
+		<Name><![CDATA[f_setCarSlidersToCurrentEngineState]]></Name>
+		<X>360</X>
+		<Y>1000</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[gcList]]></Name>
+			<Type><![CDATA[List<GridConnection>]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[sliderElectricCars]]></Name>
+			<Type><![CDATA[ShapeSlider]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[sliderHydrogenCars]]></Name>
+			<Type><![CDATA[ShapeSlider]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[sliderFossilFuelCars]]></Name>
+			<Type><![CDATA[ShapeSlider]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
 </Functions>
diff --git a/_alp/Agents/tabMobility/Levels/Level.level.xml b/_alp/Agents/tabMobility/Levels/Level.level.xml
index 5adc270b..776feee8 100644
--- a/_alp/Agents/tabMobility/Levels/Level.level.xml
+++ b/_alp/Agents/tabMobility/Levels/Level.level.xml
@@ -20,7 +20,7 @@
 		<LineColor>-4144960</LineColor>
 		<LineMaterial>null</LineMaterial>
 		<LineStyle>SOLID</LineStyle>
-		<Width>720</Width>
+		<Width>800</Width>
 		<Height>470</Height>
 		<Rotation>0.0</Rotation>
 		<FillColor>-1</FillColor>
@@ -112,7 +112,7 @@
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
 					<ActionCode>sl_electricCars_pct.setValue(100 - sl_fossilFuelCars_pct.getIntValue(), false);
-f_setElectricCars( zero_Interface.energyModel.f_getGridConnections(), sl_electricCars_pct.getValue(), sl_electricCars_pct, sl_fossilFuelCars_pct );</ActionCode>
+f_setDieselCars( zero_Interface.energyModel.f_getGridConnections(), sl_electricCars_pct, sl_fossilFuelCars_pct );</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -537,7 +537,7 @@ f_setDieselTrucks( zero_Interface.energyModel.f_getGridConnections(), sl_electri
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
 					<ActionCode>sl_fossilFuelCars_pct.setValue(100 - sl_electricCars_pct.getIntValue(), false);
-f_setElectricCars( zero_Interface.energyModel.f_getGridConnections(), sl_electricCars_pct.getValue(), sl_electricCars_pct, sl_fossilFuelCars_pct );</ActionCode>
+f_setElectricCars( zero_Interface.energyModel.f_getGridConnections(), sl_electricCars_pct, sl_fossilFuelCars_pct );</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -642,7 +642,7 @@ f_setElectricCars( zero_Interface.energyModel.f_getGridConnections(), sl_electri
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
 					<ActionCode>sl_electricVans_pct.setValue(100 - sl_fossilFuelVans_pct.getIntValue(), false);
-f_setElectricVans( zero_Interface.energyModel.f_getGridConnections(), sl_electricVans_pct.getValue(), sl_electricVans_pct, sl_fossilFuelVans_pct );</ActionCode>
+f_setDieselVans( zero_Interface.energyModel.f_getGridConnections(), sl_electricVans_pct, sl_fossilFuelVans_pct );</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -722,7 +722,7 @@ f_setElectricVans( zero_Interface.energyModel.f_getGridConnections(), sl_electri
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
 					<ActionCode>sl_fossilFuelVans_pct.setValue(100 - sl_electricVans_pct.getIntValue(), false);
-f_setElectricVans( zero_Interface.energyModel.f_getGridConnections(), sl_electricVans_pct.getValue(), sl_electricVans_pct, sl_fossilFuelVans_pct );</ActionCode>
+f_setElectricVans( zero_Interface.energyModel.f_getGridConnections(), sl_electricVans_pct, sl_fossilFuelVans_pct );</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -1098,7 +1098,7 @@ f_setElectricVans( zero_Interface.energyModel.f_getGridConnections(), sl_electri
 		<LineColor>-5952982</LineColor>
 		<LineMaterial>null</LineMaterial>
 		<LineStyle>SOLID</LineStyle>
-		<Width>640</Width>
+		<Width>720</Width>
 		<Height>230</Height>
 		<Rotation>0.0</Rotation>
 		<FillColor>-1</FillColor>
diff --git a/_alp/Agents/tabMobility/Variables.xml b/_alp/Agents/tabMobility/Variables.xml
index e61fbf5c..8f1f2f40 100644
--- a/_alp/Agents/tabMobility/Variables.xml
+++ b/_alp/Agents/tabMobility/Variables.xml
@@ -4,7 +4,7 @@
 		<Id>1729167973194</Id>
 		<Name><![CDATA[v_totalNumberOfGhostVehicle_Trucks]]></Name>
 		<X>40</X>
-		<Y>1060</Y>
+		<Y>1140</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -26,7 +26,7 @@
 		<Id>1729168015819</Id>
 		<Name><![CDATA[v_totalNumberOfGhostVehicle_Vans]]></Name>
 		<X>40</X>
-		<Y>1040</Y>
+		<Y>1120</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -48,7 +48,7 @@
 		<Id>1729168016768</Id>
 		<Name><![CDATA[v_totalNumberOfGhostVehicle_Cars]]></Name>
 		<X>40</X>
-		<Y>1020</Y>
+		<Y>1100</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>

From d6568d1055d12825362dfe9ddde3fc70b71596a2 Mon Sep 17 00:00:00 2001
From: Luc-Sol <luc@solidegroep.nl>
Date: Fri, 13 Jun 2025 16:05:05 +0200
Subject: [PATCH 7/7] bugfixes after merge

---
 .../Agents/tabElectricity/Code/Functions.java | 30 +++++++++----------
 _alp/Agents/tabElectricity/Code/Functions.xml |  2 +-
 _alp/Agents/tabHeating/Code/Functions.java    |  4 +--
 _alp/Agents/tabMobility/Code/Functions.java   |  8 ++---
 _alp/Classes/Class.DefaultProfiles_data.java  |  3 +-
 5 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/_alp/Agents/tabElectricity/Code/Functions.java b/_alp/Agents/tabElectricity/Code/Functions.java
index 96a31f9d..437a56d6 100644
--- a/_alp/Agents/tabElectricity/Code/Functions.java
+++ b/_alp/Agents/tabElectricity/Code/Functions.java
@@ -74,7 +74,7 @@
 		double outputTemperature_degC = 0.0;
 		double installedPVCapacity_kW = uniform(3,6);
 
-		J_EAProduction productionAsset = new J_EAProduction ( house, OL_EnergyAssetType.PHOTOVOLTAIC, assetName, installedPVCapacity_kW, capacityHeat_kW, yearlyProductionMethane_kWh, yearlyProductionHydrogen_kWh, zero_Interface.energyModel.p_timeStep_h, outputTemperature_degC, zero_Interface.energyModel.pp_solarPVproduction );
+		J_EAProduction productionAsset = new J_EAProduction ( house, OL_EnergyAssetType.PHOTOVOLTAIC, assetName, installedPVCapacity_kW, capacityHeat_kW, yearlyProductionMethane_kWh, yearlyProductionHydrogen_kWh, zero_Interface.energyModel.p_timeStep_h, outputTemperature_degC, zero_Interface.energyModel.pp_PVProduction35DegSouth_fr );
 		houses.remove(house);
 		zero_Interface.c_orderedPVSystemsHouses.remove(house);
 		zero_Interface.c_orderedPVSystemsHouses.add(0, house);
@@ -162,6 +162,7 @@ else if ( v_currentNbChargers < desiredNbOfChargers ){
 				GCEP.f_setActive(false);
 			}
 			break;
+		}
 	}
 }
 
@@ -181,19 +182,16 @@ else if ( v_currentNbChargers < desiredNbOfChargers ){
 double batteryShare_pct = homeBatteries_pct;
 
 if( nbHousesWithPV > 0 ){
-	}
-	else {
-		while ( batteryShare_pct / 100.0 > nbHouseBatteries / nbHousesWithPV) {
-			GCHouse house = findFirst(zero_Interface.energyModel.Houses, p -> p.p_batteryAsset == null && p.v_liveAssetsMetaData.hasPV == true);
-			
-			double batteryStorageCapacity_kWh = 15;
-			double batteryCapacity_kW = batteryStorageCapacity_kWh / zero_Interface.energyModel.avgc_data.p_avgRatioBatteryCapacity_v_Power;
-			double batteryStateOfCharge = 0.5;
-					
-			new J_EAStorageElectric(house, batteryCapacity_kW, batteryStorageCapacity_kWh, batteryStateOfCharge, zero_Interface.energyModel.p_timeStep_h );
-			house.p_batteryOperationMode = OL_BatteryOperationMode.HOUSEHOLD_LOAD;
-			nbHouseBatteries++;
-		}
+	while ( batteryShare_pct / 100.0 > nbHouseBatteries / nbHousesWithPV) {
+		GCHouse house = findFirst(zero_Interface.energyModel.Houses, p -> p.p_batteryAsset == null && p.v_liveAssetsMetaData.hasPV == true);
+		
+		double batteryStorageCapacity_kWh = 15;
+		double batteryCapacity_kW = batteryStorageCapacity_kWh / zero_Interface.energyModel.avgc_data.p_avgRatioBatteryCapacity_v_Power;
+		double batteryStateOfCharge = 0.5;
+				
+		new J_EAStorageElectric(house, batteryCapacity_kW, batteryStorageCapacity_kWh, batteryStateOfCharge, zero_Interface.energyModel.p_timeStep_h );
+		house.p_batteryOperationMode = OL_BatteryOperationMode.HOUSEHOLD_LOAD;
+		nbHouseBatteries++;
 	}
 }
 
@@ -465,7 +463,7 @@ Pair<Double, Double> f_getPVSystemPercentage(List<GridConnection> gcList)
 	double yearlyProductionHydrogen_kWh = 0.0;
 	double outputTemperature_degC = 0.0;
 	
-	J_EAProduction productionAsset = new J_EAProduction ( gc, assetType, assetName, capacity_kWp, capacityHeat_kW, yearlyProductionMethane_kWh, yearlyProductionHydrogen_kWh, zero_Interface.energyModel.p_timeStep_h, outputTemperature_degC, zero_Interface.energyModel.pp_solarPVproduction );
+	J_EAProduction productionAsset = new J_EAProduction ( gc, assetType, assetName, capacity_kWp, capacityHeat_kW, yearlyProductionMethane_kWh, yearlyProductionHydrogen_kWh, zero_Interface.energyModel.p_timeStep_h, outputTemperature_degC, zero_Interface.energyModel.pp_PVProduction35DegSouth_fr );
 }
 
 // Update the ordered collection
@@ -517,7 +515,7 @@ else if ( gc instanceof GCUtility ) {
 }
 /*ALCODEEND*/}
 
-double f_setPVSystemHouses(List<GCHouse> gcList,double target_pct)
+double f_setPVSystemHouses1(List<GCHouse> gcList,double target_pct)
 {/*ALCODESTART::1747825874398*/
 Pair<Double, Double> pair = f_getPVSystemPercentage( new ArrayList<GridConnection>(gcList));
 
diff --git a/_alp/Agents/tabElectricity/Code/Functions.xml b/_alp/Agents/tabElectricity/Code/Functions.xml
index 62a0f745..e1d768b8 100644
--- a/_alp/Agents/tabElectricity/Code/Functions.xml
+++ b/_alp/Agents/tabElectricity/Code/Functions.xml
@@ -396,7 +396,7 @@
 		<ReturnModificator>VOID</ReturnModificator>
 		<ReturnType>double</ReturnType>
 		<Id>1747825874398</Id>
-		<Name><![CDATA[f_setPVSystemHouses]]></Name>
+		<Name><![CDATA[f_setPVSystemHouses1]]></Name>
 		<Description><![CDATA[Adds or removes photovoltaic production assets to GridConnections. Takes as arguments a list of Gridconnections and a target percentage. It runs untill that list of GCs has that percentage of PV installed, compared to the total potential PV. If a new asset is created it determines its electric capacity by the total roof area of all the buildings connected to the GC. The function also updates the PV slider in the company UI if the GC is a company. The variables in the engine that keep track of the amount of installed PV are updated automatically.]]></Description>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>70</X>
diff --git a/_alp/Agents/tabHeating/Code/Functions.java b/_alp/Agents/tabHeating/Code/Functions.java
index 570c23e3..c50d0596 100644
--- a/_alp/Agents/tabHeating/Code/Functions.java
+++ b/_alp/Agents/tabHeating/Code/Functions.java
@@ -290,8 +290,8 @@ Pair<Integer, Integer> f_calculateNumberOfGhostHeatingSystems(List<GCUtility> gc
 double peakHeatDemand_kW = 0.0;
 for (J_EAConsumption j_ea : gc.c_consumptionAssets) {
 	if (j_ea.getEAType() == OL_EnergyAssetType.HEAT_DEMAND) {
-		TableFunction tf = j_ea.getProfilePointer().getTableFunction();
-		double maxFactor = Arrays.stream(tf.getValues()).max().getAsDouble();
+		double[] profile = j_ea.getProfilePointer().getAllValues();
+		double maxFactor = Arrays.stream(profile).max().getAsDouble();
 		peakHeatDemand_kW += maxFactor * j_ea.yearlyDemand_kWh * j_ea.getConsumptionScaling_fr();
 	}
 }
diff --git a/_alp/Agents/tabMobility/Code/Functions.java b/_alp/Agents/tabMobility/Code/Functions.java
index bdf01e64..21dec319 100644
--- a/_alp/Agents/tabMobility/Code/Functions.java
+++ b/_alp/Agents/tabMobility/Code/Functions.java
@@ -73,10 +73,10 @@
 	if (zero_Interface.c_companyUIs.size() > 0) {
 		UI_company companyUI = zero_Interface.c_companyUIs.get(gc.p_owner.p_connectionOwnerIndexNr);
 		if (companyUI != null) {
-			if(companyUI.c_ownedGridConnections.get(companyUI.v_currentSelectedGCnr) != gc){
-				int i = indexOf(companyUI.c_ownedGridConnections.stream().toArray(), gc);
-				companyUI.GCnr_selection.setValue(i, true);
-			}
+			//if(companyUI.c_ownedGridConnections.get(companyUI.v_currentSelectedGCnr) != gc){
+				//int i = indexOf(companyUI.c_ownedGridConnections.stream().toArray(), gc);
+				//companyUI.GCnr_selection.setValue(i, true);
+			//}
 			companyUI.sl_mobilityDemandCompanyReduction.setValue(demandReduction_pct, false);			
 		}
 	}
diff --git a/_alp/Classes/Class.DefaultProfiles_data.java b/_alp/Classes/Class.DefaultProfiles_data.java
index a5965810..63e21c76 100644
--- a/_alp/Classes/Class.DefaultProfiles_data.java
+++ b/_alp/Classes/Class.DefaultProfiles_data.java
@@ -23,7 +23,8 @@ public class DefaultProfiles_data {
 	List<Double> defaultHouseHotWaterDemandProfile_fr;
 	List<Double> defaultOfficeElectricityDemandProfile_fr;
 	List<Double> defaultBuildingHeatDemandProfile_fr;
-
+	List<Double> defaultHouseCookingDemandProfile_fr;
+	
 	//Maximum getters
 	public double getDefaultOfficeElectricityDemandProfileMaximum_fr() {
 		return Collections.max(defaultOfficeElectricityDemandProfile_fr);