diff --git a/Zero_Interface-Loader.alpx b/Zero_Interface-Loader.alpx
index 367898a3..e737fa3c 100644
--- a/Zero_Interface-Loader.alpx
+++ b/Zero_Interface-Loader.alpx
@@ -343,6 +343,10 @@
 				<Id>1753884053162</Id>
 				<Name><![CDATA[J_ModelSave]]></Name>
 			</JavaClass>
+			<JavaClass>
+				<Id>1761122454908</Id>
+				<Name><![CDATA[J_SliderSettings_Residential]]></Name>
+			</JavaClass>
 		</JavaClasses>
 		<RequiredLibraryReference>
 			<LibraryName>zero_engine</LibraryName>
diff --git a/_alp/Agents/AVGC_data/Variables.xml b/_alp/Agents/AVGC_data/Variables.xml
index f5dffd65..955d7ef2 100644
--- a/_alp/Agents/AVGC_data/Variables.xml
+++ b/_alp/Agents/AVGC_data/Variables.xml
@@ -1395,7 +1395,10 @@ https://www.zonnepanelennoord.nl/vermogen-zonnepanelen/ --> 215 W/m2]]></Descrip
 	<Variable Class="Parameter">
 		<Id>1726584205714</Id>
 		<Name><![CDATA[p_avgOutputTemperatureHeatpump_degC]]></Name>
-		<Description><![CDATA[The avg output temperature of a heatpump in degC. Can be set manually, as an average 60 has been taken. ]]></Description>
+		<Description><![CDATA[https://www.milieucentraal.nl/energie-besparen/duurzaam-verwarmen-en-koelen/volledige-warmtepomp/?utm_source=chatgpt.com - max 45-55
+https://warmtepomp-panel.nl/afgiftesysteem.html?utm_source=chatgpt.com -> 35 graden afgifte bij -10 graden.
+
+-> Voor nu gemiddeld 40 genomen.]]></Description>
 		<X>70</X>
 		<Y>560</Y>
 		<Label>
@@ -1410,7 +1413,7 @@ https://www.zonnepanelennoord.nl/vermogen-zonnepanelen/ --> 215 W/m2]]></Descrip
 			<UnitType>NONE</UnitType>
 			<SdArray>false</SdArray>
 			<DefaultValue Class="CodeValue">
-				<Code><![CDATA[60]]></Code>
+				<Code><![CDATA[40]]></Code>
 			</DefaultValue>
 			<ParameterEditor>
 				<Id>1726584205712</Id>
diff --git a/_alp/Agents/UI_Battery/Variables.xml b/_alp/Agents/UI_Battery/Variables.xml
index 01f22698..9e859b0d 100644
--- a/_alp/Agents/UI_Battery/Variables.xml
+++ b/_alp/Agents/UI_Battery/Variables.xml
@@ -105,9 +105,6 @@
               AccessType="public"
               StaticVariable="false">
 			<Type><![CDATA[double]]></Type>
-			<InitialValue Class="CodeValue">
-				<Code><![CDATA[-zero_Interface.energyModel.f_getGridNodesTopLevel().get(0).p_capacity_kW/1000]]></Code>
-			</InitialValue>
 		</Properties>
 	</Variable>
 	<Variable Class="PlainVariable">
@@ -127,9 +124,6 @@
               AccessType="public"
               StaticVariable="false">
 			<Type><![CDATA[double]]></Type>
-			<InitialValue Class="CodeValue">
-				<Code><![CDATA[zero_Interface.energyModel.f_getGridNodesTopLevel().get(0).p_capacity_kW/1000]]></Code>
-			</InitialValue>
 		</Properties>
 	</Variable>
 	<Variable Class="PlainVariable">
diff --git a/_alp/Agents/UI_EnergyHub/Code/Functions.java b/_alp/Agents/UI_EnergyHub/Code/Functions.java
index fc796760..0716f258 100644
--- a/_alp/Agents/UI_EnergyHub/Code/Functions.java
+++ b/_alp/Agents/UI_EnergyHub/Code/Functions.java
@@ -536,9 +536,7 @@ else if (members.size() > 8) {
 saveObject.c_scenarioMap_Future = zero_Interface.c_scenarioMap_Future;
 
 List<LinkedHashMap<String, List<J_EAVehicle>>> c_additionalVehicleHashMaps = new ArrayList<LinkedHashMap<String, List<J_EAVehicle>>>();
-for (UI_company companyUI : zero_Interface.c_companyUIs) {
-	c_additionalVehicleHashMaps.add(companyUI.c_additionalVehicles);
-}
+
 saveObject.c_additionalVehicleHashMaps = c_additionalVehicleHashMaps;
 
 v_objectMapper = new ObjectMapper();
@@ -775,6 +773,7 @@ else if (members.size() > 8) {
 zero_Interface.c_scenarioMap_Current = saveObject.c_scenarioMap_Current;
 zero_Interface.c_scenarioMap_Future = saveObject.c_scenarioMap_Future;
 
+/*
 List<ConnectionOwner> c_COCompanies = findAll(zero_Interface.energyModel.pop_connectionOwners, p -> p.p_connectionOwnerType == OL_ConnectionOwnerType.COMPANY); 
 
 int i = 0;
@@ -786,6 +785,7 @@ else if (members.size() > 8) {
 	companyUI.f_setSelectedGCSliders();
 	i++;
 }
+*/
 
 /*ALCODEEND*/}
 
diff --git a/_alp/Agents/UI_Hydrogen/Variables.xml b/_alp/Agents/UI_Hydrogen/Variables.xml
index 9edf35a0..56b31bce 100644
--- a/_alp/Agents/UI_Hydrogen/Variables.xml
+++ b/_alp/Agents/UI_Hydrogen/Variables.xml
@@ -39,9 +39,6 @@
               AccessType="public"
               StaticVariable="false">
 			<Type><![CDATA[double]]></Type>
-			<InitialValue Class="CodeValue">
-				<Code><![CDATA[-zero_Interface.energyModel.f_getGridNodesTopLevel().get(0).p_capacity_kW/1000]]></Code>
-			</InitialValue>
 		</Properties>
 	</Variable>
 	<Variable Class="PlainVariable">
@@ -61,9 +58,6 @@
               AccessType="public"
               StaticVariable="false">
 			<Type><![CDATA[double]]></Type>
-			<InitialValue Class="CodeValue">
-				<Code><![CDATA[zero_Interface.energyModel.f_getGridNodesTopLevel().get(0).p_capacity_kW/1000]]></Code>
-			</InitialValue>
 		</Properties>
 	</Variable>
 	<Variable Class="PlainVariable">
diff --git a/_alp/Agents/UI_Tabs/Code/Functions.java b/_alp/Agents/UI_Tabs/Code/Functions.java
index a1807e89..f4713889 100644
--- a/_alp/Agents/UI_Tabs/Code/Functions.java
+++ b/_alp/Agents/UI_Tabs/Code/Functions.java
@@ -66,7 +66,7 @@ else if(GC instanceof GCPublicCharger){
 
 double f_initializeSliderGCPointers(List<GridConnection> activeGridConnections,List<GridConnection> pausedGridConnections)
 {/*ALCODESTART::1754908006859*/
-v_sliderGridConnections = activeGridConnections;
+v_activeSliderGridConnections = activeGridConnections;
 
 if(pausedGridConnections != null){
 	v_pausedSliderGridConnections = pausedGridConnections;
@@ -88,11 +88,11 @@ else if(GC instanceof GCPublicCharger){
 f_showCorrectTab();
 /*ALCODEEND*/}
 
-List<GCHouse> f_getSliderGridConnections_houses()
+List<GCHouse> f_getActiveSliderGridConnections_houses()
 {/*ALCODESTART::1754919017244*/
 List<GCHouse> houseGridConnections = new ArrayList<>();
 
-for(GridConnection GC : v_sliderGridConnections){
+for(GridConnection GC : v_activeSliderGridConnections){
 	if(GC instanceof GCHouse){
 		houseGridConnections.add((GCHouse)GC);		
 	}
@@ -101,11 +101,11 @@ List<GCHouse> f_getSliderGridConnections_houses()
 return houseGridConnections;
 /*ALCODEEND*/}
 
-List<GCUtility> f_getSliderGridConnections_utilities()
+List<GCUtility> f_getActiveSliderGridConnections_utilities()
 {/*ALCODESTART::1754922545766*/
 List<GCUtility> utilityGridConnections = new ArrayList<>();
 
-for(GridConnection GC : v_sliderGridConnections){
+for(GridConnection GC : v_activeSliderGridConnections){
 	if(GC instanceof GCUtility){
 		utilityGridConnections.add((GCUtility)GC);
 	}
@@ -114,11 +114,11 @@ List<GCUtility> f_getSliderGridConnections_utilities()
 return utilityGridConnections;
 /*ALCODEEND*/}
 
-List<GCGridBattery> f_getSliderGridConnections_gridBatteries()
+List<GCGridBattery> f_getAllSliderGridConnections_gridBatteries()
 {/*ALCODESTART::1754922546986*/
 List<GCGridBattery> gridBatteryGridConnections = new ArrayList<>();
 
-for(GridConnection GC : v_sliderGridConnections){
+for(GridConnection GC : v_activeSliderGridConnections){
 	if(GC instanceof GCGridBattery){
 		gridBatteryGridConnections.add((GCGridBattery)GC);		
 	}
@@ -137,7 +137,7 @@ List<GCPublicCharger> f_getSliderGridConnections_chargers()
 {/*ALCODESTART::1754922547989*/
 List<GCPublicCharger> chargerGridConnections = new ArrayList<>();
 
-for(GridConnection GC : v_sliderGridConnections){
+for(GridConnection GC : v_activeSliderGridConnections){
 	if(GC instanceof GCPublicCharger){
 		chargerGridConnections.add((GCPublicCharger)GC);		
 	}
@@ -146,11 +146,11 @@ List<GCPublicCharger> f_getSliderGridConnections_chargers()
 return chargerGridConnections;
 /*ALCODEEND*/}
 
-List<GCEnergyProduction> f_getSliderGridConnections_production()
+List<GCEnergyProduction> f_getAllSliderGridConnections_production()
 {/*ALCODESTART::1754922591622*/
 List<GCEnergyProduction> productionGridConnections = new ArrayList<>();
 
-for(GridConnection GC : v_sliderGridConnections){
+for(GridConnection GC : v_activeSliderGridConnections){
 	if(GC instanceof GCEnergyProduction){
 		productionGridConnections.add((GCEnergyProduction)GC);
 	}
@@ -181,11 +181,11 @@ List<GCEnergyProduction> f_getSliderGridConnections_production()
 }
 /*ALCODEEND*/}
 
-List<GridConnection> f_getSliderGridConnections_consumption()
+List<GridConnection> f_getActiveSliderGridConnections_consumption()
 {/*ALCODESTART::1754986474226*/
 List<GridConnection> consumptionGridConnections = new ArrayList<>();
 
-for(GridConnection GC : v_sliderGridConnections){
+for(GridConnection GC : v_activeSliderGridConnections){
 	if(GC instanceof GCUtility){
 		consumptionGridConnections.add(GC);
 	}
@@ -197,9 +197,9 @@ else if(GC instanceof GCHouse){
 return consumptionGridConnections;
 /*ALCODEEND*/}
 
-List<GridConnection> f_getSliderGridConnections_all()
+List<GridConnection> f_getActiveSliderGridConnections_all()
 {/*ALCODESTART::1754991155553*/
-List<GridConnection> gridConnections = new ArrayList<>(v_sliderGridConnections);
+List<GridConnection> gridConnections = new ArrayList<>(v_activeSliderGridConnections);
 
 return gridConnections;
 /*ALCODEEND*/}
@@ -239,7 +239,7 @@ List<GCPublicCharger> f_getAllSliderGridConnections_chargers()
 {/*ALCODESTART::1758278620331*/
 List<GCPublicCharger> chargerGridConnections = new ArrayList<>();
 
-for(GridConnection GC : v_sliderGridConnections){
+for(GridConnection GC : v_activeSliderGridConnections){
 	if(GC instanceof GCPublicCharger){
 		chargerGridConnections.add((GCPublicCharger)GC);		
 	}
@@ -255,3 +255,43 @@ List<GCPublicCharger> f_getAllSliderGridConnections_chargers()
 return chargerGridConnections;
 /*ALCODEEND*/}
 
+List<GridConnection> f_getAllSliderGridConnections_consumption()
+{/*ALCODESTART::1761208715194*/
+List<GridConnection> consumptionGridConnections = new ArrayList<>();
+
+for(GridConnection GC : v_activeSliderGridConnections){
+	if(GC instanceof GCUtility){
+		consumptionGridConnections.add(GC);
+	}
+	else if(GC instanceof GCHouse){
+		consumptionGridConnections.add(GC);
+	}
+}
+
+for(GridConnection GC : v_pausedSliderGridConnections){
+	if(GC instanceof GCUtility){
+		consumptionGridConnections.add(GC);
+	}
+	else if(GC instanceof GCHouse){
+		consumptionGridConnections.add(GC);
+	}
+}
+
+return consumptionGridConnections;
+/*ALCODEEND*/}
+
+List<GridConnection> f_getPausedSliderGridConnections_all()
+{/*ALCODESTART::1761208797812*/
+List<GridConnection> gridConnections = new ArrayList<>(v_activeSliderGridConnections);
+
+return gridConnections;
+/*ALCODEEND*/}
+
+List<GridConnection> f_getAllSliderGridConnections_all()
+{/*ALCODESTART::1761208826669*/
+List<GridConnection> gridConnections = new ArrayList<>(v_activeSliderGridConnections);
+gridConnections.addAll(v_pausedSliderGridConnections);
+
+return gridConnections;
+/*ALCODEEND*/}
+
diff --git a/_alp/Agents/UI_Tabs/Code/Functions.xml b/_alp/Agents/UI_Tabs/Code/Functions.xml
index 0ee9aa84..7ecae38d 100644
--- a/_alp/Agents/UI_Tabs/Code/Functions.xml
+++ b/_alp/Agents/UI_Tabs/Code/Functions.xml
@@ -109,9 +109,9 @@
 		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
 		<ReturnType>List&lt;GCHouse&gt;</ReturnType>
 		<Id>1754919017244</Id>
-		<Name><![CDATA[f_getSliderGridConnections_houses]]></Name>
-		<X>540</X>
-		<Y>150</Y>
+		<Name><![CDATA[f_getActiveSliderGridConnections_houses]]></Name>
+		<X>560</X>
+		<Y>240</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -125,9 +125,9 @@
 		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
 		<ReturnType>List&lt;GCUtility&gt;</ReturnType>
 		<Id>1754922545766</Id>
-		<Name><![CDATA[f_getSliderGridConnections_utilities]]></Name>
-		<X>540</X>
-		<Y>130</Y>
+		<Name><![CDATA[f_getActiveSliderGridConnections_utilities]]></Name>
+		<X>560</X>
+		<Y>220</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -141,9 +141,9 @@
 		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
 		<ReturnType>List&lt;GCGridBattery&gt;</ReturnType>
 		<Id>1754922546986</Id>
-		<Name><![CDATA[f_getSliderGridConnections_gridBatteries]]></Name>
+		<Name><![CDATA[f_getAllSliderGridConnections_gridBatteries]]></Name>
 		<X>540</X>
-		<Y>200</Y>
+		<Y>300</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -158,8 +158,8 @@
 		<ReturnType>List&lt;GCPublicCharger&gt;</ReturnType>
 		<Id>1754922547989</Id>
 		<Name><![CDATA[f_getSliderGridConnections_chargers]]></Name>
-		<X>540</X>
-		<Y>220</Y>
+		<X>550</X>
+		<Y>380</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -173,9 +173,9 @@
 		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
 		<ReturnType>List&lt;GCEnergyProduction&gt;</ReturnType>
 		<Id>1754922591622</Id>
-		<Name><![CDATA[f_getSliderGridConnections_production]]></Name>
+		<Name><![CDATA[f_getAllSliderGridConnections_production]]></Name>
 		<X>540</X>
-		<Y>240</Y>
+		<Y>330</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -205,9 +205,9 @@
 		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
 		<ReturnType>List&lt;GridConnection&gt;</ReturnType>
 		<Id>1754986474226</Id>
-		<Name><![CDATA[f_getSliderGridConnections_consumption]]></Name>
+		<Name><![CDATA[f_getActiveSliderGridConnections_consumption]]></Name>
 		<X>550</X>
-		<Y>170</Y>
+		<Y>200</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -221,9 +221,9 @@
 		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
 		<ReturnType>List&lt;GridConnection&gt;</ReturnType>
 		<Id>1754991155553</Id>
-		<Name><![CDATA[f_getSliderGridConnections_all]]></Name>
-		<X>540</X>
-		<Y>110</Y>
+		<Name><![CDATA[f_getActiveSliderGridConnections_all]]></Name>
+		<X>550</X>
+		<Y>130</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -238,8 +238,8 @@
 		<ReturnType>List&lt;GCPublicCharger&gt;</ReturnType>
 		<Id>1755013777878</Id>
 		<Name><![CDATA[f_getPausedSliderGridConnections_chargers]]></Name>
-		<X>540</X>
-		<Y>280</Y>
+		<X>550</X>
+		<Y>400</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -271,7 +271,55 @@
 		<Id>1758278620331</Id>
 		<Name><![CDATA[f_getAllSliderGridConnections_chargers]]></Name>
 		<X>540</X>
-		<Y>330</Y>
+		<Y>360</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
+		<ReturnType>List&lt;GridConnection&gt;</ReturnType>
+		<Id>1761208715194</Id>
+		<Name><![CDATA[f_getAllSliderGridConnections_consumption]]></Name>
+		<X>540</X>
+		<Y>180</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="public" StaticFunction="false">
+		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
+		<ReturnType>List&lt;GridConnection&gt;</ReturnType>
+		<Id>1761208797812</Id>
+		<Name><![CDATA[f_getPausedSliderGridConnections_all]]></Name>
+		<X>550</X>
+		<Y>150</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
+		<ReturnType>List&lt;GridConnection&gt;</ReturnType>
+		<Id>1761208826669</Id>
+		<Name><![CDATA[f_getAllSliderGridConnections_all]]></Name>
+		<X>530</X>
+		<Y>110</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
diff --git a/_alp/Agents/UI_Tabs/Variables.xml b/_alp/Agents/UI_Tabs/Variables.xml
index 141849c1..304377c8 100644
--- a/_alp/Agents/UI_Tabs/Variables.xml
+++ b/_alp/Agents/UI_Tabs/Variables.xml
@@ -68,7 +68,7 @@
 	</Variable>
 	<Variable Class="PlainVariable">
 		<Id>1754908036761</Id>
-		<Name><![CDATA[v_sliderGridConnections]]></Name>
+		<Name><![CDATA[v_activeSliderGridConnections]]></Name>
 		<X>530</X>
 		<Y>50</Y>
 		<Label>
diff --git a/_alp/Agents/UI_company/AOC.UI_company.xml b/_alp/Agents/UI_company/AOC.UI_company.xml
index a85259f4..ab9393e2 100644
--- a/_alp/Agents/UI_company/AOC.UI_company.xml
+++ b/_alp/Agents/UI_company/AOC.UI_company.xml
@@ -7,6 +7,10 @@
 	<Import><![CDATA[//import kotlinx.serialization.internal.ArrayListClassDesc;
 import org.eclipse.jdt.internal.compiler.ast.ForeachStatement;
 ]]></Import>
+	<StartupCode><![CDATA[//Initialize graph locations and visibility
+f_setResultsUIPresets();
+
+zero_Interface.c_UIResultsInstances.add(uI_Results);]]></StartupCode>
 	<Generic>false</Generic>
 	<GenericParameter>
 		<Id>1708522361868</Id>
diff --git a/_alp/Agents/UI_company/Code/Functions.java b/_alp/Agents/UI_company/Code/Functions.java
index 3767e7f4..e82d6479 100644
--- a/_alp/Agents/UI_company/Code/Functions.java
+++ b/_alp/Agents/UI_company/Code/Functions.java
@@ -1,4 +1,4 @@
-double f_setScenarioFuture(GridConnection GC)
+double f_setScenarioFuture()
 {/*ALCODESTART::1713445281785*/
 //Set button to custom early on, so traceln will get ignored.
 rb_scenariosPrivateUI.setValue(2, false);
@@ -7,11 +7,11 @@
 ////Heating
 
 //Heating savings
-sl_heatDemandCompanyReduction.setValue(c_scenarioSettings_Future.get(v_currentSelectedGCnr).getPlannedHeatSavings(), true);
+sl_heatDemandCompanyReduction.setValue(p_scenarioSettings_Future.getPlannedHeatSavings(), true);
 
 //Heating type (aangenomen dat het hetzelfde blijft, want hebben geen vraag die dat stelt in het formulier)
 int nr_currentHeatingType = 0;
-switch (c_scenarioSettings_Future.get(v_currentSelectedGCnr).getPlannedHeatingType()){
+switch (p_scenarioSettings_Future.getPlannedHeatingType()){
 	case GAS_BURNER:
 		nr_currentHeatingType = 0;
 		break;
@@ -41,49 +41,49 @@
 ////Electricity
 
 //Electricity savings
-sl_electricityDemandCompanyReduction.setValue(c_scenarioSettings_Future.get(v_currentSelectedGCnr).getPlannedElectricitySavings(), true);
+sl_electricityDemandCompanyReduction.setValue(p_scenarioSettings_Future.getPlannedElectricitySavings(), true);
 
 //Connection capacity (Delivery)
-sl_GCCapacityCompany.setValue(c_scenarioSettings_Future.get(v_currentSelectedGCnr).getRequestedContractDeliveryCapacity_kW(), true);
+sl_GCCapacityCompany.setValue(p_scenarioSettings_Future.getRequestedContractDeliveryCapacity_kW(), true);
 
 //Connection capacity (Feedin)
-sl_GCCapacityCompany_Feedin.setValue(c_scenarioSettings_Future.get(v_currentSelectedGCnr).getRequestedContractFeedinCapacity_kW(), true);
+sl_GCCapacityCompany_Feedin.setValue(p_scenarioSettings_Future.getRequestedContractFeedinCapacity_kW(), true);
 
 //Connection capacity (Physical)
-v_physicalConnectionCapacity_kW = c_scenarioSettings_Future.get(v_currentSelectedGCnr).getRequestedPhysicalConnectionCapacity_kW();
-c_ownedGridConnections.get(v_currentSelectedGCnr).v_liveConnectionMetaData.physicalCapacity_kW = v_physicalConnectionCapacity_kW;
+v_physicalConnectionCapacity_kW = p_scenarioSettings_Future.getRequestedPhysicalConnectionCapacity_kW();
+p_gridConnection.v_liveConnectionMetaData.physicalCapacity_kW = v_physicalConnectionCapacity_kW;
 
 //Solar panel power
-sl_rooftopPVCompany.setValue(c_scenarioSettings_Future.get(v_currentSelectedGCnr).getPlannedPV_kW(), true);
+sl_rooftopPVCompany.setValue(p_scenarioSettings_Future.getPlannedPV_kW(), true);
 
 //Battery capacity
-sl_batteryCompany.setValue(c_scenarioSettings_Future.get(v_currentSelectedGCnr).getPlannedBatteryCapacity_kWh(), true);
+sl_batteryCompany.setValue(p_scenarioSettings_Future.getPlannedBatteryCapacity_kWh(), true);
 
 //Curtailment setting
-cb_curtailmentCompany.setSelected(c_scenarioSettings_Future.get(v_currentSelectedGCnr).getPlannedCurtailment(), true);
+cb_curtailmentCompany.setSelected(p_scenarioSettings_Future.getPlannedCurtailment(), true);
 
 ////Mobility
 
 //Mobility savings
-sl_mobilityDemandCompanyReduction.setValue(c_scenarioSettings_Future.get(v_currentSelectedGCnr).getPlannedTransportSavings(), true);
+sl_mobilityDemandCompanyReduction.setValue(p_scenarioSettings_Future.getPlannedTransportSavings(), true);
 
 //Cars (VOLGORDE BELANGRIJK)
-sl_hydrogenCarsCompany.setValue(c_scenarioSettings_Future.get(v_currentSelectedGCnr).getPlannedHydrogenCars(), true);
-sl_electricCarsCompany.setValue(c_scenarioSettings_Future.get(v_currentSelectedGCnr).getPlannedEVCars(), true);
-//sl_dieselCarsCompany.setValue(c_scenarioSettings_Future.get(v_currentSelectedGCnr).getPlannedDieselCars(), true);
+sl_hydrogenCarsCompany.setValue(p_scenarioSettings_Future.getPlannedHydrogenCars(), true);
+sl_electricCarsCompany.setValue(p_scenarioSettings_Future.getPlannedEVCars(), true);
+//sl_dieselCarsCompany.setValue(c_scenarioSettings_Future.getPlannedDieselCars(), true);
 
 //Vans (VOLGORDE BELANGRIJK)
-sl_hydrogenVansCompany.setValue(c_scenarioSettings_Future.get(v_currentSelectedGCnr).getPlannedHydrogenVans(), true);
-sl_electricVansCompany.setValue(c_scenarioSettings_Future.get(v_currentSelectedGCnr).getPlannedEVVans(), true);
-//sl_dieselVansCompany.setValue(c_scenarioSettings_Future.get(v_currentSelectedGCnr).getPlannedDieselVans(), true);
+sl_hydrogenVansCompany.setValue(p_scenarioSettings_Future.getPlannedHydrogenVans(), true);
+sl_electricVansCompany.setValue(p_scenarioSettings_Future.getPlannedEVVans(), true);
+//sl_dieselVansCompany.setValue(c_scenarioSettings_Future.getPlannedDieselVans(), true);
 
 //Trucks (VOLGORDE BELANGRIJK)
-sl_hydrogenTrucksCompany.setValue(c_scenarioSettings_Future.get(v_currentSelectedGCnr).getPlannedHydrogenTrucks(), true);
-sl_electricTrucksCompany.setValue(c_scenarioSettings_Future.get(v_currentSelectedGCnr).getPlannedEVTrucks(), true);
-//sl_dieselTrucksCompany.setValue(c_scenarioSettings_Future.get(v_currentSelectedGCnr).getPlannedDieselTrucks(), true);
+sl_hydrogenTrucksCompany.setValue(p_scenarioSettings_Future.getPlannedHydrogenTrucks(), true);
+sl_electricTrucksCompany.setValue(p_scenarioSettings_Future.getPlannedEVTrucks(), true);
+//sl_dieselTrucksCompany.setValue(c_scenarioSettings_Future.getPlannedDieselTrucks(), true);
 
 //set active if active in future
-c_ownedGridConnections.get(v_currentSelectedGCnr).f_setActive(c_scenarioSettings_Future.get(v_currentSelectedGCnr).getIsActiveInFuture());
+p_gridConnection.f_setActive(p_scenarioSettings_Future.getIsActiveInFuture());
 
 
 //Reset button to future, due to sliders putting it on custom
@@ -92,29 +92,20 @@
 
 double f_setScenario(int scenario_nr)
 {/*ALCODESTART::1713447383903*/
-int currentSelectedGCnr_local = v_currentSelectedGCnr; //Save current selected GCnr to go back there after scenarios are set for both
-
 switch (scenario_nr){
 
 	case 0: // Current
-		for (int i = c_ownedGridConnections.size(); i > 0; i-- ){
-			GCnr_selection.setValue(i-1, true);
-			f_setScenarioCurrent(c_ownedGridConnections.get(v_currentSelectedGCnr));
-		}
-		GCnr_selection.setValue(currentSelectedGCnr_local, true);
-		
+		f_setScenarioCurrent();
+
 		if(!b_runningMainInterfaceScenarioSettings){
 			traceln("Selected scenario: Current");
 		}
+		
 	break;
 	
 	case 1: // Future
-		for (int i = c_ownedGridConnections.size(); i > 0; i-- ){
-			GCnr_selection.setValue(i-1, true);
-			f_setScenarioFuture(c_ownedGridConnections.get(v_currentSelectedGCnr));
-		}
-		GCnr_selection.setValue(currentSelectedGCnr_local, true);
-		
+		f_setScenarioFuture();
+
 		if(!b_runningMainInterfaceScenarioSettings){
 			traceln("Selected scenario: Future");
 		}
@@ -138,7 +129,7 @@
 zero_Interface.b_resultsUpToDate = false;
 /*ALCODEEND*/}
 
-double f_setScenarioCurrent(GridConnection GC)
+double f_setScenarioCurrent()
 {/*ALCODESTART::1713447428490*/
 //Set button to custom early on, so traceln will get ignored.
 rb_scenariosPrivateUI.setValue(2, false);
@@ -151,7 +142,7 @@
 
 //Heating type
 int nr_currentHeatingType = 0;
-switch (c_scenarioSettings_Current.get(v_currentSelectedGCnr).getCurrentHeatingType()){
+switch (p_scenarioSettings_Current.getCurrentHeatingType()){
 	case GAS_BURNER:
 		nr_currentHeatingType = 0;
 		break;
@@ -184,14 +175,14 @@
 sl_electricityDemandCompanyReduction.setValue(0, true);
 
 //Connection capacity (Delivery)
-sl_GCCapacityCompany.setValue(c_scenarioSettings_Current.get(v_currentSelectedGCnr).getCurrentContractDeliveryCapacity_kW(), true);
+sl_GCCapacityCompany.setValue(p_scenarioSettings_Current.getCurrentContractDeliveryCapacity_kW(), true);
 
 //Connection capacity (Feedin)
-sl_GCCapacityCompany_Feedin.setValue(c_scenarioSettings_Current.get(v_currentSelectedGCnr).getCurrentContractFeedinCapacity_kW(), true);
+sl_GCCapacityCompany_Feedin.setValue(p_scenarioSettings_Current.getCurrentContractFeedinCapacity_kW(), true);
 
 //Connection capacity (Physical)
-v_physicalConnectionCapacity_kW = c_scenarioSettings_Current.get(v_currentSelectedGCnr).getCurrentPhysicalConnectionCapacity_kW();
-c_ownedGridConnections.get(v_currentSelectedGCnr).v_liveConnectionMetaData.physicalCapacity_kW = v_physicalConnectionCapacity_kW;
+v_physicalConnectionCapacity_kW = p_scenarioSettings_Current.getCurrentPhysicalConnectionCapacity_kW();
+p_gridConnection.v_liveConnectionMetaData.physicalCapacity_kW = v_physicalConnectionCapacity_kW;
 
 //Solar panel power
 sl_rooftopPVCompany.setValue(v_minPVSlider, true);
@@ -208,22 +199,22 @@
 sl_mobilityDemandCompanyReduction.setValue(0, true);
 
 //Cars (VOLGORDE BELANGRIJK)
-sl_hydrogenCarsCompany.setValue(c_scenarioSettings_Current.get(v_currentSelectedGCnr).getCurrentHydrogenCars(), true);
-sl_electricCarsCompany.setValue(c_scenarioSettings_Current.get(v_currentSelectedGCnr).getCurrentEVCars(), true);
-//sl_dieselCarsCompany.setValue(c_scenarioSettings_Current.get(v_currentSelectedGCnr).getCurrentDieselCars(), true);
+sl_hydrogenCarsCompany.setValue(p_scenarioSettings_Current.getCurrentHydrogenCars(), true);
+sl_electricCarsCompany.setValue(p_scenarioSettings_Current.getCurrentEVCars(), true);
+//sl_dieselCarsCompany.setValue(c_scenarioSettings_Current.getCurrentDieselCars(), true);
 
 //Vans (VOLGORDE BELANGRIJK)
-sl_hydrogenVansCompany.setValue(c_scenarioSettings_Current.get(v_currentSelectedGCnr).getCurrentHydrogenVans(), true);
-sl_electricVansCompany.setValue(c_scenarioSettings_Current.get(v_currentSelectedGCnr).getCurrentEVVans(), true);
-//sl_dieselVansCompany.setValue(c_scenarioSettings_Current.get(v_currentSelectedGCnr).getCurrentDieselVans(), true);
+sl_hydrogenVansCompany.setValue(p_scenarioSettings_Current.getCurrentHydrogenVans(), true);
+sl_electricVansCompany.setValue(p_scenarioSettings_Current.getCurrentEVVans(), true);
+//sl_dieselVansCompany.setValue(c_scenarioSettings_Current.getCurrentDieselVans(), true);
 
 //Trucks (VOLGORDE BELANGRIJK)
-sl_hydrogenTrucksCompany.setValue(c_scenarioSettings_Current.get(v_currentSelectedGCnr).getCurrentHydrogenTrucks(), true);
-sl_electricTrucksCompany.setValue(c_scenarioSettings_Current.get(v_currentSelectedGCnr).getCurrentEVTrucks(), true);
-//sl_dieselTrucksCompany.setValue(c_scenarioSettings_Current.get(v_currentSelectedGCnr).getCurrentDieselTrucks(), true);
+sl_hydrogenTrucksCompany.setValue(p_scenarioSettings_Current.getCurrentHydrogenTrucks(), true);
+sl_electricTrucksCompany.setValue(p_scenarioSettings_Current.getCurrentEVTrucks(), true);
+//sl_dieselTrucksCompany.setValue(c_scenarioSettings_Current.getCurrentDieselTrucks(), true);
 
 //set active if active in present
-c_ownedGridConnections.get(v_currentSelectedGCnr).f_setActive(c_scenarioSettings_Current.get(v_currentSelectedGCnr).getIsCurrentlyActive());
+p_gridConnection.f_setActive(p_scenarioSettings_Current.getIsCurrentlyActive());
 
 //Reset button to current, due to sliders putting it on custom
 rb_scenariosPrivateUI.setValue(0, false);
@@ -419,25 +410,27 @@
 
 double f_setBattery(GridConnection GC,double setBatteryCapacity_kWh)
 {/*ALCODESTART::1713537591121*/
-//If every detail company has battery EA (even if capacity = 0)
 J_EAStorage batteryAsset = findFirst(GC.c_storageAssets, p -> p.energyAssetType == OL_EnergyAssetType.STORAGE_ELECTRIC );
 
-if (batteryAsset == null && setBatteryCapacity_kWh == 0) {
-	return;
-}
-else if (batteryAsset == null) {
-	GridConnection gc = p_company.f_getOwnedGridConnections().get(v_currentSelectedGCnr);
-	batteryAsset = new J_EAStorageElectric(gc, 0, 0, 0, zero_Interface.energyModel.p_timeStep_h);
+if (setBatteryCapacity_kWh == 0) {	
+	if (batteryAsset != null) {
+		batteryAsset.removeEnergyAsset();
+	}
 }
-double existing_batterypower_capacity_ratio = zero_Interface.energyModel.avgc_data.p_avgRatioBatteryCapacity_v_Power;
-
-if(((J_EAStorageElectric)batteryAsset).getCapacityElectric_kW() != 0){
-	existing_batterypower_capacity_ratio = ((J_EAStorageElectric)batteryAsset).getCapacityElectric_kW()/((J_EAStorageElectric)batteryAsset).getStorageCapacity_kWh();	
+else {
+	double c_rate = 1.0 / zero_Interface.energyModel.avgc_data.p_avgRatioBatteryCapacity_v_Power;
+	if (batteryAsset == null) {
+		batteryAsset = new J_EAStorageElectric(GC, setBatteryCapacity_kWh * c_rate, setBatteryCapacity_kWh, 0.5, zero_Interface.energyModel.p_timeStep_h);	
+	}
+	else {		
+		if (batteryAsset.getStorageCapacity_kWh() != 0) {
+			c_rate = ((J_EAStorageElectric)batteryAsset).getCapacityElectric_kW()/((J_EAStorageElectric)batteryAsset).getStorageCapacity_kWh();
+		}
+		((J_EAStorageElectric)batteryAsset).setStorageCapacity_kWh(setBatteryCapacity_kWh);
+		((J_EAStorageElectric)batteryAsset).setCapacityElectric_kW(c_rate * setBatteryCapacity_kWh);
+	}
 }
 
-((J_EAStorageElectric)batteryAsset).setCapacityElectric_kW(setBatteryCapacity_kWh*existing_batterypower_capacity_ratio); //Set Power
-((J_EAStorageElectric)batteryAsset).setStorageCapacity_kWh(setBatteryCapacity_kWh);										 //Set storage capacity
-
 //Add battery algorithm if it is not present
 if(GC.p_batteryAlgorithm == null){
 	GC.p_batteryAlgorithm = new J_BatteryManagementSelfConsumption(GC);
@@ -450,7 +443,7 @@ else if (batteryAsset == null) {
 if (GC.v_liveAssetsMetaData.activeAssetFlows.contains(OL_AssetFlowCategories.pvProductionElectric_kW)){
 	J_EAProduction pvAsset = findFirst(GC.c_productionAssets, p -> p.energyAssetType == OL_EnergyAssetType.PHOTOVOLTAIC );
 	if (v_rooftopPV_kWp == 0) {
-		pvAsset.removeEnergyAsset();;
+		pvAsset.removeEnergyAsset();
 	}
 	else {
 		pvAsset.setCapacityElectric_kW(v_rooftopPV_kWp);
@@ -487,11 +480,31 @@ else if (batteryAsset == null) {
 f_setDemandReductionSliderPresets();
 /*ALCODEEND*/}
 
-double f_setComboBoxGC()
+double f_setComboBoxOwnedGC()
 {/*ALCODESTART::1713961813474*/
-if(c_ownedGridConnections.size() <= 1){
-	gr_selectedGC.setVisible(false);
+String currentSelectedGCString = "";
+int i = 1;
+List<String> ownedGCs = new ArrayList<String>();
+for(GridConnection GC : p_gridConnection.p_owner.f_getOwnedGridConnections()){
+	if(GC instanceof GCUtility){
+		String GCDisplayName = "Aansluiting " + i + ": " + GC.p_address.getAddress();
+		ownedGCs.add(GCDisplayName);
+		i++;
+		
+		if(GC == p_gridConnection){
+			currentSelectedGCString = GCDisplayName;
+		}
+	}
+}
+String[] ownedGCsArray = new String[ownedGCs.size()];
+for(int j = 0; j < ownedGCsArray.length; j++){
+	ownedGCsArray[j] = ownedGCs.get(j);
 }
+
+cb_selectGC.setItems(ownedGCsArray, false);
+
+//Set cb to correct gc
+cb_selectGC.setValue(currentSelectedGCString, false);
 /*ALCODEEND*/}
 
 double f_setPVSliderPresets()
@@ -500,8 +513,8 @@ else if (batteryAsset == null) {
 sl_rooftopPVCompany.setRange(0, 2000000);
 
 //Set range specific for each company
-v_minPVSlider = roundToInt(c_scenarioSettings_Current.get(v_currentSelectedGCnr).getCurrentPV_kW());
-v_maxPVSlider = roundToInt(zero_Interface.energyModel.avgc_data.p_avgRatioRoofPotentialPV* c_ownedGridConnections.get(v_currentSelectedGCnr).p_roofSurfaceArea_m2*zero_Interface.energyModel.avgc_data.p_avgPVPower_kWpm2);
+v_minPVSlider = roundToInt(p_scenarioSettings_Current.getCurrentPV_kW());
+v_maxPVSlider = roundToInt(zero_Interface.energyModel.avgc_data.p_avgRatioRoofPotentialPV* p_gridConnection.p_roofSurfaceArea_m2*zero_Interface.energyModel.avgc_data.p_avgPVPower_kWpm2);
 if(v_maxPVSlider <= v_minPVSlider){
 	v_maxPVSlider = v_minPVSlider + 1000;
 }
@@ -513,8 +526,8 @@ else if (batteryAsset == null) {
 //Set back end range (to prevent anylogic errors)
 sl_batteryCompany.setRange(0, 10000);
 
-double upperLimit = 1000 + 1000 * Math.ceil(c_scenarioSettings_Current.get(v_currentSelectedGCnr).getCurrentPV_kW()/1000.0);
-v_minBatSlider = roundToInt(c_scenarioSettings_Current.get(v_currentSelectedGCnr).getCurrentBatteryCapacity_kWh());
+double upperLimit = 1000 + 1000 * Math.ceil(p_scenarioSettings_Current.getCurrentPV_kW()/1000.0);
+v_minBatSlider = roundToInt(p_scenarioSettings_Current.getCurrentBatteryCapacity_kWh());
 v_maxBatSlider = Math.max(v_minBatSlider*2, upperLimit);
 v_defaultBatSlider = v_minBatSlider;
 /*ALCODEEND*/}
@@ -540,9 +553,9 @@ else if (batteryAsset == null) {
 
 
 //Get default values
-int default_nbEVCars = c_scenarioSettings_Current.get(v_currentSelectedGCnr).getCurrentEVCars();
-int default_nbDieselCars = c_scenarioSettings_Current.get(v_currentSelectedGCnr).getCurrentDieselCars();
-int default_nbHydrogenCars = c_scenarioSettings_Current.get(v_currentSelectedGCnr).getCurrentHydrogenCars();
+int default_nbEVCars = p_scenarioSettings_Current.getCurrentEVCars();
+int default_nbDieselCars = p_scenarioSettings_Current.getCurrentDieselCars();
+int default_nbHydrogenCars = p_scenarioSettings_Current.getCurrentHydrogenCars();
 
 //Set minimum value
 v_minEVCarSlider = default_nbEVCars;
@@ -577,9 +590,9 @@ else if (batteryAsset == null) {
 sl_hydrogenVansCompany.setRange(0, 500);
 
 //Get default values
-int default_nbEVVans = c_scenarioSettings_Current.get(v_currentSelectedGCnr).getCurrentEVVans();
-int default_nbDieselVans = c_scenarioSettings_Current.get(v_currentSelectedGCnr).getCurrentDieselVans();
-int default_nbHydrogenVans = c_scenarioSettings_Current.get(v_currentSelectedGCnr).getCurrentHydrogenVans();
+int default_nbEVVans = p_scenarioSettings_Current.getCurrentEVVans();
+int default_nbDieselVans = p_scenarioSettings_Current.getCurrentDieselVans();
+int default_nbHydrogenVans = p_scenarioSettings_Current.getCurrentHydrogenVans();
 
 //Set minimum value
 v_minEVVanSlider = default_nbEVVans;
@@ -614,9 +627,9 @@ else if (batteryAsset == null) {
 sl_hydrogenTrucksCompany.setRange(0, 500);
 
 //Get default values
-int default_nbEVTrucks = c_scenarioSettings_Current.get(v_currentSelectedGCnr).getCurrentEVTrucks();
-int default_nbDieselTrucks = c_scenarioSettings_Current.get(v_currentSelectedGCnr).getCurrentDieselTrucks();
-int default_nbHydrogenTrucks = c_scenarioSettings_Current.get(v_currentSelectedGCnr).getCurrentHydrogenTrucks();
+int default_nbEVTrucks = p_scenarioSettings_Current.getCurrentEVTrucks();
+int default_nbDieselTrucks = p_scenarioSettings_Current.getCurrentDieselTrucks();
+int default_nbHydrogenTrucks = p_scenarioSettings_Current.getCurrentHydrogenTrucks();
 
 //Set minimum value
 v_minEVTruckSlider = default_nbEVTrucks;
@@ -656,17 +669,17 @@ else if (batteryAsset == null) {
 
 	switch(vehicleType){
 		case ELECTRIC_VEHICLE:
-			capacityElectricity_kW	= (c_scenarioSettings_Current.get(v_currentSelectedGCnr).getCurrentEVCarChargePower_kW() != 0) ? c_scenarioSettings_Current.get(v_currentSelectedGCnr).getCurrentEVCarChargePower_kW() : zero_Interface.energyModel.avgc_data.p_avgEVMaxChargePowerCar_kW;
+			capacityElectricity_kW	= (p_scenarioSettings_Current.getCurrentEVCarChargePower_kW() != 0) ? p_scenarioSettings_Current.getCurrentEVCarChargePower_kW() : zero_Interface.energyModel.avgc_data.p_avgEVMaxChargePowerCar_kW;
 			storageCapacity_kWh		= zero_Interface.energyModel.avgc_data.p_avgEVStorageCar_kWh;
 			energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgEVEnergyConsumptionCar_kWhpkm;
 		break;
 		case ELECTRIC_VAN:
-			capacityElectricity_kW	= (c_scenarioSettings_Current.get(v_currentSelectedGCnr).getCurrentEVVanChargePower_kW() != 0) ? c_scenarioSettings_Current.get(v_currentSelectedGCnr).getCurrentEVVanChargePower_kW() : zero_Interface.energyModel.avgc_data.p_avgEVMaxChargePowerVan_kW;
+			capacityElectricity_kW	= (p_scenarioSettings_Current.getCurrentEVVanChargePower_kW() != 0) ? p_scenarioSettings_Current.getCurrentEVVanChargePower_kW() : zero_Interface.energyModel.avgc_data.p_avgEVMaxChargePowerVan_kW;
 			storageCapacity_kWh		= zero_Interface.energyModel.avgc_data.p_avgEVStorageVan_kWh;
 			energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgEVEnergyConsumptionVan_kWhpkm;
 		break;
 		case ELECTRIC_TRUCK:
-			capacityElectricity_kW	= (c_scenarioSettings_Current.get(v_currentSelectedGCnr).getCurrentEVTruckChargePower_kW() != 0) ? c_scenarioSettings_Current.get(v_currentSelectedGCnr).getCurrentEVTruckChargePower_kW() : zero_Interface.energyModel.avgc_data.p_avgEVMaxChargePowerTruck_kW;
+			capacityElectricity_kW	= (p_scenarioSettings_Current.getCurrentEVTruckChargePower_kW() != 0) ? p_scenarioSettings_Current.getCurrentEVTruckChargePower_kW() : zero_Interface.energyModel.avgc_data.p_avgEVMaxChargePowerTruck_kW;
 			storageCapacity_kWh		= zero_Interface.energyModel.avgc_data.p_avgEVStorageTruck_kWh;
 			energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgEVEnergyConsumptionTruck_kWhpkm;
 		break;
@@ -680,7 +693,7 @@ else if (batteryAsset == null) {
 	
 	
 	if (isAdditionalVehicle){
-		c_additionalVehicles.get(c_ownedGridConnections.get(v_currentSelectedGCnr).p_uid).add(electricVehicle);
+		zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid).add(electricVehicle);
 	}
 	else{
 		zero_Interface.c_orderedVehicles.add(0, electricVehicle);
@@ -710,7 +723,7 @@ else if (vehicleType == OL_EnergyAssetType.DIESEL_VEHICLE || vehicleType == OL_E
 	
 	
 	if (isAdditionalVehicle){
-		c_additionalVehicles.get(c_ownedGridConnections.get(v_currentSelectedGCnr).p_uid).add(dieselVehicle);
+		zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid).add(dieselVehicle);
 	}
 	else{
 		zero_Interface.c_orderedVehicles.add(0, dieselVehicle);
@@ -738,7 +751,7 @@ else if (vehicleType == OL_EnergyAssetType.DIESEL_VEHICLE || vehicleType == OL_E
 	
 	
 	if (isAdditionalVehicle){
-		c_additionalVehicles.get(c_ownedGridConnections.get(v_currentSelectedGCnr).p_uid).add(hydrogenVehicle);
+		zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid).add(hydrogenVehicle);
 	}
 	else{
 		zero_Interface.c_orderedVehicles.add(0, hydrogenVehicle);
@@ -808,11 +821,11 @@ int f_setElectricVehicleSliders(GridConnection GC,OL_EnergyAssetType vehicleType
 if (setAmountOfVehicles > local_EV_nb){ // Slider has increased the amount of selected vehicles
 	
 	//First convert all other existing additional vehicles
-	int nbOfOtherAdditionalVehiclesOfThisClass = findAll(c_additionalVehicles.get(GC.p_uid), p -> p.energyAssetType == vehicleType_diesel || p.energyAssetType == vehicleType_hydrogen).size();
+	int nbOfOtherAdditionalVehiclesOfThisClass = findAll(zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid), p -> p.energyAssetType == vehicleType_diesel || p.energyAssetType == vehicleType_hydrogen).size();
 	while(setAmountOfVehicles > local_EV_nb && nbOfOtherAdditionalVehiclesOfThisClass > 0 ){
 		
 		// Find an additional Diesel vehicle
-		J_EAVehicle dieselVehicle = findFirst(c_additionalVehicles.get(GC.p_uid), p -> p.energyAssetType == vehicleType_diesel);
+		J_EAVehicle dieselVehicle = findFirst(zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid), p -> p.energyAssetType == vehicleType_diesel);
 		
 		if(dieselVehicle != null){
 			J_ActivityTrackerTrips tripTracker = dieselVehicle.tripTracker;
@@ -820,7 +833,7 @@ int f_setElectricVehicleSliders(GridConnection GC,OL_EnergyAssetType vehicleType
 			// Remove Diesel vehicle		
 			boolean available = dieselVehicle.getAvailability();
 			dieselVehicle.removeEnergyAsset();
-			c_additionalVehicles.get(GC.p_uid).remove(dieselVehicle);
+			zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid).remove(dieselVehicle);
 			zero_Interface.c_orderedVehicles.remove(dieselVehicle);
 			
 			//Create new additional EV
@@ -833,13 +846,13 @@ int f_setElectricVehicleSliders(GridConnection GC,OL_EnergyAssetType vehicleType
 		}
 		else{
 			// Find an additional Hydrogen vehicle
-			J_EAVehicle hydrogenVehicle = findFirst(c_additionalVehicles.get(GC.p_uid), p -> p.energyAssetType == vehicleType_hydrogen);
+			J_EAVehicle hydrogenVehicle = findFirst(zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid), p -> p.energyAssetType == vehicleType_hydrogen);
 			J_ActivityTrackerTrips tripTracker = hydrogenVehicle.tripTracker;
 			
 			// Remove Hydrogen vehicle		
 			boolean available = hydrogenVehicle.getAvailability();
 			hydrogenVehicle.removeEnergyAsset();
-			c_additionalVehicles.get(GC.p_uid).remove(hydrogenVehicle);
+			zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid).remove(hydrogenVehicle);
 			zero_Interface.c_orderedVehicles.remove(hydrogenVehicle);
 			
 			//Create new additional EV
@@ -900,7 +913,7 @@ int f_setElectricVehicleSliders(GridConnection GC,OL_EnergyAssetType vehicleType
 }
 else if(setAmountOfVehicles < local_EV_nb){ // Slider has decreased the amount of selected vehicles
 	
-	ArrayList<J_EAVehicle> additionalVehicles = new ArrayList<J_EAVehicle>(findAll(c_additionalVehicles.get(c_ownedGridConnections.get(v_currentSelectedGCnr).p_uid), vehicle -> vehicle.energyAssetType == vehicleType ));
+	ArrayList<J_EAVehicle> additionalVehicles = new ArrayList<J_EAVehicle>(findAll(zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid), vehicle -> vehicle.energyAssetType == vehicleType ));
 	while(setAmountOfVehicles < local_EV_nb && additionalVehicles.size() > 0){ //If there are additional EV, remove them first
 
 		//Find additional created vehicle
@@ -908,7 +921,7 @@ else if(setAmountOfVehicles < local_EV_nb){ // Slider has decreased the amount o
 		
 		// Remove electric vehicle
 		additionalVehicles.remove(ev);
-		c_additionalVehicles.get(GC.p_uid).remove(ev);
+		zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid).remove(ev);
 		zero_Interface.c_orderedVehicles.remove(ev);
 		ev.removeEnergyAsset();
 			
@@ -918,7 +931,7 @@ else if(setAmountOfVehicles < local_EV_nb){ // Slider has decreased the amount o
 	while ( setAmountOfVehicles < local_EV_nb && local_DieselV_nb < max_amount_diesel_vehicles) {
 
 		//Find a to be removed EV
-		J_EAEV ev = (J_EAEV)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == vehicleType && !c_additionalVehicles.get(c_ownedGridConnections.get(v_currentSelectedGCnr).p_uid).contains(p)  && ((GridConnection)p.getParentAgent()) == GC);
+		J_EAEV ev = (J_EAEV)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == vehicleType && !zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid).contains(p)  && ((GridConnection)p.getParentAgent()) == GC);
 		J_ActivityTrackerTrips tripTracker = ev.tripTracker;
 
 		//Remove EV
@@ -1029,11 +1042,11 @@ int f_setDieselVehicleSliders(GridConnection GC,OL_EnergyAssetType vehicleType,i
 
 if (setAmountOfVehicles > local_DieselV_nb){ // Slider has increased the amount of selected vehicles
 	//First convert all other existing additional vehicles
-	int nbOfOtherAdditionalVehiclesOfThisClass = findAll(c_additionalVehicles.get(GC.p_uid), p -> p.energyAssetType == vehicleType_hydrogen || p.energyAssetType == vehicleType_electric).size();
+	int nbOfOtherAdditionalVehiclesOfThisClass = findAll(zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid), p -> p.energyAssetType == vehicleType_hydrogen || p.energyAssetType == vehicleType_electric).size();
 	while(setAmountOfVehicles > local_DieselV_nb && nbOfOtherAdditionalVehiclesOfThisClass > 0 ){
 
 		// Find an additional EV vehicle
-		J_EAVehicle ev = findFirst(c_additionalVehicles.get(GC.p_uid), p -> p.energyAssetType == vehicleType_electric);
+		J_EAVehicle ev = findFirst(zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid), p -> p.energyAssetType == vehicleType_electric);
 			
 		if(ev != null){
 			J_ActivityTrackerTrips tripTracker = ev.tripTracker;
@@ -1041,7 +1054,7 @@ int f_setDieselVehicleSliders(GridConnection GC,OL_EnergyAssetType vehicleType,i
 			// Remove EV
 			boolean available = ev.getAvailability();
 			ev.removeEnergyAsset();
-			c_additionalVehicles.get(GC.p_uid).remove(ev);
+			zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid).remove(ev);
 			zero_Interface.c_orderedVehicles.remove(ev);
 			
 			//Create new additional Diesel vehicle
@@ -1054,13 +1067,13 @@ int f_setDieselVehicleSliders(GridConnection GC,OL_EnergyAssetType vehicleType,i
 		}
 		else{
 			// Find an additional Hydrogen vehicle
-			J_EAVehicle hydrogenVehicle = findFirst(c_additionalVehicles.get(GC.p_uid), p -> p.energyAssetType == vehicleType_hydrogen);
+			J_EAVehicle hydrogenVehicle = findFirst(zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid), p -> p.energyAssetType == vehicleType_hydrogen);
 			J_ActivityTrackerTrips tripTracker = hydrogenVehicle.tripTracker;
 			
 			// Remove Hydrogen vehicle		
 			boolean available = hydrogenVehicle.getAvailability();
 			hydrogenVehicle.removeEnergyAsset();
-			c_additionalVehicles.get(GC.p_uid).remove(hydrogenVehicle);
+			zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid).remove(hydrogenVehicle);
 			zero_Interface.c_orderedVehicles.remove(hydrogenVehicle);
 			
 			//Create new additional Diesel vehicle
@@ -1117,7 +1130,7 @@ int f_setDieselVehicleSliders(GridConnection GC,OL_EnergyAssetType vehicleType,i
 }
 else if(setAmountOfVehicles < local_DieselV_nb){ // Slider has decreased the amount of selected vehicles
 	
-	ArrayList<J_EAVehicle> additionalVehicles = new ArrayList<J_EAVehicle>(findAll(c_additionalVehicles.get(c_ownedGridConnections.get(v_currentSelectedGCnr).p_uid), vehicle -> vehicle.energyAssetType == vehicleType ));
+	ArrayList<J_EAVehicle> additionalVehicles = new ArrayList<J_EAVehicle>(findAll(zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid), vehicle -> vehicle.energyAssetType == vehicleType ));
 	while(setAmountOfVehicles < local_DieselV_nb && additionalVehicles.size() > 0){ //Remove additional Diesel vehicles first
 	
 	//Find additional created vehicle
@@ -1125,7 +1138,7 @@ else if(setAmountOfVehicles < local_DieselV_nb){ // Slider has decreased the amo
 	
 	// Remove diesel vehicle
 	additionalVehicles.remove(dieselVehicle);
-	c_additionalVehicles.get(GC.p_uid).remove(dieselVehicle);
+	zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid).remove(dieselVehicle);
 	dieselVehicle.removeEnergyAsset();
 	zero_Interface.c_orderedVehicles.remove(dieselVehicle);
 	
@@ -1135,7 +1148,7 @@ else if(setAmountOfVehicles < local_DieselV_nb){ // Slider has decreased the amo
 	while ( setAmountOfVehicles < local_DieselV_nb && local_EV_nb < max_amount_EV) {
 	
 	// Find a to be removed Diesel vehicle
-		J_EADieselVehicle dieselVehicle = (J_EADieselVehicle)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == vehicleType && !c_additionalVehicles.get(c_ownedGridConnections.get(v_currentSelectedGCnr).p_uid).contains(p)  && ((GridConnection)p.getParentAgent()) == GC);
+		J_EADieselVehicle dieselVehicle = (J_EADieselVehicle)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == vehicleType && !zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid).contains(p)  && ((GridConnection)p.getParentAgent()) == GC);
 		J_ActivityTrackerTrips tripTracker = dieselVehicle.tripTracker;
 		
 		// Remove diesel vehicle		
@@ -1241,11 +1254,11 @@ int f_setHydrogenVehicleSliders(GridConnection GC,OL_EnergyAssetType vehicleType
 if (setAmountOfVehicles > local_HydrogenV_nb){ // Slider has increased the amount of selected vehicles
 	
 	//First convert all other existing additional vehicles
-	int nbOfOtherAdditionalVehiclesOfThisClass = findAll(c_additionalVehicles.get(GC.p_uid), p -> p.energyAssetType == vehicleType_diesel || p.energyAssetType == vehicleType_electric).size();
+	int nbOfOtherAdditionalVehiclesOfThisClass = findAll(zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid), p -> p.energyAssetType == vehicleType_diesel || p.energyAssetType == vehicleType_electric).size();
 	while(setAmountOfVehicles > local_HydrogenV_nb && nbOfOtherAdditionalVehiclesOfThisClass > 0 ){
 		
 		// Find an additional Diesel vehicle
-		J_EAVehicle dieselVehicle = findFirst(c_additionalVehicles.get(GC.p_uid), p -> p.energyAssetType == vehicleType_diesel);
+		J_EAVehicle dieselVehicle = findFirst(zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid), p -> p.energyAssetType == vehicleType_diesel);
 		
 		if(dieselVehicle != null){
 			J_ActivityTrackerTrips tripTracker = dieselVehicle.tripTracker;
@@ -1253,7 +1266,7 @@ int f_setHydrogenVehicleSliders(GridConnection GC,OL_EnergyAssetType vehicleType
 			// Remove Diesel vehicle		
 			boolean available = dieselVehicle.getAvailability();
 			dieselVehicle.removeEnergyAsset();
-			c_additionalVehicles.get(GC.p_uid).remove(dieselVehicle);
+			zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid).remove(dieselVehicle);
 			zero_Interface.c_orderedVehicles.remove(dieselVehicle);
 			
 			//Create new additional Hydrogen vehicle
@@ -1266,13 +1279,13 @@ int f_setHydrogenVehicleSliders(GridConnection GC,OL_EnergyAssetType vehicleType
 		}
 		else{
 			// Find an additional EV vehicle
-			J_EAVehicle ev = findFirst(c_additionalVehicles.get(GC.p_uid), p -> p.energyAssetType == vehicleType_electric);
+			J_EAVehicle ev = findFirst(zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid), p -> p.energyAssetType == vehicleType_electric);
 			J_ActivityTrackerTrips tripTracker = ev.tripTracker;
 		
 			// Remove EV
 			boolean available = ev.getAvailability();
 			ev.removeEnergyAsset();
-			c_additionalVehicles.get(GC.p_uid).remove(ev);
+			zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid).remove(ev);
 			zero_Interface.c_orderedVehicles.remove(ev);
 			
 			//Create new additional Hydrogen vehicle
@@ -1331,7 +1344,7 @@ int f_setHydrogenVehicleSliders(GridConnection GC,OL_EnergyAssetType vehicleType
 }
 else if(setAmountOfVehicles < local_HydrogenV_nb){ // Slider has decreased the amount of selected vehicles
 	
-	ArrayList<J_EAVehicle> additionalVehicles = new ArrayList<J_EAVehicle>(findAll(c_additionalVehicles.get(c_ownedGridConnections.get(v_currentSelectedGCnr).p_uid), vehicle -> vehicle.energyAssetType == vehicleType ));
+	ArrayList<J_EAVehicle> additionalVehicles = new ArrayList<J_EAVehicle>(findAll(zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid), vehicle -> vehicle.energyAssetType == vehicleType ));
 	while(setAmountOfVehicles < local_HydrogenV_nb && additionalVehicles.size() > 0){//Remove additional Hydrogen vehicles first
 
 	//Find additional created vehicle
@@ -1339,7 +1352,7 @@ else if(setAmountOfVehicles < local_HydrogenV_nb){ // Slider has decreased the a
 	
 	// Remove hydrogen vehicle
 	additionalVehicles.remove(hydrogenVehicle);
-	c_additionalVehicles.get(c_ownedGridConnections.get(v_currentSelectedGCnr).p_uid).remove(hydrogenVehicle);
+	zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid).remove(hydrogenVehicle);
 	hydrogenVehicle.removeEnergyAsset();
 	zero_Interface.c_orderedVehicles.remove(hydrogenVehicle);
 	
@@ -1349,7 +1362,7 @@ else if(setAmountOfVehicles < local_HydrogenV_nb){ // Slider has decreased the a
 	while ( setAmountOfVehicles < local_HydrogenV_nb && local_EV_nb < max_amount_EV) {
 	
 		// Find a to be removed Hydrogen vehicle
-		J_EAHydrogenVehicle hydrogenVehicle = (J_EAHydrogenVehicle)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == vehicleType && !c_additionalVehicles.get(c_ownedGridConnections.get(v_currentSelectedGCnr).p_uid).contains(p)  && ((GridConnection)p.getParentAgent()) == GC);
+		J_EAHydrogenVehicle hydrogenVehicle = (J_EAHydrogenVehicle)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == vehicleType && !zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid).contains(p)  && ((GridConnection)p.getParentAgent()) == GC);
 		J_ActivityTrackerTrips tripTracker = hydrogenVehicle.tripTracker;
 		
 		// Remove hydrogen vehicle			
@@ -1404,6 +1417,8 @@ else if(setAmountOfVehicles < local_HydrogenV_nb){ // Slider has decreased the a
 presentation.insert(presentation.size()-1, gr_loadIcon);
 presentation.remove(gr_simulateYearScreen);
 presentation.insert(presentation.size()-1, gr_simulateYearScreen);
+presentation.remove(gr_GCisPausedScreen);
+presentation.insert(presentation.size()-1, gr_GCisPausedScreen);
 
 
 
@@ -1429,30 +1444,40 @@ else if(setAmountOfVehicles < local_HydrogenV_nb){ // Slider has decreased the a
 uI_Results.f_styleAllCharts(v_chartBackgroundColor, v_companyUILineColor, v_chartLineWidth, LINE_STYLE_SOLID);
 /*ALCODEEND*/}
 
-double f_initializeCompanyUI()
+double f_setCompanyUI(GridConnection GC)
 {/*ALCODESTART::1714655282643*/
-//Set GC combobox 
-f_setComboBoxGC();
-
-//Initialize graph locations and visibility
-f_setResultsUIPresets();
-
-//Initialize the sliders
-f_setSliderPresets();
+//Initialize parameters
+p_gridConnection = GC;
+p_companyName = GC.p_ownerID;
+v_adressGC = GC.p_address.getAddress();
+p_scenarioSettings_Current = zero_Interface.c_scenarioMap_Current.get(GC.p_uid);
+p_scenarioSettings_Future = zero_Interface.c_scenarioMap_Future.get(GC.p_uid);
 
 //Scale companyName to the box size
 f_setNameTextSize();
 
+//Set the sliders to the correct settings
+f_setSelectedGCSliders();
 
-//Enable/disable all sliders (based on paused)
-if(!c_ownedGridConnections.get(v_currentSelectedGCnr).v_isActive){
-	f_enableAllSliders(false);
+//Set the new graphs/building selection
+if(!b_runningMainInterfaceScenarioSettings && !b_runningMainInterfaceSlider && p_gridConnection.v_isActive){
+	f_updateUIResultsCompanyUI();
+	if(p_gridConnection.v_rapidRunData != null){
+		uI_Results.f_setAllCharts();
+	}
 }
+
+//Set connected GC combobox 
+f_setComboBoxOwnedGC();
+
+//Enable/disable all sliders (based on paused)
+f_enableAllSliders(p_gridConnection.v_isActive);
+
 /*ALCODEEND*/}
 
 double f_updateUIResultsCompanyUI()
 {/*ALCODESTART::1714656835269*/
-uI_Results.f_updateResultsUI(c_ownedGridConnections.get(v_currentSelectedGCnr));
+uI_Results.f_updateResultsUI(p_gridConnection);
 uI_Results.f_setChartProfiles_Presentation(null, null, true);
 uI_Results.f_setChartBalance_Presentation(null, null, true);
 
@@ -1468,31 +1493,29 @@ else if(setAmountOfVehicles < local_HydrogenV_nb){ // Slider has decreased the a
 int nr_currentHeatingType = 0;
 String rbHeating_acces = "enabled";
 
-switch (c_scenarioSettings_Current.get(v_currentSelectedGCnr).getCurrentHeatingType()){
+switch (p_scenarioSettings_Current.getCurrentHeatingType()){
 	case GAS_BURNER:
 		nr_currentHeatingType = 0;
 		break;
-
 	case HYBRID_HEATPUMP:
 		nr_currentHeatingType = 1;
 		rbHeating_acces = "disabled";
 		break;
-
 	case ELECTRIC_HEATPUMP:
 		nr_currentHeatingType = 2;
 		rbHeating_acces = "disabled";
 		break;
-		
-	//case HYDROGENBURNER:
 	case DISTRICTHEAT:
 		nr_currentHeatingType = 3;
 		break;
-	
-	case GAS_CHP:
+	case LT_DISTRICTHEAT:
+		nr_currentHeatingType = 3;
+		rbHeating_acces = "disabled";
+		break;
+	case CUSTOM:
 		nr_currentHeatingType = 4;
-		gr_heatingOptionBlockerCHP.setVisible(false);
+		rbHeating_acces = "disabled";
 		break;
-		
 	default:
 		rbHeating_acces = "invisible";
 }
@@ -1500,7 +1523,7 @@ else if(setAmountOfVehicles < local_HydrogenV_nb){ // Slider has decreased the a
 if (rbHeating_acces.equals("disabled") || rbHeating_acces.equals("invisible")){
 	rb_heatingTypePrivateUI.setEnabled(false);
 	
-	if(c_ownedGridConnections.get(v_currentSelectedGCnr).v_hasQuarterHourlyValues){
+	if(p_gridConnection.v_hasQuarterHourlyValues){
 		sl_heatDemandCompanyReduction.setEnabled(false);
 	}
 	
@@ -1508,15 +1531,17 @@ else if(setAmountOfVehicles < local_HydrogenV_nb){ // Slider has decreased the a
 		rb_heatingTypePrivateUI.setVisible(false);
 		gr_heatDemandReductionSlider.setVisible(false);
 	}
+	else {
+		gr_heatDemandReductionSlider.setVisible(true);
+	}
 }
 else{ // if(rbHeating_acces.equals("enabled"){
 	rb_heatingTypePrivateUI.setEnabled(true);
 	rb_heatingTypePrivateUI.setVisible(true);
 	sl_heatDemandCompanyReduction.setEnabled(true);
-	sl_heatDemandCompanyReduction.setVisible(true);
+	gr_heatDemandReductionSlider.setVisible(true);
 }
 
-rb_heatingTypePrivateUI.setValue(nr_currentHeatingType, false);
 /*ALCODEEND*/}
 
 double f_addPVAsset(GridConnection parentGC,OL_EnergyAssetType asset_type,double installedPower_kW)
@@ -1534,34 +1559,20 @@ else if(setAmountOfVehicles < local_HydrogenV_nb){ // Slider has decreased the a
 
 /*ALCODEEND*/}
 
-double f_setSelectedGC()
-{/*ALCODESTART::1717576974529*/
-//Set the Adress to selected GC
-v_adressGC = c_ownedGridConnections.get(v_currentSelectedGCnr).p_address.getAddress();
-
-//Set the sliders
-f_setSelectedGCSliders();
-
-//Set the new graphs/building selection
-if(!b_runningMainInterfaceScenarioSettings && !b_runningMainInterfaceSlider && c_ownedGridConnections.get(v_currentSelectedGCnr).v_isActive){
-	f_setSelectedGCGraphs();
-}
-/*ALCODEEND*/}
-
 double f_setSelectedGCSliders()
 {/*ALCODESTART::1725439625846*/
 //Reset GC capacities to without NFATO values
-c_ownedGridConnections.get(v_currentSelectedGCnr).f_nfatoSetConnectionCapacity(true);
+p_gridConnection.f_nfatoSetConnectionCapacity(true);
 	
 //Initialize slider presets to selected GC (min, max, etc.)
 f_setSliderPresets();
 
 //If GC not active in current situation, disable scenario rb
-rb_scenariosPrivateUI.setEnabled(c_scenarioSettings_Current.get(v_currentSelectedGCnr).getIsCurrentlyActive());
+rb_scenariosPrivateUI.setEnabled(p_scenarioSettings_Current.getIsCurrentlyActive());
 
 //Find the current heating type
 int nr_currentHeatingType = 0;
-switch (c_ownedGridConnections.get(v_currentSelectedGCnr).f_getCurrentHeatingType()){
+switch (p_gridConnection.f_getCurrentHeatingType()){
 	case GAS_BURNER:
 		nr_currentHeatingType = 0;
 	break;
@@ -1574,22 +1585,26 @@ else if(setAmountOfVehicles < local_HydrogenV_nb){ // Slider has decreased the a
 		nr_currentHeatingType = 2;
 	break;
 		
-	case HYDROGENBURNER:
+	case DISTRICTHEAT:
+	case LT_DISTRICTHEAT:
 		nr_currentHeatingType = 3;
-	break;		
+	break;
+	case CUSTOM:
+		nr_currentHeatingType = 4;
+	break;	
 	default:
+		nr_currentHeatingType = 4;
 }
 
-
 //Find the current heat saving percentage
 int currentHeatSavings = 0;
 
-J_EAConsumption consumptionEAHEAT = findFirst(c_ownedGridConnections.get(v_currentSelectedGCnr).c_consumptionAssets, consumptionAsset -> consumptionAsset.energyAssetType == OL_EnergyAssetType.HEAT_DEMAND);
+J_EAConsumption consumptionEAHEAT = findFirst(p_gridConnection.c_consumptionAssets, consumptionAsset -> consumptionAsset.energyAssetType == OL_EnergyAssetType.HEAT_DEMAND);
 if (consumptionEAHEAT != null){
 	currentHeatSavings = roundToInt((consumptionEAHEAT.getConsumptionScaling_fr() - 1)*-100);
 }
 else{   
-	J_EAProfile profileEAHEAT = findFirst(c_ownedGridConnections.get(v_currentSelectedGCnr).c_profileAssets, profileAsset -> profileAsset.energyCarrier == OL_EnergyCarriers.HEAT);
+	J_EAProfile profileEAHEAT = findFirst(p_gridConnection.c_profileAssets, profileAsset -> profileAsset.energyCarrier == OL_EnergyCarriers.HEAT);
 	if (profileEAHEAT != null){
 		currentHeatSavings = roundToInt((profileEAHEAT.getProfileScaling_fr() - 1)*-100);
 	}
@@ -1598,65 +1613,65 @@ else if(setAmountOfVehicles < local_HydrogenV_nb){ // Slider has decreased the a
 //Find the current electricity savings percentage
 int currentElectricitySavings = 0;
 
-J_EAConsumption consumptionEAELECTRIC = findFirst(c_ownedGridConnections.get(v_currentSelectedGCnr).c_consumptionAssets, consumptionAsset -> consumptionAsset.energyAssetType == OL_EnergyAssetType.ELECTRICITY_DEMAND);
+J_EAConsumption consumptionEAELECTRIC = findFirst(p_gridConnection.c_consumptionAssets, consumptionAsset -> consumptionAsset.energyAssetType == OL_EnergyAssetType.ELECTRICITY_DEMAND);
 if (consumptionEAELECTRIC != null){
 	currentElectricitySavings = roundToInt((consumptionEAELECTRIC.getConsumptionScaling_fr() - 1)*-100);
 }
 else{
-	J_EAProfile profileEAELECTRIC = findFirst(c_ownedGridConnections.get(v_currentSelectedGCnr).c_profileAssets, profileAsset -> profileAsset.assetFlowCategory == OL_AssetFlowCategories.fixedConsumptionElectric_kW);
+	J_EAProfile profileEAELECTRIC = findFirst(p_gridConnection.c_profileAssets, profileAsset -> profileAsset.assetFlowCategory == OL_AssetFlowCategories.fixedConsumptionElectric_kW);
 	if (profileEAELECTRIC != null){
 		currentElectricitySavings = roundToInt((profileEAELECTRIC.getProfileScaling_fr() - 1)*-100);
 	}
 }
 
 //Find the current Connection capacity (delivery)
-int GCContractCapacityCurrent_Delivery = roundToInt(c_ownedGridConnections.get(v_currentSelectedGCnr).v_liveConnectionMetaData.contractedDeliveryCapacity_kW);
+int GCContractCapacityCurrent_Delivery = roundToInt(p_gridConnection.v_liveConnectionMetaData.contractedDeliveryCapacity_kW);
 
 //Find the current Connection capacity (feedin)
-int GCContractCapacityCurrent_Feedin = roundToInt(c_ownedGridConnections.get(v_currentSelectedGCnr).v_liveConnectionMetaData.contractedFeedinCapacity_kW);
+int GCContractCapacityCurrent_Feedin = roundToInt(p_gridConnection.v_liveConnectionMetaData.contractedFeedinCapacity_kW);
 
 //Set the nfato values
 f_getNFATOValues();
 
 //Find the current battery capacity
 int BatteryCapacityCurrent = 0;
-J_EAStorage batteryAsset = findFirst(c_ownedGridConnections.get(v_currentSelectedGCnr).c_storageAssets, p -> p.energyAssetType == OL_EnergyAssetType.STORAGE_ELECTRIC );
+J_EAStorage batteryAsset = findFirst(p_gridConnection.c_storageAssets, p -> p.energyAssetType == OL_EnergyAssetType.STORAGE_ELECTRIC );
 if (batteryAsset != null){
 	BatteryCapacityCurrent = roundToInt(((J_EAStorageElectric)batteryAsset).getStorageCapacity_kWh());
 }
 
 //Find the current PV capacity
 int PVCapacityCurrent = 0;
-if (c_ownedGridConnections.get(v_currentSelectedGCnr).v_liveAssetsMetaData.activeAssetFlows.contains(OL_AssetFlowCategories.pvProductionElectric_kW)){
-	J_EAProduction pvAsset = findFirst(c_ownedGridConnections.get(v_currentSelectedGCnr).c_productionAssets, p -> p.energyAssetType == OL_EnergyAssetType.PHOTOVOLTAIC );
+if (p_gridConnection.v_liveAssetsMetaData.activeAssetFlows.contains(OL_AssetFlowCategories.pvProductionElectric_kW)){
+	J_EAProduction pvAsset = findFirst(p_gridConnection.c_productionAssets, p -> p.energyAssetType == OL_EnergyAssetType.PHOTOVOLTAIC );
 	PVCapacityCurrent = roundToInt(pvAsset.getCapacityElectric_kW());
 }
 
 //Find the current curtailment setting
-boolean currentCurtailmentSetting = c_ownedGridConnections.get(v_currentSelectedGCnr).v_enableCurtailment;
+boolean currentCurtailmentSetting = p_gridConnection.v_enableCurtailment;
 
 //Find the current transport savings
 int currentTransportSavings = 0;
-if (c_ownedGridConnections.get(v_currentSelectedGCnr).c_tripTrackers.size() > 0){
-	currentTransportSavings = - roundToInt(c_ownedGridConnections.get(v_currentSelectedGCnr).c_tripTrackers.get(0).getDistanceScaling_fr()*100) + 100;
+if (p_gridConnection.c_tripTrackers.size() > 0){
+	currentTransportSavings = - roundToInt(p_gridConnection.c_tripTrackers.get(0).getDistanceScaling_fr()*100) + 100;
 }
 
 
 //Find the current number of vehicles for each type
-int nbEcarsCurrent = count(c_ownedGridConnections.get(v_currentSelectedGCnr).c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VEHICLE);
-int nbHydrogencarsCurrent = count(c_ownedGridConnections.get(v_currentSelectedGCnr).c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.HYDROGEN_VEHICLE);
-int nbDieselcarsCurrent = count(c_ownedGridConnections.get(v_currentSelectedGCnr).c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.DIESEL_VEHICLE);
+int nbEcarsCurrent = count(p_gridConnection.c_electricVehicles, p->p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VEHICLE);
+int nbHydrogencarsCurrent = count(p_gridConnection.c_hydrogenVehicles, p->p.energyAssetType == OL_EnergyAssetType.HYDROGEN_VEHICLE);
+int nbDieselcarsCurrent = count(p_gridConnection.c_dieselVehicles, p->p.energyAssetType == OL_EnergyAssetType.DIESEL_VEHICLE);
 
-int nbEvansCurrent = count(c_ownedGridConnections.get(v_currentSelectedGCnr).c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VAN);
-int nbHydrogenvansCurrent = count(c_ownedGridConnections.get(v_currentSelectedGCnr).c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.HYDROGEN_VAN);
-int nbDieselvansCurrent = count(c_ownedGridConnections.get(v_currentSelectedGCnr).c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.DIESEL_VAN);
+int nbEvansCurrent = count(p_gridConnection.c_electricVehicles, p->p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VAN);
+int nbHydrogenvansCurrent = count(p_gridConnection.c_hydrogenVehicles, p->p.energyAssetType == OL_EnergyAssetType.HYDROGEN_VAN);
+int nbDieselvansCurrent = count(p_gridConnection.c_dieselVehicles, p->p.energyAssetType == OL_EnergyAssetType.DIESEL_VAN);
 
-int nbEtrucksCurrent = count(c_ownedGridConnections.get(v_currentSelectedGCnr).c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.ELECTRIC_TRUCK);
-int nbHydrogentrucksCurrent = count(c_ownedGridConnections.get(v_currentSelectedGCnr).c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.HYDROGEN_TRUCK);
-int nbDieseltrucksCurrent = count(c_ownedGridConnections.get(v_currentSelectedGCnr).c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK);
+int nbEtrucksCurrent = count(p_gridConnection.c_electricVehicles, p->p.energyAssetType == OL_EnergyAssetType.ELECTRIC_TRUCK);
+int nbHydrogentrucksCurrent = count(p_gridConnection.c_hydrogenVehicles, p->p.energyAssetType == OL_EnergyAssetType.HYDROGEN_TRUCK);
+int nbDieseltrucksCurrent = count(p_gridConnection.c_dieselVehicles, p->p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK);
 
 //Check on electric cars, cause for companies that have quarterlyhour electricity data, the initial ea for EV (and other electric appliances) are not made.
-if (c_ownedGridConnections.get(v_currentSelectedGCnr).v_hasQuarterHourlyValues){
+if (p_gridConnection.v_hasQuarterHourlyValues){
 	
 	nbEcarsCurrent += v_minEVCarSlider;
 	nbEvansCurrent += v_minEVVanSlider;
@@ -1728,30 +1743,21 @@ else if(setAmountOfVehicles < local_HydrogenV_nb){ // Slider has decreased the a
 v_nbDieselTrucks = nbDieseltrucksCurrent;
 
 //Add nfato again
-c_ownedGridConnections.get(v_currentSelectedGCnr).f_nfatoSetConnectionCapacity(false);
-
-
+p_gridConnection.f_nfatoSetConnectionCapacity(false);
 /*ALCODEEND*/}
 
-double f_setSelectedGCGraphs()
+double f_selectGCOnMainInterface()
 {/*ALCODESTART::1725439635605*/
-//Set the graphs to the correct GC
-zero_Interface.v_previousClickedObjectType = OL_GISObjectType.BUILDING;
-zero_Interface.c_selectedGridConnections.clear();
-zero_Interface.f_deselectPreviousSelect( );
-zero_Interface.f_selectBuilding(c_ownedGridConnections.get(v_currentSelectedGCnr).c_connectedGISObjects.get(0), c_ownedGridConnections.get(v_currentSelectedGCnr).c_connectedGISObjects);
-f_updateUIResultsCompanyUI();
-if(c_ownedGridConnections.get(v_currentSelectedGCnr).v_rapidRunData != null){
-	uI_Results.f_setAllCharts();
+//Select the newly selected GC also on the main interface (if not paused)
+zero_Interface.f_clearSelectionAndSelectEnergyModel();
+
+if(p_gridConnection.v_isActive){
+	zero_Interface.f_selectBuilding(p_gridConnection.c_connectedGISObjects.get(0), p_gridConnection.c_connectedGISObjects);
 }
 /*ALCODEEND*/}
 
 double f_setSimulateYearScreen()
 {/*ALCODESTART::1725607045331*/
-gr_simulateYearScreen.setVisible(true);
-
-
-
 if(!b_runningMainInterfaceScenarioSettings && !b_runningMainInterfaceSlider){
 	//Update main interface sliders according to the companyUI changes 
 	zero_Interface.f_updateMainInterfaceSliders();
@@ -1770,13 +1776,13 @@ else if(setAmountOfVehicles < local_HydrogenV_nb){ // Slider has decreased the a
 sl_GCCapacityCompany.setRange(0, 100000);
 
 //Get current grid capacity
-double defaultGCCapacitySlider = c_scenarioSettings_Current.get(v_currentSelectedGCnr).getCurrentContractDeliveryCapacity_kW();
+double defaultGCCapacitySlider = p_scenarioSettings_Current.getCurrentContractDeliveryCapacity_kW();
 
 //Get future grid capacity
-double futureGCCapacity_delivery_kW = c_scenarioSettings_Future.get(v_currentSelectedGCnr).getRequestedContractDeliveryCapacity_kW();
+double futureGCCapacity_delivery_kW = p_scenarioSettings_Future.getRequestedContractDeliveryCapacity_kW();
 
 //Get current physical capacity
-v_physicalConnectionCapacity_kW = c_scenarioSettings_Current.get(v_currentSelectedGCnr).getCurrentPhysicalConnectionCapacity_kW();
+v_physicalConnectionCapacity_kW = p_scenarioSettings_Current.getCurrentPhysicalConnectionCapacity_kW();
 
 //Set range specific for specific intervals of capacity
 v_minGCCapacitySlider = 0;
@@ -1829,7 +1835,7 @@ else if(futureGCCapacity_delivery_kW < 15000 && defaultGCCapacitySlider < 15000)
 sl_GCCapacityCompany_Feedin.setRange(0, 100000);
 
 //Get current grid capacity
-double defaultGCCapacitySlider_Feedin = c_scenarioSettings_Current.get(v_currentSelectedGCnr).getCurrentContractFeedinCapacity_kW();
+double defaultGCCapacitySlider_Feedin = p_scenarioSettings_Current.getCurrentContractFeedinCapacity_kW();
 
 //Set range specific for specific intervals of capacity
 v_minGCCapacitySlider_Feedin = 0;
@@ -1858,9 +1864,9 @@ else if(defaultGCCapacitySlider_Feedin < 15000){
 
 double f_getNFATOValues()
 {/*ALCODESTART::1727884380899*/
-v_NFATO_active = c_ownedGridConnections.get(v_currentSelectedGCnr).v_enableNFato;
-v_NFATO_kW_delivery = c_ownedGridConnections.get(v_currentSelectedGCnr).v_liveConnectionMetaData.contractedDeliveryCapacity_kW - v_defaultGCCapacitySlider;
-v_NFATO_kW_feedin = c_ownedGridConnections.get(v_currentSelectedGCnr).v_liveConnectionMetaData.contractedFeedinCapacity_kW- v_defaultGCCapacitySlider_Feedin;
+v_NFATO_active = p_gridConnection.v_enableNFato;
+v_NFATO_kW_delivery = p_gridConnection.v_liveConnectionMetaData.contractedDeliveryCapacity_kW - v_defaultGCCapacitySlider;
+v_NFATO_kW_feedin = p_gridConnection.v_liveConnectionMetaData.contractedFeedinCapacity_kW- v_defaultGCCapacitySlider_Feedin;
 
 if(v_NFATO_kW_delivery > 0){
 	t_GCCapacityCompany_delivery_nfato.setColor(green);
@@ -1910,8 +1916,10 @@ else if(v_NFATO_kW_feedin < 0){
 sl_hydrogenTrucksCompany.setEnabled(enable);
 sl_dieselTrucksCompany.setEnabled(enable);
 
-//Set heating rb to correct setting (no matter what input of this function is)
-f_setHeatingRB();
+// Disabled / Invisible heating based on current scenario settings
+if (enable) {
+	f_setHeatingRB();
+}
 /*ALCODEEND*/}
 
 double f_setErrorScreen(String errorMessage)
@@ -1951,3 +1959,14 @@ else if(v_NFATO_kW_feedin < 0){
 sl_mobilityDemandCompanyReduction.setRange(v_minSavingsSliders, v_maxSavingsSliders);
 /*ALCODEEND*/}
 
+double f_selectDifferentOwnedGC(int selectedOwnedGCIndex)
+{/*ALCODESTART::1760976810989*/
+//Set companyUI to the new GC
+f_setCompanyUI(p_gridConnection.p_owner.f_getOwnedGridConnections().get(selectedOwnedGCIndex));
+
+//Select the gc on the main interface (map) aswell
+f_selectGCOnMainInterface();
+
+
+/*ALCODEEND*/}
+
diff --git a/_alp/Agents/UI_company/Code/Functions.xml b/_alp/Agents/UI_company/Code/Functions.xml
index b1624781..55389a89 100644
--- a/_alp/Agents/UI_company/Code/Functions.xml
+++ b/_alp/Agents/UI_company/Code/Functions.xml
@@ -14,10 +14,6 @@
 		<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="public" StaticFunction="false">
@@ -54,10 +50,6 @@
 		<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">
@@ -167,7 +159,7 @@
 		<Name><![CDATA[f_setSliderPresets]]></Name>
 		<Description><![CDATA[Set Slider presets (limits, start value, text) for private company sliders]]></Description>
 		<X>-1090</X>
-		<Y>170</Y>
+		<Y>190</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -181,9 +173,9 @@
 		<ReturnModificator>VOID</ReturnModificator>
 		<ReturnType>double</ReturnType>
 		<Id>1713961813474</Id>
-		<Name><![CDATA[f_setComboBoxGC]]></Name>
+		<Name><![CDATA[f_setComboBoxOwnedGC]]></Name>
 		<X>-1070</X>
-		<Y>60</Y>
+		<Y>100</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -199,7 +191,7 @@
 		<Id>1714139629738</Id>
 		<Name><![CDATA[f_setPVSliderPresets]]></Name>
 		<X>-1070</X>
-		<Y>390</Y>
+		<Y>410</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -215,7 +207,7 @@
 		<Id>1714139648227</Id>
 		<Name><![CDATA[f_setBatSliderPresets]]></Name>
 		<X>-1070</X>
-		<Y>470</Y>
+		<Y>490</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -231,7 +223,7 @@
 		<Id>1714139684603</Id>
 		<Name><![CDATA[f_setVehicleSliderPresets]]></Name>
 		<X>-1070</X>
-		<Y>550</Y>
+		<Y>570</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -247,7 +239,7 @@
 		<Id>1714140108358</Id>
 		<Name><![CDATA[f_setCarSliderPresets]]></Name>
 		<X>-1060</X>
-		<Y>570</Y>
+		<Y>590</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -263,7 +255,7 @@
 		<Id>1714140134819</Id>
 		<Name><![CDATA[f_setVanSliderPresets]]></Name>
 		<X>-1060</X>
-		<Y>770</Y>
+		<Y>790</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -279,7 +271,7 @@
 		<Id>1714140156233</Id>
 		<Name><![CDATA[f_setTruckSliderPresets]]></Name>
 		<X>-1060</X>
-		<Y>970</Y>
+		<Y>990</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -414,8 +406,8 @@
 		<ReturnType>double</ReturnType>
 		<Id>1714654645264</Id>
 		<Name><![CDATA[f_setResultsUIPresets]]></Name>
-		<X>-1070</X>
-		<Y>80</Y>
+		<X>-1050</X>
+		<Y>1350</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -429,7 +421,7 @@
 		<ReturnModificator>VOID</ReturnModificator>
 		<ReturnType>double</ReturnType>
 		<Id>1714655282643</Id>
-		<Name><![CDATA[f_initializeCompanyUI]]></Name>
+		<Name><![CDATA[f_setCompanyUI]]></Name>
 		<X>-1090</X>
 		<Y>40</Y>
 		<Label>
@@ -439,6 +431,10 @@
 		<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">
@@ -447,7 +443,7 @@
 		<Id>1714656835269</Id>
 		<Name><![CDATA[f_updateUIResultsCompanyUI]]></Name>
 		<X>-1050</X>
-		<Y>1350</Y>
+		<Y>1370</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -463,7 +459,7 @@
 		<Id>1715713362876</Id>
 		<Name><![CDATA[f_setHeatingRB]]></Name>
 		<X>-1070</X>
-		<Y>190</Y>
+		<Y>210</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -501,30 +497,13 @@
 		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
-	<Function AccessType="default" StaticFunction="false">
-		<ReturnModificator>VOID</ReturnModificator>
-		<ReturnType>double</ReturnType>
-		<Id>1717576974529</Id>
-		<Name><![CDATA[f_setSelectedGC]]></Name>
-		<Description><![CDATA[Function that sets the sliders to match the currently present settings of the energy assets owned by the selected GC. Used when a connection owner has multiple grid connections, and wants to set the sliders of a different GC. ]]></Description>
-		<X>-430</X>
-		<Y>280</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Body xmlns:al="http://anylogic.com"/>
-	</Function>
 	<Function AccessType="default" StaticFunction="false">
 		<ReturnModificator>VOID</ReturnModificator>
 		<ReturnType>double</ReturnType>
 		<Id>1725439625846</Id>
 		<Name><![CDATA[f_setSelectedGCSliders]]></Name>
-		<X>-400</X>
-		<Y>300</Y>
+		<X>-1070</X>
+		<Y>80</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -538,9 +517,9 @@
 		<ReturnModificator>VOID</ReturnModificator>
 		<ReturnType>double</ReturnType>
 		<Id>1725439635605</Id>
-		<Name><![CDATA[f_setSelectedGCGraphs]]></Name>
-		<X>-400</X>
-		<Y>320</Y>
+		<Name><![CDATA[f_selectGCOnMainInterface]]></Name>
+		<X>-410</X>
+		<Y>300</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -556,7 +535,7 @@
 		<Id>1725607045331</Id>
 		<Name><![CDATA[f_setSimulateYearScreen]]></Name>
 		<X>-430</X>
-		<Y>680</Y>
+		<Y>830</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -572,7 +551,7 @@
 		<Id>1725614403909</Id>
 		<Name><![CDATA[f_setGCCapacitySliderPresets]]></Name>
 		<X>-1070</X>
-		<Y>210</Y>
+		<Y>230</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -588,7 +567,7 @@
 		<Id>1727712593952</Id>
 		<Name><![CDATA[f_setNameTextSize]]></Name>
 		<X>-1070</X>
-		<Y>100</Y>
+		<Y>60</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -604,7 +583,7 @@
 		<Id>1727798399503</Id>
 		<Name><![CDATA[f_setGCCapacitySliderPresets_Feedin]]></Name>
 		<X>-1070</X>
-		<Y>310</Y>
+		<Y>330</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -619,8 +598,8 @@
 		<ReturnType>double</ReturnType>
 		<Id>1727884380899</Id>
 		<Name><![CDATA[f_getNFATOValues]]></Name>
-		<X>-440</X>
-		<Y>765</Y>
+		<X>-430</X>
+		<Y>705</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -676,7 +655,7 @@
 		<Id>1756898097088</Id>
 		<Name><![CDATA[f_setDemandReductionSliderPresets]]></Name>
 		<X>-1060</X>
-		<Y>1220</Y>
+		<Y>1240</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -686,4 +665,24 @@
 		<ShowLabel>true</ShowLabel>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1760976810989</Id>
+		<Name><![CDATA[f_selectDifferentOwnedGC]]></Name>
+		<X>-430</X>
+		<Y>280</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[selectedOwnedGCIndex]]></Name>
+			<Type><![CDATA[int]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
 </Functions>
diff --git a/_alp/Agents/UI_company/Levels/Level.level.xml b/_alp/Agents/UI_company/Levels/Level.level.xml
index 7476cfa4..87da0d8a 100644
--- a/_alp/Agents/UI_company/Levels/Level.level.xml
+++ b/_alp/Agents/UI_company/Levels/Level.level.xml
@@ -169,9 +169,9 @@
 	</Text>
 	<Text>
 		<Id>1709571615104</Id>
-		<Name><![CDATA[text5]]></Name>
+		<Name><![CDATA[txt_storedScenarios]]></Name>
 		<X>-750</X>
-		<Y>180</Y>
+		<Y>110</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -184,7 +184,7 @@
 		<Z>0</Z>
 		<Rotation>0.0</Rotation>
 		<Color>-16777216</Color>
-		<Text><![CDATA[Connections]]></Text>
+		<Text><![CDATA[Scenarios]]></Text>
 		<Font>
 			<Name><![CDATA[SansSerif]]></Name>
 			<Size>12</Size>
@@ -210,7 +210,7 @@
 			<EmbeddedIcon>false</EmbeddedIcon>
 			<TextColor>-16777216</TextColor>
 			<Enabled>true</Enabled>
-			<ActionCode>c_ownedGridConnections.get(v_currentSelectedGCnr).va_gridConnection.navigateTo();</ActionCode>
+			<ActionCode>p_gridConnection.va_gridConnection.navigateTo();</ActionCode>
 		</BasicProperties>
 		<ExtendedProperties>
 			<Font Name="Dialog" Size="11" Style="0"/>
@@ -252,7 +252,7 @@
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<TextColor>-16777216</TextColor>
 					<Enabled>true</Enabled>
-					<ActionCode>if (c_scenarioSettings_Current.size() &gt; 0 &amp;&amp; c_scenarioSettings_Future.size() &gt; 0){
+					<ActionCode>if (p_scenarioSettings_Current != null &amp;&amp; p_scenarioSettings_Future != null){
 	f_setScenario(rb_scenariosPrivateUI.getValue());
 }
 
@@ -325,7 +325,7 @@ zero_Interface.f_resetSettings();</ActionCode>
 		<Id>1713957149840</Id>
 		<Name><![CDATA[txt_sliderPresetsAndLimits]]></Name>
 		<X>-1100</X>
-		<Y>140</Y>
+		<Y>160</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -389,7 +389,7 @@ zero_Interface.f_resetSettings();</ActionCode>
 			<EmbeddedIcon>false</EmbeddedIcon>
 			<TextColor>-16777216</TextColor>
 			<Enabled>true</Enabled>
-			<ActionCode>((GIS_Building)c_ownedBuildings.get(0)).va_building.navigateTo();</ActionCode>
+			<ActionCode>((GIS_Building)p_gridConnection.c_connectedGISObjects.get(0)).va_building.navigateTo();</ActionCode>
 		</BasicProperties>
 		<ExtendedProperties>
 			<Font Name="Dialog" Size="11" Style="0"/>
@@ -414,7 +414,7 @@ zero_Interface.f_resetSettings();</ActionCode>
 			<EmbeddedIcon>false</EmbeddedIcon>
 			<TextColor>-16777216</TextColor>
 			<Enabled>true</Enabled>
-			<ActionCode>p_company.va_ConnectionOwner.navigateTo();</ActionCode>
+			<ActionCode>p_gridConnection.p_owner.va_ConnectionOwner.navigateTo();</ActionCode>
 		</BasicProperties>
 		<ExtendedProperties>
 			<Font Name="Dialog" Size="11" Style="0"/>
@@ -423,7 +423,7 @@ zero_Interface.f_resetSettings();</ActionCode>
 	</Control>
 	<Text>
 		<Id>1714655090415</Id>
-		<Name><![CDATA[txt_onStartup]]></Name>
+		<Name><![CDATA[txt_initialization]]></Name>
 		<X>-1100</X>
 		<Y>10</Y>
 		<Label>
@@ -438,7 +438,7 @@ zero_Interface.f_resetSettings();</ActionCode>
 		<Z>0</Z>
 		<Rotation>0.0</Rotation>
 		<Color>-16777216</Color>
-		<Text><![CDATA[On Startup settings]]></Text>
+		<Text><![CDATA[Initialization]]></Text>
 		<Font>
 			<Name><![CDATA[SansSerif]]></Name>
 			<Size>12</Size>
@@ -556,7 +556,7 @@ zero_Interface.f_resetSettings();</ActionCode>
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setGCCapacity(c_ownedGridConnections.get(v_currentSelectedGCnr), sl_GCCapacityCompany.getValue(), "DELIVERY");
+					<ActionCode>f_setGCCapacity(p_gridConnection, sl_GCCapacityCompany.getValue(), "DELIVERY");
 
 //Set scenario to custom
 f_setScenario(2);
@@ -635,7 +635,7 @@ f_setSimulateYearScreen();</ActionCode>
 							<ActionCode>double newHeatDemandReduction_pct = sl_heatDemandCompanyReduction.getValue();
 double consumptionScaling_fr = 1  - newHeatDemandReduction_pct/100;
 
-for (J_EA j_ea : c_ownedGridConnections.get(v_currentSelectedGCnr).c_energyAssets){
+for (J_EA j_ea : p_gridConnection.c_energyAssets){
 	if (j_ea instanceof J_EAConsumption) {
 		if (j_ea.energyAssetType == OL_EnergyAssetType.HEAT_DEMAND) {
 			((J_EAConsumption)j_ea).setConsumptionScaling_fr(consumptionScaling_fr);
@@ -813,7 +813,7 @@ f_setSimulateYearScreen();</ActionCode>
 					<ActionCode>double newElectricityDemandReduction_pct = sl_electricityDemandCompanyReduction.getValue();
 double consumptionScaling_fr = 1  - newElectricityDemandReduction_pct/100;
 
-for (J_EA j_ea : c_ownedGridConnections.get(v_currentSelectedGCnr).c_energyAssets) {
+for (J_EA j_ea : p_gridConnection.c_energyAssets) {
 	if (j_ea instanceof J_EAConsumption) {
 		if (j_ea.energyAssetType == OL_EnergyAssetType.ELECTRICITY_DEMAND) {
 			((J_EAConsumption)j_ea).setConsumptionScaling_fr(consumptionScaling_fr);
@@ -902,7 +902,7 @@ f_setSimulateYearScreen();
 							<EmbeddedIcon>false</EmbeddedIcon>
 							<Enabled>true</Enabled>
 							<ActionCode>//Slider function
-f_setElectricVehicleSliders(c_ownedGridConnections.get(v_currentSelectedGCnr), OL_EnergyAssetType.ELECTRIC_VAN, (int)sl_electricVansCompany.getValue());
+f_setElectricVehicleSliders(p_gridConnection, OL_EnergyAssetType.ELECTRIC_VAN, (int)sl_electricVansCompany.getValue());
 
 //Update the other two sliders aswell
 sl_hydrogenVansCompany.setValue(v_nbHydrogenVans, false);
@@ -993,7 +993,7 @@ f_setSimulateYearScreen();</ActionCode>
 							<EmbeddedIcon>false</EmbeddedIcon>
 							<Enabled>true</Enabled>
 							<ActionCode>//Slider function
-f_setHydrogenVehicleSliders(c_ownedGridConnections.get(v_currentSelectedGCnr), OL_EnergyAssetType.HYDROGEN_VAN, (int)sl_hydrogenVansCompany.getValue());
+f_setHydrogenVehicleSliders(p_gridConnection, OL_EnergyAssetType.HYDROGEN_VAN, (int)sl_hydrogenVansCompany.getValue());
 
 //Update the other two sliders aswell
 sl_electricVansCompany.setValue(v_nbEVVans, false);
@@ -1084,7 +1084,7 @@ f_setSimulateYearScreen();</ActionCode>
 							<EmbeddedIcon>false</EmbeddedIcon>
 							<Enabled>true</Enabled>
 							<ActionCode>//Slider function
-f_setDieselVehicleSliders(c_ownedGridConnections.get(v_currentSelectedGCnr), OL_EnergyAssetType.DIESEL_VAN, (int)sl_dieselVansCompany.getValue());
+f_setDieselVehicleSliders(p_gridConnection, OL_EnergyAssetType.DIESEL_VAN, (int)sl_dieselVansCompany.getValue());
 
 //Update the other two sliders aswell
 sl_electricVansCompany.setValue(v_nbEVVans, false);
@@ -1352,7 +1352,7 @@ f_setSimulateYearScreen();</ActionCode>
 							<EmbeddedIcon>false</EmbeddedIcon>
 							<Enabled>true</Enabled>
 							<ActionCode>//Slider function
-f_setHydrogenVehicleSliders(c_ownedGridConnections.get(v_currentSelectedGCnr), OL_EnergyAssetType.HYDROGEN_TRUCK, (int)sl_hydrogenTrucksCompany.getValue());
+f_setHydrogenVehicleSliders(p_gridConnection, OL_EnergyAssetType.HYDROGEN_TRUCK, (int)sl_hydrogenTrucksCompany.getValue());
 
 //Update the other two sliders aswell
 sl_electricTrucksCompany.setValue(v_nbEVTrucks, false);
@@ -1418,7 +1418,7 @@ f_setSimulateYearScreen();</ActionCode>
 							<EmbeddedIcon>false</EmbeddedIcon>
 							<Enabled>true</Enabled>
 							<ActionCode>//Slider function
-f_setElectricVehicleSliders(c_ownedGridConnections.get(v_currentSelectedGCnr), OL_EnergyAssetType.ELECTRIC_TRUCK, (int)sl_electricTrucksCompany.getValue());
+f_setElectricVehicleSliders(p_gridConnection, OL_EnergyAssetType.ELECTRIC_TRUCK, (int)sl_electricTrucksCompany.getValue());
 
 //Update the other two sliders aswell
 sl_hydrogenTrucksCompany.setValue(v_nbHydrogenTrucks, false);
@@ -1458,7 +1458,7 @@ f_setSimulateYearScreen();</ActionCode>
 							<EmbeddedIcon>false</EmbeddedIcon>
 							<Enabled>true</Enabled>
 							<ActionCode>//Slider function
-f_setDieselVehicleSliders(c_ownedGridConnections.get(v_currentSelectedGCnr), OL_EnergyAssetType.DIESEL_TRUCK, (int)sl_dieselTrucksCompany.getValue());
+f_setDieselVehicleSliders(p_gridConnection, OL_EnergyAssetType.DIESEL_TRUCK, (int)sl_dieselTrucksCompany.getValue());
 
 //Update the other two sliders aswell
 sl_electricTrucksCompany.setValue(v_nbEVTrucks, false);
@@ -1498,7 +1498,7 @@ f_setSimulateYearScreen();</ActionCode>
 							<EmbeddedIcon>false</EmbeddedIcon>
 							<Enabled>true</Enabled>
 							<ActionCode>//Slider function
-f_setElectricVehicleSliders(c_ownedGridConnections.get(v_currentSelectedGCnr), OL_EnergyAssetType.ELECTRIC_VEHICLE, (int)sl_electricCarsCompany.getValue());
+f_setElectricVehicleSliders(p_gridConnection, OL_EnergyAssetType.ELECTRIC_VEHICLE, (int)sl_electricCarsCompany.getValue());
 
 //Update the other two sliders aswell
 sl_hydrogenCarsCompany.setValue(v_nbHydrogenCars, false);
@@ -1613,7 +1613,7 @@ f_setSimulateYearScreen();</ActionCode>
 						<BasicProperties Width="100" Height="30">
 							<EmbeddedIcon>false</EmbeddedIcon>
 							<Enabled>true</Enabled>
-							<ActionCode>c_ownedGridConnections.get(v_currentSelectedGCnr).c_tripTrackers.forEach(tt -&gt; tt.distanceScaling_fr = 1-sl_mobilityDemandCompanyReduction.getValue()/100);
+							<ActionCode>p_gridConnection.c_tripTrackers.forEach(tt -&gt; tt.distanceScaling_fr = 1-sl_mobilityDemandCompanyReduction.getValue()/100);
 
 //Set scenario to custom
 f_setScenario(2);
@@ -1674,7 +1674,7 @@ f_setSimulateYearScreen();</ActionCode>
 							<EmbeddedIcon>false</EmbeddedIcon>
 							<Enabled>true</Enabled>
 							<ActionCode>//Slider function
-f_setHydrogenVehicleSliders(c_ownedGridConnections.get(v_currentSelectedGCnr), OL_EnergyAssetType.HYDROGEN_VEHICLE, (int)sl_hydrogenCarsCompany.getValue());
+f_setHydrogenVehicleSliders(p_gridConnection, OL_EnergyAssetType.HYDROGEN_VEHICLE, (int)sl_hydrogenCarsCompany.getValue());
 
 //Update the other two sliders aswell
 sl_electricCarsCompany.setValue(v_nbEVCars, false);
@@ -1765,7 +1765,7 @@ f_setSimulateYearScreen();</ActionCode>
 							<EmbeddedIcon>false</EmbeddedIcon>
 							<Enabled>true</Enabled>
 							<ActionCode>//Slider function
-f_setDieselVehicleSliders(c_ownedGridConnections.get(v_currentSelectedGCnr), OL_EnergyAssetType.DIESEL_VEHICLE, (int)sl_dieselCarsCompany.getValue());
+f_setDieselVehicleSliders(p_gridConnection, OL_EnergyAssetType.DIESEL_VEHICLE, (int)sl_dieselCarsCompany.getValue());
 
 //Update the other two sliders aswell
 sl_electricCarsCompany.setValue(v_nbEVCars, false);
@@ -1878,7 +1878,6 @@ f_setSimulateYearScreen();</ActionCode>
 				<PresentationFlag>true</PresentationFlag>
 				<ShowLabel>false</ShowLabel>
 				<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
-				<VisibleCode>c_ownedGridConnections.size()&gt;1 &amp;&amp; c_ownedGridConnections.get(0).v_isActive &amp;&amp; c_ownedGridConnections.get(1).v_isActive</VisibleCode>
 				<EmbeddedIcon>false</EmbeddedIcon>
 				<Z>0</Z>
 				<Rotation>0.0</Rotation>
@@ -1886,9 +1885,9 @@ f_setSimulateYearScreen();</ActionCode>
 					<Control Type="ComboBox">
 						<EmbeddedIcon>false</EmbeddedIcon>
 						<Id>1713544148158</Id>
-						<Name><![CDATA[GCnr_selection]]></Name>
-						<X>50</X>
-						<Y>-10</Y>
+						<Name><![CDATA[cb_selectGC]]></Name>
+						<X>-84</X>
+						<Y>-13</Y>
 						<Label>
 							<X>0</X>
 							<Y>-10</Y>
@@ -1897,29 +1896,26 @@ f_setSimulateYearScreen();</ActionCode>
 						<PresentationFlag>true</PresentationFlag>
 						<ShowLabel>false</ShowLabel>
 						<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
-						<BasicProperties Width="50" Height="20">
+						<BasicProperties Width="190" Height="20">
 							<EmbeddedIcon>false</EmbeddedIcon>
 							<FillColor>-1</FillColor>
 							<TextColor>-16777216</TextColor>
 							<Enabled>true</Enabled>
-							<ActionCode>if(c_ownedGridConnections.size()&gt;1){
-	f_setSelectedGC();
-}</ActionCode>
+							<ActionCode>f_selectDifferentOwnedGC(cb_selectGC.getValueIndex());</ActionCode>
 						</BasicProperties>
 						<ExtendedProperties>
 							<Font Name="Dialog" Size="11" Style="0"/>
 							<Editable>false</Editable>
 							<Button>0</Button>
 							<Button>1</Button>
-							<LinkTo>true</LinkTo>
-							<Link>v_currentSelectedGCnr</Link>
+							<LinkTo>false</LinkTo>
 						</ExtendedProperties>
 					</Control>
 					<Text>
 						<Id>1713547027389</Id>
 						<Name><![CDATA[text9]]></Name>
-						<X>-119</X>
-						<Y>-8</Y>
+						<X>-240</X>
+						<Y>-10</Y>
 						<Label>
 							<X>0</X>
 							<Y>-10</Y>
@@ -1960,7 +1956,7 @@ f_setSimulateYearScreen();</ActionCode>
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
 					<ActionCode>//traceln("Slider werkt nog niet volledig!!, batterij sturing werkt nog niet goed");
-f_setBattery(c_ownedGridConnections.get(v_currentSelectedGCnr), sl_batteryCompany.getValue());
+f_setBattery(p_gridConnection, sl_batteryCompany.getValue());
 
 //Set scenario to custom
 f_setScenario(2);
@@ -2287,27 +2283,28 @@ OL_GridConnectionHeatingType selectedHeatingType;
 switch (rb_heatingTypePrivateUI.getValue()){
 	case 0:
 		selectedHeatingType = OL_GridConnectionHeatingType.GAS_BURNER;
-	break;
+		break;
 	case 1:
 		selectedHeatingType = OL_GridConnectionHeatingType.HYBRID_HEATPUMP;
-	break;
+		break;
 	case 2:
 		selectedHeatingType = OL_GridConnectionHeatingType.ELECTRIC_HEATPUMP;
-	break;
+		break;
 	case 3:
 		selectedHeatingType = OL_GridConnectionHeatingType.DISTRICTHEAT;
-		//selectedHeatingType = OL_GridConnectionHeatingType.HYDROGENBURNER;
-	break;
+		break;
 	case 4:
-		selectedHeatingType = OL_GridConnectionHeatingType.GAS_CHP;
-	break;
+		selectedHeatingType = OL_GridConnectionHeatingType.CUSTOM;
+		f_setErrorScreen("De 'custom' verwarming optie wordt alleen gebruikt ter visualisatie voor bedrijven die starten met een 'custom' warmte systeem. In plaats van 'custom' is de knop nu gezet op 'HR ketel aardgas'.");
+		rb_heatingTypePrivateUI.setValue(0);
+		return;
 	default:
 		selectedHeatingType = OL_GridConnectionHeatingType.NONE;
 }
 
 
 //Radio button function
-f_setHeatingType(c_ownedGridConnections.get(v_currentSelectedGCnr), selectedHeatingType);
+f_setHeatingType(p_gridConnection, selectedHeatingType);
 
 //Set scenario to custom
 f_setScenario(2);
@@ -2323,7 +2320,7 @@ f_setSimulateYearScreen();</ActionCode>
 					<Button>Hybride warmtepomp</Button>
 					<Button>Elek. warmtepomp</Button>
 					<Button>Warmtenet</Button>
-					<Button>Gas WKK</Button>
+					<Button>Custom</Button>
 					<LinkTo>false</LinkTo>
 				</ExtendedProperties>
 			</Control>
@@ -2370,7 +2367,7 @@ f_setSimulateYearScreen();</ActionCode>
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setPVSystem(c_ownedGridConnections.get(v_currentSelectedGCnr), sl_rooftopPVCompany.getValue());
+					<ActionCode>f_setPVSystem(p_gridConnection, sl_rooftopPVCompany.getValue());
 
 //Set scenario to custom
 f_setScenario(2);
@@ -2455,7 +2452,7 @@ f_setSimulateYearScreen();</ActionCode>
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setGCCapacity(c_ownedGridConnections.get(v_currentSelectedGCnr), sl_GCCapacityCompany_Feedin.getValue(), "FEEDIN");
+					<ActionCode>f_setGCCapacity(p_gridConnection, sl_GCCapacityCompany_Feedin.getValue(), "FEEDIN");
 
 //Set scenario to custom
 f_setScenario(2);
@@ -2528,31 +2525,6 @@ zero_Interface.v_currentViewArea = zero_Interface.va_Interface;
 			<LabelText>Terug naar hoofdscherm</LabelText>
 		</ExtendedProperties>
 	</Control>
-	<Text>
-		<Id>1717514421993</Id>
-		<Name><![CDATA[txt_setSlidersToSelectedGC]]></Name>
-		<X>-440</X>
-		<Y>230</Y>
-		<Label>
-			<X>0</X>
-			<Y>-10</Y>
-		</Label>
-		<PublicFlag>true</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>false</ShowLabel>
-		<DrawMode>SHAPE_DRAW_2D</DrawMode>
-		<EmbeddedIcon>false</EmbeddedIcon>
-		<Z>0</Z>
-		<Rotation>0.0</Rotation>
-		<Color>-16777216</Color>
-		<Text><![CDATA[Set Sliders to selected GC]]></Text>
-		<Font>
-			<Name><![CDATA[SansSerif]]></Name>
-			<Size>12</Size>
-			<Style>0</Style>
-		</Font>
-		<Alignment>LEFT</Alignment>
-	</Text>
 	<Group>
 		<Id>1725365029204</Id>
 		<Name><![CDATA[gr_companyDetails]]></Name>
@@ -2967,37 +2939,6 @@ zero_Interface.v_currentViewArea = zero_Interface.va_Interface;
 		<Z>0</Z>
 		<Rotation>0.0</Rotation>
 		<Presentation>
-			<Rectangle>
-				<Id>1725608394737</Id>
-				<Name><![CDATA[rect_simulateYearScreen1]]></Name>
-				<ExcludeFromBuild>true</ExcludeFromBuild>
-				<X>-995</X>
-				<Y>-320</Y>
-				<Label>
-					<X>10</X>
-					<Y>10</Y>
-				</Label>
-				<PublicFlag>true</PublicFlag>
-				<PresentationFlag>true</PresentationFlag>
-				<ShowLabel>false</ShowLabel>
-				<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
-				<VisibleCode>!uI_Results.b_showKPISummary</VisibleCode>
-				<EmbeddedIcon>false</EmbeddedIcon>
-				<Z>0</Z>
-				<ZHeight>10</ZHeight>
-				<LineWidth>2</LineWidth>
-				<LineWidthCode>v_chartLineWidth+0.5</LineWidthCode>
-				<LineColor>-369756683</LineColor>
-				<LineColorCode>v_loadScreenColor</LineColorCode>
-				<LineMaterial>null</LineMaterial>
-				<LineStyle>SOLID</LineStyle>
-				<Width>530</Width>
-				<Height>45</Height>
-				<Rotation>0.0</Rotation>
-				<FillColor>-369756683</FillColor>
-				<FillColorCode>v_loadScreenColor</FillColorCode>
-				<FillMaterial>null</FillMaterial>
-			</Rectangle>
 			<Rectangle>
 				<Id>1725606178085</Id>
 				<Name><![CDATA[rect_simulateYearScreen2]]></Name>
@@ -3049,7 +2990,7 @@ gr_loadIcon.setVisible(true);
 new Thread( () -&gt; {	
 	zero_Interface.energyModel.f_runRapidSimulation();
 	zero_Interface.uI_Results.f_updateResultsUI(zero_Interface.energyModel);
-	f_setSelectedGCGraphs();
+	f_updateUIResultsCompanyUI();
 	gr_loadIcon.setVisible(false);
 	
 	//Update and show kpi summary chart after run
@@ -3145,37 +3086,6 @@ new Thread( () -&gt; {
 		<Z>0</Z>
 		<Rotation>0.0</Rotation>
 		<Presentation>
-			<Rectangle>
-				<Id>1725606813428</Id>
-				<Name><![CDATA[rect_loadIcon2]]></Name>
-				<ExcludeFromBuild>true</ExcludeFromBuild>
-				<X>-1980</X>
-				<Y>-60</Y>
-				<Label>
-					<X>10</X>
-					<Y>10</Y>
-				</Label>
-				<PublicFlag>true</PublicFlag>
-				<PresentationFlag>true</PresentationFlag>
-				<ShowLabel>false</ShowLabel>
-				<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
-				<VisibleCode>!uI_Results.b_showKPISummary</VisibleCode>
-				<EmbeddedIcon>false</EmbeddedIcon>
-				<Z>0</Z>
-				<ZHeight>10</ZHeight>
-				<LineWidth>2</LineWidth>
-				<LineWidthCode>v_chartLineWidth+0.5</LineWidthCode>
-				<LineColor>-369756683</LineColor>
-				<LineColorCode>v_loadScreenColor</LineColorCode>
-				<LineMaterial>null</LineMaterial>
-				<LineStyle>SOLID</LineStyle>
-				<Width>530</Width>
-				<Height>45</Height>
-				<Rotation>0.0</Rotation>
-				<FillColor>-369756683</FillColor>
-				<FillColorCode>v_loadScreenColor</FillColorCode>
-				<FillMaterial>null</FillMaterial>
-			</Rectangle>
 			<Rectangle>
 				<Id>1725606178113</Id>
 				<Name><![CDATA[rect_loadIcon]]></Name>
@@ -3198,8 +3108,8 @@ new Thread( () -&gt; {
 				<LineColorCode>v_loadScreenColor</LineColorCode>
 				<LineMaterial>null</LineMaterial>
 				<LineStyle>SOLID</LineStyle>
-				<Width>1060</Width>
-				<Height>750.969</Height>
+				<Width>1065</Width>
+				<Height>755.969</Height>
 				<Rotation>0.0</Rotation>
 				<FillColor>-369756683</FillColor>
 				<FillColorCode>v_loadScreenColor</FillColorCode>
@@ -3208,31 +3118,30 @@ new Thread( () -&gt; {
 			<Rectangle>
 				<Id>1729516584700</Id>
 				<Name><![CDATA[rect_GCisPausedScreen3]]></Name>
-				<X>-1980</X>
+				<X>-1990</X>
 				<Y>-60</Y>
 				<Label>
 					<X>10</X>
 					<Y>10</Y>
 				</Label>
 				<PublicFlag>true</PublicFlag>
-				<PresentationFlag>true</PresentationFlag>
+				<PresentationFlag>false</PresentationFlag>
 				<ShowLabel>false</ShowLabel>
 				<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
-				<VisibleCode>!c_ownedGridConnections.get(v_currentSelectedGCnr).v_isActive</VisibleCode>
 				<EmbeddedIcon>false</EmbeddedIcon>
 				<Z>0</Z>
 				<ZHeight>10</ZHeight>
 				<LineWidth>2</LineWidth>
 				<LineWidthCode>v_chartLineWidth+0.5</LineWidthCode>
 				<LineColor>-6943</LineColor>
-				<LineColorCode>v_companyUIBackgroundColor</LineColorCode>
+				<LineColorCode>v_loadScreenColor</LineColorCode>
 				<LineMaterial>null</LineMaterial>
 				<LineStyle>SOLID</LineStyle>
-				<Width>460</Width>
-				<Height>750</Height>
+				<Width>480</Width>
+				<Height>755</Height>
 				<Rotation>0.0</Rotation>
 				<FillColor>-1</FillColor>
-				<FillColorCode>v_companyUIBackgroundColor</FillColorCode>
+				<FillColorCode>v_loadScreenColor</FillColorCode>
 				<FillMaterial>null</FillMaterial>
 			</Rectangle>
 			<Group>
@@ -3351,10 +3260,10 @@ new Thread( () -&gt; {
 			<TextColor>-16777216</TextColor>
 			<Enabled>true</Enabled>
 			<ActionCode>if (cb_curtailmentCompany.isSelected()) {
-	c_ownedGridConnections.get(v_currentSelectedGCnr).v_enableCurtailment = true;
+	p_gridConnection.v_enableCurtailment = true;
 }
 else {
-	c_ownedGridConnections.get(v_currentSelectedGCnr).v_enableCurtailment = false;
+	p_gridConnection.v_enableCurtailment = false;
 }
 
 //Set scenario to custom
@@ -3372,8 +3281,8 @@ f_setSimulateYearScreen();</ActionCode>
 	<Text>
 		<Id>1727883464770</Id>
 		<Name><![CDATA[txt_nfatoValues]]></Name>
-		<X>-450</X>
-		<Y>740</Y>
+		<X>-440</X>
+		<Y>680</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -3959,8 +3868,8 @@ f_setSimulateYearScreen();</ActionCode>
 				<Rotation>0.0</Rotation>
 				<Color>-16777216</Color>
 				<Text><![CDATA[Custom]]></Text>
-				<TextCode>c_scenarioSettings_Current.get(v_currentSelectedGCnr).getCurrentContractDeliveryCapacity_kW() != sl_GCCapacityCompany.getValue() ? "Custom" :
-c_ownedGridConnections.get(v_currentSelectedGCnr).v_liveConnectionMetaData.contractedDeliveryCapacityKnown ? "Bekend" : "Geschat"</TextCode>
+				<TextCode>p_scenarioSettings_Current.getCurrentContractDeliveryCapacity_kW() != sl_GCCapacityCompany.getValue() ? "Custom" :
+p_gridConnection.v_liveConnectionMetaData.contractedDeliveryCapacityKnown ? "Bekend" : "Geschat"</TextCode>
 				<Font>
 					<Name><![CDATA[Dialog]]></Name>
 					<Size>14</Size>
@@ -3986,8 +3895,8 @@ c_ownedGridConnections.get(v_currentSelectedGCnr).v_liveConnectionMetaData.contr
 				<Rotation>0.0</Rotation>
 				<Color>-16777216</Color>
 				<Text><![CDATA[Geschat]]></Text>
-				<TextCode>c_scenarioSettings_Current.get(v_currentSelectedGCnr).getCurrentContractFeedinCapacity_kW() != sl_GCCapacityCompany_Feedin.getValue() ? "Custom" :
-c_ownedGridConnections.get(v_currentSelectedGCnr).v_liveConnectionMetaData.contractedFeedinCapacityKnown ? "Bekend" : "Geschat"</TextCode>
+				<TextCode>p_scenarioSettings_Current.getCurrentContractFeedinCapacity_kW() != sl_GCCapacityCompany_Feedin.getValue() ? "Custom" :
+p_gridConnection.v_liveConnectionMetaData.contractedFeedinCapacityKnown ? "Bekend" : "Geschat"</TextCode>
 				<Font>
 					<Name><![CDATA[Dialog]]></Name>
 					<Size>14</Size>
@@ -4013,8 +3922,8 @@ c_ownedGridConnections.get(v_currentSelectedGCnr).v_liveConnectionMetaData.contr
 				<Rotation>0.0</Rotation>
 				<Color>-16777216</Color>
 				<Text><![CDATA[Bekend]]></Text>
-				<TextCode>c_scenarioSettings_Current.get(v_currentSelectedGCnr).getCurrentPhysicalConnectionCapacity_kW() != v_physicalConnectionCapacity_kW ? "Custom" :
-c_ownedGridConnections.get(v_currentSelectedGCnr).v_liveConnectionMetaData.physicalCapacityKnown ? "Bekend" : "Geschat"</TextCode>
+				<TextCode>p_scenarioSettings_Current.getCurrentPhysicalConnectionCapacity_kW() != v_physicalConnectionCapacity_kW ? "Custom" :
+p_gridConnection.v_liveConnectionMetaData.physicalCapacityKnown ? "Bekend" : "Geschat"</TextCode>
 				<Font>
 					<Name><![CDATA[Dialog]]></Name>
 					<Size>14</Size>
@@ -4027,7 +3936,6 @@ c_ownedGridConnections.get(v_currentSelectedGCnr).v_liveConnectionMetaData.physi
 	<Group>
 		<Id>1729511748859</Id>
 		<Name><![CDATA[gr_GCisPausedScreen]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>4480</X>
 		<Y>920</Y>
 		<Label>
@@ -4041,7 +3949,7 @@ c_ownedGridConnections.get(v_currentSelectedGCnr).v_liveConnectionMetaData.physi
 		<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
 		<XCode>1375</XCode>
 		<YCode>540</YCode>
-		<VisibleCode>!c_ownedGridConnections.get(v_currentSelectedGCnr).v_isActive</VisibleCode>
+		<VisibleCode>!p_gridConnection.v_isActive</VisibleCode>
 		<EmbeddedIcon>false</EmbeddedIcon>
 		<Z>0</Z>
 		<Rotation>0.0</Rotation>
@@ -4049,7 +3957,7 @@ c_ownedGridConnections.get(v_currentSelectedGCnr).v_liveConnectionMetaData.physi
 			<Rectangle>
 				<Id>1729511748861</Id>
 				<Name><![CDATA[rect_GCisPausedScreen]]></Name>
-				<X>-995</X>
+				<X>-1010</X>
 				<Y>-320</Y>
 				<Label>
 					<X>10</X>
@@ -4068,8 +3976,8 @@ c_ownedGridConnections.get(v_currentSelectedGCnr).v_liveConnectionMetaData.physi
 				<LineColorCode>v_loadScreenColor</LineColorCode>
 				<LineMaterial>null</LineMaterial>
 				<LineStyle>SOLID</LineStyle>
-				<Width>530</Width>
-				<Height>740</Height>
+				<Width>545</Width>
+				<Height>760</Height>
 				<Rotation>0.0</Rotation>
 				<FillColor>-369756683</FillColor>
 				<FillColorCode>v_loadScreenColor</FillColorCode>
@@ -4097,8 +4005,8 @@ c_ownedGridConnections.get(v_currentSelectedGCnr).v_liveConnectionMetaData.physi
 				<LineColorCode>v_companyUIBackgroundColor</LineColorCode>
 				<LineMaterial>null</LineMaterial>
 				<LineStyle>SOLID</LineStyle>
-				<Width>1060</Width>
-				<Height>740</Height>
+				<Width>1075</Width>
+				<Height>760</Height>
 				<Rotation>0.0</Rotation>
 				<FillColor>-1</FillColor>
 				<FillColorCode>v_companyUIBackgroundColor</FillColorCode>
@@ -4120,34 +4028,33 @@ c_ownedGridConnections.get(v_currentSelectedGCnr).v_liveConnectionMetaData.physi
 				<OnClickCode>//Set correct overlay
 gr_simulateYearScreen.setVisible(false);		
 gr_loadIcon.setVisible(true);
+rect_GCisPausedScreen3.setVisible(true);
 
 //Unpause gc
-c_ownedGridConnections.get(v_currentSelectedGCnr).f_setActive(true);
+p_gridConnection.f_setActive(true);
+zero_Interface.b_resultsUpToDate = false;
+zero_Interface.b_changeToCustomScenario = true;
+f_enableAllSliders(true);
 
-//Select unpaused GC
-zero_Interface.f_selectBuilding(c_ownedGridConnections.get(v_currentSelectedGCnr).c_connectedGISObjects.get(0), c_ownedGridConnections.get(v_currentSelectedGCnr).c_connectedGISObjects);
-f_copyResultsUI();
-uI_Results.f_setAllCharts();
-		
 
 //Run simulation
 new Thread( () -&gt; {	
-	//Save previous totals
-	zero_Interface.f_updatePreviousTotalsGC();
-
+	
+	//Run rapid run in engine
 	zero_Interface.energyModel.f_runRapidSimulation();
-	zero_Interface.f_updateUIresultsMainArea();
-	f_setSelectedGCGraphs();
-	gr_loadIcon.setVisible(false);
 	
-	//Update and show kpi summary chart after run
-	//uI_Results.chartKPISummary.f_setKPISummaryChart();
+	//Update map selection and resultsUIs
+	f_selectGCOnMainInterface();
+	f_updateUIResultsCompanyUI();
 	
 	//Update and show kpi summary chart after run
 	if(zero_Interface.settings.showKPISummary() != null &amp;&amp; zero_Interface.settings.showKPISummary()){
 		uI_Results.getCheckbox_KPISummary().setSelected(true, true);
 	}
 	
+	//Remove all simulation screens
+	zero_Interface.f_removeAllSimulateYearScreens();
+	rect_GCisPausedScreen3.setVisible(false);
 }).start();
 
 
@@ -4277,8 +4184,9 @@ else{
 	<Group>
 		<Id>1747234551900</Id>
 		<Name><![CDATA[gr_heatingOptionBlockerCHP]]></Name>
-		<X>150</X>
-		<Y>350</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>140</X>
+		<Y>1500</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -4288,6 +4196,8 @@ else{
 		<ShowLabel>false</ShowLabel>
 		<Lock>true</Lock>
 		<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
+		<XCode>150</XCode>
+		<YCode>350</YCode>
 		<EmbeddedIcon>false</EmbeddedIcon>
 		<Z>0</Z>
 		<Rotation>0.0</Rotation>
@@ -4343,7 +4253,7 @@ else{
 				<Width>280</Width>
 				<Height>30</Height>
 				<Rotation>0.0</Rotation>
-				<FillColor>-1</FillColor>
+				<FillColor>-65536</FillColor>
 				<FillColorCode>v_companyUIBackgroundColorSliders</FillColorCode>
 				<FillMaterial>null</FillMaterial>
 			</Rectangle>
@@ -4549,4 +4459,54 @@ else{
 			</Group>
 		</Presentation>
 	</Group>
+	<Text>
+		<Id>1760974606250</Id>
+		<Name><![CDATA[txt_setSimYearScreen]]></Name>
+		<X>-440</X>
+		<Y>800</Y>
+		<Label>
+			<X>0</X>
+			<Y>-10</Y>
+		</Label>
+		<PublicFlag>true</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>false</ShowLabel>
+		<DrawMode>SHAPE_DRAW_2D</DrawMode>
+		<EmbeddedIcon>false</EmbeddedIcon>
+		<Z>0</Z>
+		<Rotation>0.0</Rotation>
+		<Color>-16777216</Color>
+		<Text><![CDATA[Simulate year screen]]></Text>
+		<Font>
+			<Name><![CDATA[SansSerif]]></Name>
+			<Size>12</Size>
+			<Style>0</Style>
+		</Font>
+		<Alignment>LEFT</Alignment>
+	</Text>
+	<Text>
+		<Id>1760976852165</Id>
+		<Name><![CDATA[txt_selectDifferentOwnedGC]]></Name>
+		<X>-440</X>
+		<Y>250</Y>
+		<Label>
+			<X>0</X>
+			<Y>-10</Y>
+		</Label>
+		<PublicFlag>true</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>false</ShowLabel>
+		<DrawMode>SHAPE_DRAW_2D</DrawMode>
+		<EmbeddedIcon>false</EmbeddedIcon>
+		<Z>0</Z>
+		<Rotation>0.0</Rotation>
+		<Color>-16777216</Color>
+		<Text><![CDATA[Select different owned GC]]></Text>
+		<Font>
+			<Name><![CDATA[SansSerif]]></Name>
+			<Size>12</Size>
+			<Style>0</Style>
+		</Font>
+		<Alignment>LEFT</Alignment>
+	</Text>
 </Presentation>
diff --git a/_alp/Agents/UI_company/Variables.xml b/_alp/Agents/UI_company/Variables.xml
index 09bf2d62..65474931 100644
--- a/_alp/Agents/UI_company/Variables.xml
+++ b/_alp/Agents/UI_company/Variables.xml
@@ -44,33 +44,11 @@
 			</InitialValue>
 		</Properties>
 	</Variable>
-	<Variable Class="PlainVariable">
-		<Id>1713543883957</Id>
-		<Name><![CDATA[v_currentSelectedGCnr]]></Name>
-		<X>-430</X>
-		<Y>260</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Properties SaveInSnapshot="true"
-              Constant="false"
-              AccessType="public"
-              StaticVariable="false">
-			<Type><![CDATA[int]]></Type>
-			<InitialValue Class="CodeValue">
-				<Code><![CDATA[0]]></Code>
-			</InitialValue>
-		</Properties>
-	</Variable>
 	<Variable Class="PlainVariable">
 		<Id>1713957213075</Id>
 		<Name><![CDATA[v_minPVSlider]]></Name>
 		<X>-1060</X>
-		<Y>410</Y>
+		<Y>430</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -92,7 +70,7 @@
 		<Id>1713957229701</Id>
 		<Name><![CDATA[v_maxPVSlider]]></Name>
 		<X>-1060</X>
-		<Y>430</Y>
+		<Y>450</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -114,7 +92,7 @@
 		<Id>1713957233827</Id>
 		<Name><![CDATA[v_defaultPVSlider]]></Name>
 		<X>-1060</X>
-		<Y>450</Y>
+		<Y>470</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -136,7 +114,7 @@
 		<Id>1713971707023</Id>
 		<Name><![CDATA[v_minBatSlider]]></Name>
 		<X>-1060</X>
-		<Y>490</Y>
+		<Y>510</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -158,7 +136,7 @@
 		<Id>1713971707027</Id>
 		<Name><![CDATA[v_maxBatSlider]]></Name>
 		<X>-1060</X>
-		<Y>510</Y>
+		<Y>530</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -180,7 +158,7 @@
 		<Id>1713971707029</Id>
 		<Name><![CDATA[v_defaultBatSlider]]></Name>
 		<X>-1060</X>
-		<Y>530</Y>
+		<Y>550</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -202,7 +180,7 @@
 		<Id>1714139274247</Id>
 		<Name><![CDATA[v_nbEVCars]]></Name>
 		<X>-1050</X>
-		<Y>710</Y>
+		<Y>730</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -224,7 +202,7 @@
 		<Id>1714139294087</Id>
 		<Name><![CDATA[v_nbHydrogenCars]]></Name>
 		<X>-1050</X>
-		<Y>750</Y>
+		<Y>770</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -246,7 +224,7 @@
 		<Id>1714139299844</Id>
 		<Name><![CDATA[v_nbDieselCars]]></Name>
 		<X>-1050</X>
-		<Y>730</Y>
+		<Y>750</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -268,7 +246,7 @@
 		<Id>1714139304156</Id>
 		<Name><![CDATA[v_nbEVVans]]></Name>
 		<X>-1050</X>
-		<Y>910</Y>
+		<Y>930</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -290,7 +268,7 @@
 		<Id>1714139320416</Id>
 		<Name><![CDATA[v_nbEVTrucks]]></Name>
 		<X>-1050</X>
-		<Y>1110</Y>
+		<Y>1130</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -312,7 +290,7 @@
 		<Id>1714139381294</Id>
 		<Name><![CDATA[v_nbDieselVans]]></Name>
 		<X>-1050</X>
-		<Y>930</Y>
+		<Y>950</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -334,7 +312,7 @@
 		<Id>1714139385293</Id>
 		<Name><![CDATA[v_nbDieselTrucks]]></Name>
 		<X>-1050</X>
-		<Y>1130</Y>
+		<Y>1150</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -356,7 +334,7 @@
 		<Id>1714139405729</Id>
 		<Name><![CDATA[v_nbHydrogenVans]]></Name>
 		<X>-1050</X>
-		<Y>950</Y>
+		<Y>970</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -378,7 +356,7 @@
 		<Id>1714139413565</Id>
 		<Name><![CDATA[v_nbHydrogenTrucks]]></Name>
 		<X>-1050</X>
-		<Y>1150</Y>
+		<Y>1170</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -400,7 +378,7 @@
 		<Id>1714139966993</Id>
 		<Name><![CDATA[v_minEVCarSlider]]></Name>
 		<X>-1050</X>
-		<Y>590</Y>
+		<Y>610</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -422,7 +400,7 @@
 		<Id>1714139997786</Id>
 		<Name><![CDATA[v_minHydrogenCarSlider]]></Name>
 		<X>-1050</X>
-		<Y>630</Y>
+		<Y>650</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -444,7 +422,7 @@
 		<Id>1714140003906</Id>
 		<Name><![CDATA[v_maxEVCarSlider]]></Name>
 		<X>-1050</X>
-		<Y>650</Y>
+		<Y>670</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -466,7 +444,7 @@
 		<Id>1714140007855</Id>
 		<Name><![CDATA[v_minDieselCarSlider]]></Name>
 		<X>-1050</X>
-		<Y>610</Y>
+		<Y>630</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -488,7 +466,7 @@
 		<Id>1714140012482</Id>
 		<Name><![CDATA[v_maxHydrogenCarSlider]]></Name>
 		<X>-1050</X>
-		<Y>690</Y>
+		<Y>710</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -510,7 +488,7 @@
 		<Id>1714140056511</Id>
 		<Name><![CDATA[v_maxDieselCarSlider]]></Name>
 		<X>-1050</X>
-		<Y>670</Y>
+		<Y>690</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -532,7 +510,7 @@
 		<Id>1714141906262</Id>
 		<Name><![CDATA[v_minEVVanSlider]]></Name>
 		<X>-1050</X>
-		<Y>790</Y>
+		<Y>810</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -554,7 +532,7 @@
 		<Id>1714141906264</Id>
 		<Name><![CDATA[v_minHydrogenVanSlider]]></Name>
 		<X>-1050</X>
-		<Y>830</Y>
+		<Y>850</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -576,7 +554,7 @@
 		<Id>1714141906266</Id>
 		<Name><![CDATA[v_maxEVVanSlider]]></Name>
 		<X>-1050</X>
-		<Y>850</Y>
+		<Y>870</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -598,7 +576,7 @@
 		<Id>1714141906268</Id>
 		<Name><![CDATA[v_minDieselVanSlider]]></Name>
 		<X>-1050</X>
-		<Y>810</Y>
+		<Y>830</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -620,7 +598,7 @@
 		<Id>1714141906270</Id>
 		<Name><![CDATA[v_maxHydrogenVanSlider]]></Name>
 		<X>-1050</X>
-		<Y>890</Y>
+		<Y>910</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -642,7 +620,7 @@
 		<Id>1714141906272</Id>
 		<Name><![CDATA[v_maxDieselVanSlider]]></Name>
 		<X>-1050</X>
-		<Y>870</Y>
+		<Y>890</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -664,7 +642,7 @@
 		<Id>1714142030261</Id>
 		<Name><![CDATA[v_minEVTruckSlider]]></Name>
 		<X>-1050</X>
-		<Y>990</Y>
+		<Y>1010</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -686,7 +664,7 @@
 		<Id>1714142030263</Id>
 		<Name><![CDATA[v_minHydrogenTruckSlider]]></Name>
 		<X>-1050</X>
-		<Y>1030</Y>
+		<Y>1050</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -708,7 +686,7 @@
 		<Id>1714142030265</Id>
 		<Name><![CDATA[v_maxEVTruckSlider]]></Name>
 		<X>-1050</X>
-		<Y>1050</Y>
+		<Y>1070</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -730,7 +708,7 @@
 		<Id>1714142030267</Id>
 		<Name><![CDATA[v_minDieselTruckSlider]]></Name>
 		<X>-1050</X>
-		<Y>1010</Y>
+		<Y>1030</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -752,7 +730,7 @@
 		<Id>1714142030269</Id>
 		<Name><![CDATA[v_maxDieselTruckSlider]]></Name>
 		<X>-1050</X>
-		<Y>1070</Y>
+		<Y>1090</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -774,7 +752,7 @@
 		<Id>1714142035660</Id>
 		<Name><![CDATA[v_maxHydrogenTruckSlider]]></Name>
 		<X>-1050</X>
-		<Y>1090</Y>
+		<Y>1110</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -796,7 +774,7 @@
 		<Id>1725364840518</Id>
 		<Name><![CDATA[v_adressGC]]></Name>
 		<X>-740</X>
-		<Y>130</Y>
+		<Y>90</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -925,7 +903,7 @@
 		<Id>1725614630564</Id>
 		<Name><![CDATA[v_minGCCapacitySlider]]></Name>
 		<X>-1060</X>
-		<Y>250</Y>
+		<Y>270</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -947,7 +925,7 @@
 		<Id>1725614630566</Id>
 		<Name><![CDATA[v_maxGCCapacitySlider]]></Name>
 		<X>-1060</X>
-		<Y>270</Y>
+		<Y>290</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -969,7 +947,7 @@
 		<Id>1725614630568</Id>
 		<Name><![CDATA[v_defaultGCCapacitySlider]]></Name>
 		<X>-1060</X>
-		<Y>290</Y>
+		<Y>310</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -991,7 +969,7 @@
 		<Id>1725625091022</Id>
 		<Name><![CDATA[b_runningMainInterfaceScenarioSettings]]></Name>
 		<X>-410</X>
-		<Y>700</Y>
+		<Y>850</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1013,7 +991,7 @@
 		<Id>1727798399505</Id>
 		<Name><![CDATA[v_minGCCapacitySlider_Feedin]]></Name>
 		<X>-1060</X>
-		<Y>330</Y>
+		<Y>350</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1035,7 +1013,7 @@
 		<Id>1727798399507</Id>
 		<Name><![CDATA[v_maxGCCapacitySlider_Feedin]]></Name>
 		<X>-1060</X>
-		<Y>350</Y>
+		<Y>370</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1057,7 +1035,7 @@
 		<Id>1727798399509</Id>
 		<Name><![CDATA[v_defaultGCCapacitySlider_Feedin]]></Name>
 		<X>-1060</X>
-		<Y>370</Y>
+		<Y>390</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1079,7 +1057,7 @@
 		<Id>1727872520826</Id>
 		<Name><![CDATA[v_physicalConnectionCapacity_kW]]></Name>
 		<X>-1060</X>
-		<Y>230</Y>
+		<Y>250</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1097,8 +1075,8 @@
 	<Variable Class="PlainVariable">
 		<Id>1727883544535</Id>
 		<Name><![CDATA[v_NFATO_kW_delivery]]></Name>
-		<X>-440</X>
-		<Y>805</Y>
+		<X>-430</X>
+		<Y>745</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1116,8 +1094,8 @@
 	<Variable Class="PlainVariable">
 		<Id>1727883574908</Id>
 		<Name><![CDATA[v_NFATO_kW_feedin]]></Name>
-		<X>-440</X>
-		<Y>825</Y>
+		<X>-430</X>
+		<Y>765</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1135,8 +1113,8 @@
 	<Variable Class="PlainVariable">
 		<Id>1727941212434</Id>
 		<Name><![CDATA[v_NFATO_active]]></Name>
-		<X>-440</X>
-		<Y>785</Y>
+		<X>-430</X>
+		<Y>725</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1155,7 +1133,7 @@
 		<Id>1729686904963</Id>
 		<Name><![CDATA[b_runningMainInterfaceSlider]]></Name>
 		<X>-410</X>
-		<Y>720</Y>
+		<Y>870</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1177,7 +1155,7 @@
 		<Id>1756376301806</Id>
 		<Name><![CDATA[v_minSavingsSliders]]></Name>
 		<X>-1050</X>
-		<Y>1240</Y>
+		<Y>1260</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1199,7 +1177,7 @@
 		<Id>1756376314706</Id>
 		<Name><![CDATA[v_maxSavingsSliders]]></Name>
 		<X>-1050</X>
-		<Y>1260</Y>
+		<Y>1280</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1243,10 +1221,11 @@
 		</Properties>
 	</Variable>
 	<Variable Class="Parameter">
-		<Id>1708522412931</Id>
-		<Name><![CDATA[p_amountOfGC]]></Name>
-		<X>-740</X>
-		<Y>90</Y>
+		<Id>1715181661645</Id>
+		<Name><![CDATA[p_maxAddedVehicles]]></Name>
+		<Description><![CDATA[Amount of vehicles that can additionally be added on the already existing ones]]></Description>
+		<X>-1060</X>
+		<Y>1190</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1258,8 +1237,11 @@
 			<Type><![CDATA[int]]></Type>
 			<UnitType>NONE</UnitType>
 			<SdArray>false</SdArray>
+			<DefaultValue Class="CodeValue">
+				<Code><![CDATA[20]]></Code>
+			</DefaultValue>
 			<ParameterEditor>
-				<Id>1708522412929</Id>
+				<Id>1715181661643</Id>
 				<EditorContolType>TEXT_BOX</EditorContolType>
 				<MinSliderValue>0</MinSliderValue>
 				<MaxSliderValue>100</MaxSliderValue>
@@ -1268,10 +1250,10 @@
 		</Properties>
 	</Variable>
 	<Variable Class="Parameter">
-		<Id>1708522430401</Id>
-		<Name><![CDATA[p_amountOfBuildings]]></Name>
+		<Id>1760715449229</Id>
+		<Name><![CDATA[p_scenarioSettings_Current]]></Name>
 		<X>-740</X>
-		<Y>110</Y>
+		<Y>140</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1280,11 +1262,11 @@
 		<PresentationFlag>true</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
 		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
-			<Type><![CDATA[int]]></Type>
+			<Type><![CDATA[J_scenario_Current]]></Type>
 			<UnitType>NONE</UnitType>
 			<SdArray>false</SdArray>
 			<ParameterEditor>
-				<Id>1708522430399</Id>
+				<Id>1760715449227</Id>
 				<EditorContolType>TEXT_BOX</EditorContolType>
 				<MinSliderValue>0</MinSliderValue>
 				<MaxSliderValue>100</MaxSliderValue>
@@ -1293,10 +1275,10 @@
 		</Properties>
 	</Variable>
 	<Variable Class="Parameter">
-		<Id>1714641936747</Id>
-		<Name><![CDATA[p_company]]></Name>
+		<Id>1760715453384</Id>
+		<Name><![CDATA[p_scenarioSettings_Future]]></Name>
 		<X>-740</X>
-		<Y>50</Y>
+		<Y>160</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1305,11 +1287,11 @@
 		<PresentationFlag>true</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
 		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
-			<Type><![CDATA[ConnectionOwner]]></Type>
+			<Type><![CDATA[J_scenario_Future]]></Type>
 			<UnitType>NONE</UnitType>
 			<SdArray>false</SdArray>
 			<ParameterEditor>
-				<Id>1714641936745</Id>
+				<Id>1760715453382</Id>
 				<EditorContolType>TEXT_BOX</EditorContolType>
 				<MinSliderValue>0</MinSliderValue>
 				<MaxSliderValue>100</MaxSliderValue>
@@ -1318,11 +1300,10 @@
 		</Properties>
 	</Variable>
 	<Variable Class="Parameter">
-		<Id>1715181661645</Id>
-		<Name><![CDATA[p_maxAddedVehicles]]></Name>
-		<Description><![CDATA[Amount of vehicles that can additionally be added on the already existing ones]]></Description>
-		<X>-1060</X>
-		<Y>1170</Y>
+		<Id>1760715588549</Id>
+		<Name><![CDATA[p_gridConnection]]></Name>
+		<X>-740</X>
+		<Y>50</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1331,14 +1312,11 @@
 		<PresentationFlag>true</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
 		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
-			<Type><![CDATA[int]]></Type>
+			<Type><![CDATA[GridConnection]]></Type>
 			<UnitType>NONE</UnitType>
 			<SdArray>false</SdArray>
-			<DefaultValue Class="CodeValue">
-				<Code><![CDATA[20]]></Code>
-			</DefaultValue>
 			<ParameterEditor>
-				<Id>1715181661643</Id>
+				<Id>1760715588547</Id>
 				<EditorContolType>TEXT_BOX</EditorContolType>
 				<MinSliderValue>0</MinSliderValue>
 				<MaxSliderValue>100</MaxSliderValue>
@@ -1346,112 +1324,4 @@
 			</ParameterEditor>
 		</Properties>
 	</Variable>
-	<Variable Class="CollectionVariable">
-		<Id>1709571634348</Id>
-		<Name><![CDATA[c_ownedBuildings]]></Name>
-		<X>-740</X>
-		<Y>210</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>GIS_Object</ElementClass>
-			<ValueElementClass>String</ValueElementClass>
-		</Properties>
-	</Variable>
-	<Variable Class="CollectionVariable">
-		<Id>1709571643590</Id>
-		<Name><![CDATA[c_ownedGridConnections]]></Name>
-		<X>-740</X>
-		<Y>230</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Properties SaveInSnapshot="true" AccessType="public" StaticVariable="false">
-			<CollectionClass>ArrayList</CollectionClass>
-			<ElementClass>GridConnection</ElementClass>
-			<ValueElementClass>String</ValueElementClass>
-		</Properties>
-	</Variable>
-	<Variable Class="CollectionVariable">
-		<Id>1711722238158</Id>
-		<Name><![CDATA[c_connectedTrafos]]></Name>
-		<X>-740</X>
-		<Y>250</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Properties SaveInSnapshot="true" AccessType="public" StaticVariable="false">
-			<CollectionClass>ArrayList</CollectionClass>
-			<ElementClass>Object</ElementClass>
-			<ValueElementClass>String</ValueElementClass>
-		</Properties>
-	</Variable>
-	<Variable Class="CollectionVariable">
-		<Id>1713945394048</Id>
-		<Name><![CDATA[c_scenarioSettings_Current]]></Name>
-		<X>-740</X>
-		<Y>310</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>J_scenario_Current</ElementClass>
-			<ValueElementClass>String</ValueElementClass>
-		</Properties>
-	</Variable>
-	<Variable Class="CollectionVariable">
-		<Id>1713947318059</Id>
-		<Name><![CDATA[c_scenarioSettings_Future]]></Name>
-		<X>-740</X>
-		<Y>330</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>J_scenario_Future</ElementClass>
-			<ValueElementClass>String</ValueElementClass>
-		</Properties>
-	</Variable>
-	<Variable Class="CollectionVariable">
-		<Id>1727953980115</Id>
-		<Name><![CDATA[c_additionalVehicles]]></Name>
-		<X>-1060</X>
-		<Y>1190</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>LinkedHashMap</CollectionClass>
-			<ElementClass>String</ElementClass>
-			<ValueElementClass>List&lt;J_EAVehicle&gt;</ValueElementClass>
-		</Properties>
-	</Variable>
 </Variables>
diff --git a/_alp/Agents/Zero_Interface/Code/Events.java b/_alp/Agents/Zero_Interface/Code/Events.java
index acae131f..a598ffd4 100644
--- a/_alp/Agents/Zero_Interface/Code/Events.java
+++ b/_alp/Agents/Zero_Interface/Code/Events.java
@@ -14,8 +14,8 @@ void e_calculateEnergyBalance()
 
 // Update the NFATO values in the selected companyUI
 if(c_selectedGridConnections.size() > 0 && c_selectedGridConnections.get(0).v_enableNFato){
-	if(c_companyUIs.get(v_connectionOwnerIndexNr).v_NFATO_active){
-		c_companyUIs.get(v_connectionOwnerIndexNr).f_getNFATOValues();
+	if(uI_Company.v_NFATO_active){
+		uI_Company.f_getNFATOValues();
 	}
 }
 
@@ -28,3 +28,22 @@ void e_setStartView()
 f_setStartView();
 /*ALCODEEND*/}
 
+void e_setScenarioToCustom()
+{/*ALCODESTART::1761119827697*/
+String[] scenarioOptions = f_getScenarioOptions();
+
+int customOptionIndex = 0;
+for(String scenarioOption : scenarioOptions){
+	if(scenarioOption.equals("Custom")){
+		break;
+	}
+	customOptionIndex++;
+}
+
+rb_scenarios.setValue(customOptionIndex, true);
+
+b_changeToCustomScenario = false;
+e_setScenarioToCustom.restart();
+
+/*ALCODEEND*/}
+
diff --git a/_alp/Agents/Zero_Interface/Code/Events.xml b/_alp/Agents/Zero_Interface/Code/Events.xml
index f3b434bf..e5d86a45 100644
--- a/_alp/Agents/Zero_Interface/Code/Events.xml
+++ b/_alp/Agents/Zero_Interface/Code/Events.xml
@@ -76,4 +76,40 @@
 		</Properties>
 		<Action xmlns:al="http://anylogic.com"/>
 	</Event>
+	<Event>
+		<Id>1761119827697</Id>
+		<Name><![CDATA[e_setScenarioToCustom]]></Name>
+		<X>-1180</X>
+		<Y>315</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties TriggerType="condition" Mode="occuresOnce">
+			<Timeout Class="CodeUnitValue">
+				<Code><![CDATA[1]]></Code>
+				<Unit Class="TimeUnits">HOUR</Unit>
+			</Timeout>
+			<Rate Class="CodeUnitValue">
+				<Code><![CDATA[1]]></Code>
+				<Unit Class="RateUnits">PER_HOUR</Unit>
+			</Rate>
+			<Id>1761119827695</Id>
+			<OccurrenceAtTime>true</OccurrenceAtTime>
+			<OccurrenceDate>1729929600000</OccurrenceDate>
+			<OccurrenceTime Class="CodeUnitValue">
+				<Code><![CDATA[0]]></Code>
+				<Unit Class="TimeUnits">HOUR</Unit>
+			</OccurrenceTime>
+			<RecurrenceCode Class="CodeUnitValue">
+				<Code><![CDATA[1]]></Code>
+				<Unit Class="TimeUnits">HOUR</Unit>
+			</RecurrenceCode>
+			<Condition>!b_runningMainInterfaceScenarios &amp;&amp; b_changeToCustomScenario</Condition>
+		</Properties>
+		<Action xmlns:al="http://anylogic.com"/>
+	</Event>
 </Events>
diff --git a/_alp/Agents/Zero_Interface/Code/Functions.java b/_alp/Agents/Zero_Interface/Code/Functions.java
index 5f328c97..6ac853c1 100644
--- a/_alp/Agents/Zero_Interface/Code/Functions.java
+++ b/_alp/Agents/Zero_Interface/Code/Functions.java
@@ -323,6 +323,10 @@
 //Initialize sliders with certain presets
 f_setSliderPresets();
 
+//Store the initial slider state for Residential areas for the scenario current button
+if (project_data.project_type() == OL_ProjectType.RESIDENTIAL) {
+	f_storeResidentialScenario_Current();
+}
 /*ALCODEEND*/}
 
 double f_selectGridNode(GridNode GN)
@@ -478,81 +482,6 @@ else if (v_previousClickedObjectType == OL_GISObjectType.BUILDING ||
 }
 /*ALCODEEND*/}
 
-double f_createPrivateCompanyUI()
-{/*ALCODESTART::1708595258540*/
-int i = 0;
-
-//Create list of connection owners companies
-List<ConnectionOwner> c_COCompanies = findAll(energyModel.pop_connectionOwners, p -> p.p_connectionOwnerType == OL_ConnectionOwnerType.COMPANY); 
-
-// Give every connection owner an index nr, used to navigate to the correct private ui using the button.
-while (i < c_COCompanies.size()){
-
-	ConnectionOwner CO = c_COCompanies.get(i);
-		
-	CO.p_connectionOwnerIndexNr = i;
-	i++;
-}
-
-//Create the private ui for every connection owner
-while (v_connectionOwnerIndexNr < c_COCompanies.size()){
-	
-	UI_company companyUI = add_ui_companies();
-	c_UIResultsInstances.add(companyUI.uI_Results);
-	ConnectionOwner COC = findFirst(c_COCompanies, p -> p.p_connectionOwnerIndexNr == v_connectionOwnerIndexNr );	
-	
-	////Set unique parameters for every company_ui
-	companyUI.p_company = COC;
-	companyUI.p_companyName = COC.p_actorID;
-	companyUI.p_amountOfGC = COC.f_getOwnedGridConnections().size();
-
-	
-	//Links with engine
-	companyUI.c_ownedGridConnections = COC.f_getOwnedGridConnections();
-	
-	for (GridConnection GC : companyUI.c_ownedGridConnections) {
-		
-		//Get all buildings
-		companyUI.c_ownedBuildings.addAll(GC.c_connectedGISObjects);
-		
-		//Add connected trafos for each GC
-		companyUI.c_connectedTrafos.add(GC.p_parentNodeElectricID);
-	
-		//Add scenario settings for each GC
-		companyUI.c_scenarioSettings_Current.add(c_scenarioMap_Current.get(GC.p_uid));
-		companyUI.c_scenarioSettings_Future.add(c_scenarioMap_Future.get(GC.p_uid));
-		
-		//Initialize additional vehicles collection for each GC
-		companyUI.c_additionalVehicles.put(GC.p_uid, new ArrayList<J_EAVehicle>());
-	}
-	
-	companyUI.p_amountOfBuildings = companyUI.c_ownedBuildings.size();
-	
-	//Initialize adress variable (changes with selected GC)
-	companyUI.v_adressGC = companyUI.c_ownedGridConnections.get(0).p_address.getAddress();
-	
-	//Set annotation as company name, if its a generic company (otherwise potentially the addres_id name)
-	if(!COC.p_detailedCompany){
-		if(companyUI.c_ownedBuildings.get(0).p_annotation != null){
-			companyUI.p_companyName = companyUI.c_ownedBuildings.get(0).p_annotation;
-		}
-	}
-
-	//Initialize the companyUI
-	companyUI.f_initializeCompanyUI();
-
-	//Add to the collection of companyUIs
-	c_companyUIs.add( companyUI );
-	
-	//set boolean for has privateUI in owner: True
-	COC.b_hasPrivateUI = true;
-	
-	v_connectionOwnerIndexNr++;
-}
-
-v_connectionOwnerIndexNr = 0;
-/*ALCODEEND*/}
-
 double f_connectResultsUI()
 {/*ALCODESTART::1709716821854*/
 //Style resultsUI
@@ -630,12 +559,11 @@ else if (v_previousClickedObjectType == OL_GISObjectType.BUILDING ||
 ArrayList<J_EA> otherEAs = EAs.stream().filter(ea -> !(ea instanceof J_EAEV)).collect(Collectors.toCollection(ArrayList::new));
 // We make sure that the EVs at the start of the simulation are the last in the list
 
-//traceln("amount of EVs at start: " + EAEVs.size());
-//traceln("amount of other EAs at start: " + otherEAs.size());
 
-if(c_companyUIs.size() == 0){ // Dont add the ev to the pool if there are companyUIs
-	ArrayList<J_EA> EAEVs = EAs.stream().filter(ea -> (ea instanceof J_EAEV)).collect(Collectors.toCollection(ArrayList::new));
-	otherEAs.addAll(EAEVs);
+for(J_EA vehicle : EAs){
+	if(vehicle instanceof J_EAEV && !(vehicle.getParentAgent() instanceof GCUtility)){ // Companies can not get lower EV then current situation
+		otherEAs.add((J_EAEV) vehicle);	
+	}
 }
 
 c_orderedVehicles = otherEAs;
@@ -674,6 +602,7 @@ else if (v_previousClickedObjectType == OL_GISObjectType.BUILDING ||
 f_initialParkingSpacesOrder();
 f_initialChargerOrder();
 f_initializePrivateAndPublicParkingCarsOrder();
+f_initializeAdditionalVehicles();
 f_projectSpecificOrderedCollectionAdjustments();
 
 
@@ -744,13 +673,16 @@ else if (totalPVCapacity_kWp < mediumPVValue_kWp){
 //Initialize the UITabs
 f_setUITabs();
 
+//Initialize scenario radio button
+f_initializeScenarioRadioButton();
+
 //Initialize the legend
 f_initializeLegend();
 
 //Initialize map overlay buttons
 f_initializeMapOverlayRadioButton();
 
-// Create the Private UI for companies
+//Set ui button visibility false at startup
 f_createAdditionalUIs();
 button_goToUI.setVisible(false);
 
@@ -978,147 +910,28 @@ else if(project_data.project_type() == OL_ProjectType.RESIDENTIAL){
 }
 /*ALCODEEND*/}
 
-double f_createAdditionalUIs()
-{/*ALCODESTART::1724857887019*/
-//Create the additional dashboards, control panels and private UIs
-
-//Create PrivateUIs
-f_createPrivateCompanyUI();
-
-
-//Create Hydrogen UI
-//f_createHydrogenUI();
-
-
-//Create Battery UI
-//f_createBatteryUI();
-/*ALCODEEND*/}
-
-double f_createHydrogenUI()
-{/*ALCODESTART::1724857983890*/
-//Create the hydrogen ui
-UI_Hydrogen hydrogenUI = add_ui_Hydrogen();
-
-//Fill list of connection owners companies 
-hydrogenUI.c_connectionOwners_Hydrogen.addAll(findAll(energyModel.pop_connectionOwners, co -> co.p_connectionOwnerType == OL_ConnectionOwnerType.ELECTROLYSER_OP)); 
-
-//Fill the hydrogen GC collection (For now only searched for Electrolyser_OP, what about (the non existing) Fuelcell_OP 
-for(ConnectionOwner COHydrogen : hydrogenUI.c_connectionOwners_Hydrogen){
-	hydrogenUI.c_gridConnections_Hydrogen.addAll(findAll(
-    COHydrogen.f_getOwnedGridConnections(), gc -> gc instanceof GCEnergyConversion && (
-    gc.c_energyAssets.stream().anyMatch(asset -> asset instanceof J_EAConversionElectrolyser) ||
-    gc.c_energyAssets.stream().anyMatch(asset -> asset instanceof J_EAConversionFuelCell) ||
-    gc.c_energyAssets.stream().anyMatch(asset -> asset instanceof J_EAStorageGas)    )));
-}
-
-
-for (GridConnection GC : hydrogenUI.c_gridConnections_Hydrogen) {
-
-	//Add all GIS objects
-	hydrogenUI.c_GISObjects_Hydrogen.addAll(GC.c_connectedGISObjects);
-	
-	//Add connected gridnodes for each GC
-	hydrogenUI.c_connectedGridNodes.add(GC.p_parentNodeElectricID);
-	
-	//Find all energy assets and add them to the correct collection
-	List<J_EAConversion> electrolysers = findAll(GC.c_conversionAssets, asset -> asset instanceof J_EAConversionElectrolyser);
-	List<J_EAStorage> storages = findAll(GC.c_storageAssets, asset -> asset instanceof J_EAStorageGas);
-	List<J_EAConversion> fuelcells = findAll(GC.c_conversionAssets, asset -> asset instanceof J_EAConversionFuelCell);
-	
-	electrolysers.forEach(asset -> hydrogenUI.c_hydrogenElectrolysers.add((J_EAConversionElectrolyser)asset));
-	storages.forEach(asset -> hydrogenUI.c_hydrogenStorages.add((J_EAStorageGas)asset));
-	fuelcells.forEach(asset -> hydrogenUI.c_hydrogenFuelCells.add((J_EAConversionFuelCell)asset));
-}
-
-
-//Totals
-hydrogenUI.p_amountOfGC = hydrogenUI.c_gridConnections_Hydrogen.size();
-hydrogenUI.p_amountOfGISObjects = hydrogenUI.c_GISObjects_Hydrogen.size();
-
-
-//Initialize the UI
-
-
-
-
-//Add to the collection of UIs ???
-
-
-
-/*ALCODEEND*/}
-
-double f_createBatteryUI()
-{/*ALCODESTART::1724858039724*/
-//Create the hydrogen ui
-UI_Battery batteryUI = add_ui_Battery();
-
-//Fill list of connection owners companies 
-batteryUI.c_connectionOwners_Battery.addAll(findAll(energyModel.pop_connectionOwners, co -> co.p_connectionOwnerType == OL_ConnectionOwnerType.BATTERY_OP)); 
-
-//Fill the hydrogen GC collection (For now only searched for Electrolyser_OP, what about (the non existing) Fuelcell_OP 
-for(ConnectionOwner COBattery : batteryUI.c_connectionOwners_Battery){
-	batteryUI.c_gridConnections_Battery.addAll(findAll(
-    COBattery.f_getOwnedGridConnections(), gc -> gc instanceof GCGridBattery &&
-    gc.c_storageAssets.stream().anyMatch(asset -> asset instanceof J_EAStorageElectric)    ));
-}
-
-
-for (GridConnection GC : batteryUI.c_gridConnections_Battery) {
-
-	//Add all GIS objects
-	batteryUI.c_GISObjects_Battery.addAll(GC.c_connectedGISObjects);
-	
-	//Add connected gridnodes for each GC
-	batteryUI.c_connectedGridNodes.add(GC.p_parentNodeElectricID);
-	
-	//Find all energy assets and add them to the correct collection
-	List<J_EAStorage> batteries = findAll(GC.c_storageAssets, asset -> asset instanceof J_EAStorageElectric);
-
-	batteries.forEach(asset -> batteryUI.c_gridBatteries.add((J_EAStorageElectric)asset));
-}
-
-
-//Totals
-batteryUI.p_amountOfGC = batteryUI.c_gridConnections_Battery.size();
-batteryUI.p_amountOfGISObjects = batteryUI.c_GISObjects_Battery.size();
-
-
-//Initialize the UI
-
-
-
-
-//Add to the collection of UIs ???
-/*ALCODEEND*/}
-
 double f_setUIButton()
 {/*ALCODESTART::1725006890451*/
 switch(v_clickedObjectType){
 
 case BUILDING:
-	if (c_selectedGridConnections.size() > 1 || !c_selectedGridConnections.get(0).p_owner.b_hasPrivateUI || !c_selectedGridConnections.get(0).v_isActive){
+	if (c_selectedGridConnections.size() > 1 || !(c_selectedGridConnections.get(0) instanceof GCUtility) || !c_selectedGridConnections.get(0).v_isActive){
 		button_goToUI.setVisible(false);
 	}
 	else{
-		// Index number of the connection owner used to change the button '
-		v_connectionOwnerIndexNr = c_selectedGridConnections.get(0).p_owner.p_connectionOwnerIndexNr;
 		button_goToUI.setText("Ga naar het Bedrijfsportaal");
 		button_goToUI.setVisible(true);
 	}
 	break;
 	
 case ELECTROLYSER:
-	if(ui_Hydrogen.size() > 0){
-		button_goToUI.setText("Ga naar het Waterstof Dashboard");
-		button_goToUI.setVisible(true);
-	}
+	button_goToUI.setText("Ga naar het Waterstof Dashboard");
+	button_goToUI.setVisible(true);
 	break;
 	
 case BATTERY:
-	if(ui_Battery.size() > 0){
-		button_goToUI.setText("Ga naar het Batterijen Dashboard");
-		button_goToUI.setVisible(true);
-	}
+	button_goToUI.setText("Ga naar het Batterijen Dashboard");
+	button_goToUI.setVisible(true);
 	break;	
 
 case CHARGER:
@@ -3250,9 +3063,11 @@ ArrayList<GridConnection> f_updateJ_EAlistAfterDeserialisation(ArrayList<J_EA> E
 	energyModel.f_runRapidSimulation();
 	
 	//After rapid run: remove loading screen
+	f_removeAllSimulateYearScreens();
 	gr_loadIconYearSimulation.setVisible(false);
 	uI_EnergyHub.gr_loadIconYearSimulationEnergyHub.setVisible(false);
-			
+	uI_Company.gr_simulateYearScreen.setVisible(false);	
+	
 	if (c_selectedGridConnections.size() == 0){//Update main area collection
 		uI_Results.f_updateResultsUI(energyModel);
 	}
@@ -3273,7 +3088,8 @@ else if(c_selectedGridConnections.size() > 1){//Update COOP area collection
 	//Enable radio buttons again
 	uI_Results.f_enableNonLivePlotRadioButtons(true);
 	uI_EnergyHub.uI_Results.f_enableNonLivePlotRadioButtons(true);
-	c_companyUIs.forEach(companyUI -> {companyUI.uI_Results.f_enableNonLivePlotRadioButtons(true); companyUI.gr_simulateYearScreen.setVisible(false);});
+	uI_Company.uI_Results.f_enableNonLivePlotRadioButtons(true); 
+	
 	
 	b_resultsUpToDate = true;
 }).start();
@@ -3385,9 +3201,11 @@ ShapeRadioButtonGroup f_getScenarioButtons()
 double f_setAllSimulateYearScreens()
 {/*ALCODESTART::1756995218301*/
 gr_simulateYear.setVisible(true);
-uI_EnergyHub.gr_simulateYearEnergyHub.setVisible(true);
-for(UI_company companyUI : c_companyUIs){
-	companyUI.gr_simulateYearScreen.setVisible(true);
+if(uI_EnergyHub != null){
+	uI_EnergyHub.gr_simulateYearEnergyHub.setVisible(true);
+}
+if(uI_Company != null){
+	uI_Company.gr_simulateYearScreen.setVisible(true);
 }
 /*ALCODEEND*/}
 
@@ -3395,11 +3213,13 @@ ShapeRadioButtonGroup f_getScenarioButtons()
 {/*ALCODESTART::1756997038652*/
 gr_simulateYear.setVisible(false);
 gr_loadIconYearSimulation.setVisible(false);
-uI_EnergyHub.gr_simulateYearEnergyHub.setVisible(false);
-uI_EnergyHub.gr_loadIconYearSimulationEnergyHub.setVisible(false);
-for(UI_company companyUI : c_companyUIs){
-	companyUI.gr_simulateYearScreen.setVisible(false);
-	companyUI.gr_loadIcon.setVisible(false);
+if(uI_EnergyHub != null){
+	uI_EnergyHub.gr_simulateYearEnergyHub.setVisible(false);
+	uI_EnergyHub.gr_loadIconYearSimulationEnergyHub.setVisible(false);
+}
+if(uI_Company != null){
+	uI_Company.gr_simulateYearScreen.setVisible(false);
+	uI_Company.gr_loadIcon.setVisible(false);
 }
 /*ALCODEEND*/}
 
@@ -3424,3 +3244,453 @@ ShapeRadioButtonGroup f_getScenarioButtons()
 // --> Als ghost vehicles ook worden aangemaakt, werkt het wel.
 /*ALCODEEND*/}
 
+double f_initializeAdditionalVehicles()
+{/*ALCODESTART::1760955904715*/
+for(GridConnection GC : energyModel.UtilityConnections){
+	c_additionalVehicles.put(GC.p_uid, new ArrayList<J_EAVehicle>());
+}
+/*ALCODEEND*/}
+
+double f_createAdditionalUIs()
+{/*ALCODESTART::1760978860758*/
+//Energy hub dashboard
+if(project_data.project_type() == OL_ProjectType.BUSINESSPARK){
+	uI_EnergyHub = add_pop_UI_EnergyHub();
+}
+
+//Private companyUI dashboard
+if(energyModel.UtilityConnections.size() > 0){
+	uI_Company = add_pop_UI_Company();
+}
+
+/* 
+//Hydrogen dashboard NOT FINISHED
+for(GCEnergyConversion conversionGC : energyModel.EnergyConversionSites){
+	for(J_EAConversion conversionEA : conversionGC.c_conversionAssets){
+		if(conversionEA instanceof J_EAConversionElectrolyser){	
+			uI_Hydrogen = add_pop_UI_Hydrogen();
+			break;
+		}
+	}
+}
+
+//Battery dashboard NOT FINISHED
+for(GCGridBattery batteryGC : energyModel.GridBatteries){
+	if(batteryGC.c_connectedGISObjects.size()>0){	
+		uI_Battery = add_pop_UI_Battery();
+		break;
+	}
+}
+*/
+/*ALCODEEND*/}
+
+double f_setCompaniesScenario(LinkedHashMap scenarioMap)
+{/*ALCODESTART::1761060882101*/
+//For now
+int companyUIScenarioRBIndex = 0;
+if(scenarioMap == c_scenarioMap_Current){
+	companyUIScenarioRBIndex = 0;
+}
+else if(scenarioMap == c_scenarioMap_Future){
+	companyUIScenarioRBIndex = 1;
+}
+else{
+	throw new RuntimeException("Tried to call the setCompaniesScenario function with a non existing companyUI scenario");
+}
+for (GCUtility  GC : energyModel.UtilityConnections){
+	uI_Company.f_setCompanyUI(GC);
+	uI_Company.b_runningMainInterfaceScenarioSettings = true;
+	uI_Company.getRb_scenariosPrivateUI().setValue(companyUIScenarioRBIndex, true);
+	uI_Company.b_runningMainInterfaceScenarioSettings = false;
+}
+/*ALCODEEND*/}
+
+double f_initializeScenarioRadioButton()
+{/*ALCODESTART::1761117997540*/
+//Set the default visualisation of the radiobuttons
+Presentable presentable = this.presentation.getPresentable();
+boolean ispublic = true;
+double x = rb_scenarios_template.getX();
+double y = rb_scenarios_template.getY();
+double width = rb_scenarios_template.getWidth();
+double height = 0;//Not needed, automatically adjust by adding options
+Color textColor = Color.BLACK;
+boolean enabled = true;
+Font font = new Font("Dialog", Font.PLAIN, 14);
+boolean vertical = true;
+
+//Set words for the radiobutton options
+String[] RadioButtonOptions = f_getScenarioOptions();
+
+//Check if it contains the custom option
+boolean containsCustomOption = false;
+for(String scenarioOption : RadioButtonOptions){
+	if(scenarioOption.equals("Custom")){
+		containsCustomOption = true;
+	}
+}
+
+if(!containsCustomOption){
+	traceln("WARNING: Scenario radiobutton option 'Custom' was not included in the custom scenario options, it has automatically been added!");
+    RadioButtonOptions = Arrays.copyOf(RadioButtonOptions, RadioButtonOptions.length + 1);
+    RadioButtonOptions[RadioButtonOptions.length - 1] = "Custom";										
+}
+
+//Create the radiobutton and set the correct action.
+rb_scenarios = new ShapeRadioButtonGroup(presentable, ispublic, x ,y, width, height, textColor, enabled, font, vertical, RadioButtonOptions){
+	@Override
+	public void action() {
+		b_runningMainInterfaceScenarios = true;
+		f_finalizeSettingOfScenario(f_setSelectedScenario());
+	}
+};
+
+presentation.add(rb_scenarios);
+
+//For now: Adjust location of radiobutton title if 6 buttons
+if(c_loadedMapOverlayTypes.size() > 5){
+	gr_colorings.setY(-17);
+}
+/*ALCODEEND*/}
+
+String f_setSelectedScenario()
+{/*ALCODESTART::1761119066060*/
+//Default scenario switch statement, override this function if you want to add/change scenario options!
+String selected_scenario = "";
+
+switch(rb_scenarios.getValue()){
+	case 0:
+		selected_scenario = "Huidige situatie";
+		f_setScenario_Current();
+
+	break;
+	case 1:
+		if(project_data.project_type() == OL_ProjectType.BUSINESSPARK){
+			selected_scenario = "Toekomstplannen";
+			f_setScenario_Future();
+		}
+		else if(project_data.project_type() == OL_ProjectType.RESIDENTIAL){
+			selected_scenario = "Custom";
+			t_scenarioDescription.setText(t_scenario_custom);
+		}
+	break;
+	case 2:
+		selected_scenario = "Custom";
+		t_scenarioDescription.setText(t_scenario_custom);
+	break;
+	
+	default:
+		traceln("Unsupported scenario selected");
+}
+
+return selected_scenario;
+/*ALCODEEND*/}
+
+String[] f_getScenarioOptions()
+{/*ALCODESTART::1761119264046*/
+//OVERRIDE THIS FUNCTION IF YOU WANT TO ADJUST THE SCENARIO OPTIONS.
+// -> MAKE SURE TO ALWAYS INCLUDE A CUSTOM
+String[] scenarioOptions = null;
+if(project_data.project_type() == OL_ProjectType.BUSINESSPARK){
+	scenarioOptions = new String[]{"Huidige situatie", "Toekomstplannen", "Custom"};
+}
+else if(project_data.project_type() == OL_ProjectType.RESIDENTIAL){
+	scenarioOptions = new String[]{"Huidige situatie", "Custom"};
+}
+return scenarioOptions;
+/*ALCODEEND*/}
+
+double f_setScenario_Future()
+{/*ALCODESTART::1761119479231*/
+f_setCompaniesScenario(c_scenarioMap_Future);
+
+//Set specifc assets active/non-active
+f_projectSpecificScenarioSettings("Future");
+
+//Set the scenario text
+t_scenarioDescription.setText(t_scenario_future);
+/*ALCODEEND*/}
+
+double f_setScenario_Current()
+{/*ALCODESTART::1761119479233*/
+f_setCompaniesScenario(c_scenarioMap_Current);
+
+//Reset sliders for households
+if(project_data.project_type() == OL_ProjectType.RESIDENTIAL && p_residentialScenario_Current != null){
+	f_setResidentialScenario_Current();
+}
+
+
+//Set specifc assets active/non-active
+f_projectSpecificScenarioSettings("Current");
+
+//Set the scenario text
+t_scenarioDescription.setText(t_scenario_current);
+/*ALCODEEND*/}
+
+double f_resetSpecialSlidersAndButtons()
+{/*ALCODESTART::1761119842140*/
+uI_Tabs.pop_tabEHub.get(0).getButton_remove_nfato().action();
+
+
+
+
+
+
+
+//Project specific sliders and buttons reset
+f_resetProjectSpecificSlidersAndButtons();
+/*ALCODEEND*/}
+
+double f_finalizeSettingOfScenario(String selected_scenario)
+{/*ALCODESTART::1761120167723*/
+//Set scenario name text to the correct scenario
+t_scenarioName.setText("Scenario: " + selected_scenario);
+traceln("Selected scenario: \"" + selected_scenario + "\"");
+
+//Deselect the selected building, if selected GC is now paused
+if(c_selectedGridConnections.size()>0 && !c_selectedGridConnections.get(0).v_isActive){
+	f_clearSelectionAndSelectEnergyModel();
+}
+
+//Set boolean of running main interface scenario true
+b_runningMainInterfaceScenarios = false;
+
+if(!selected_scenario.equals("Custom")){
+	f_resetSettings();
+	
+	f_updateMainInterfaceSliders();
+	
+	//Colour recolor pv map again if it is active
+	if(c_loadedMapOverlayTypes.get(rb_mapOverlay.getValue()) == OL_MapOverlayTypes.PV_PRODUCTION){
+		rb_mapOverlay.setValue(c_loadedMapOverlayTypes.indexOf(OL_MapOverlayTypes.PV_PRODUCTION),true);
+	}
+}
+/*ALCODEEND*/}
+
+double f_resetProjectSpecificSlidersAndButtons()
+{/*ALCODESTART::1761121949197*/
+//OVERRIDE THIS FUNCTION IF YOU WANT TO RESET CERTAIN CUSTOM SLIDERS 
+//AND BUTTONS THAT ARE NOT IN THE GENERIC LOADERFACE
+/*ALCODEEND*/}
+
+double f_projectSpecificScenarioSettings(String selectedScenario)
+{/*ALCODESTART::1761122139097*/
+//OVERRIDE IF THIS IS NEEDED FOR YOUR SPECIFIC PROJECT
+
+//Example code:
+/*
+//Find specific scenario assets
+GridConnection testGC_new = findFirst(energyModel.UtilityConnections, GC -> GC.p_gridConnectionID.equals("testGC_nieuwBouw"));
+GIS_Building testBuilding_additionalBuilding = findFirst(energyModel.pop_GIS_Buildings, B -> B.p_id.equals("testBuilding_additionalBuilding"));
+
+switch(selectedScenario){
+	case "Current":
+		//Pause assets
+		testGC_new.f_setActive(false);			
+		testBuilding_additionalBuilding.gisRegion.setVisible(false);
+		break;
+	
+	case "Future":
+		//Unpause assets
+		testGC_new.f_setActive(true);			
+		testBuilding_additionalBuilding.gisRegion.setVisible(true);
+		break;
+}
+*/
+
+/*ALCODEEND*/}
+
+double f_setResidentialScenario_Current()
+{/*ALCODESTART::1761132028131*/
+////Electricity
+tabElectricity tabElec = uI_Tabs.pop_tabElectricity.get(0);
+
+double pv_pct = p_residentialScenario_Current.getHousesWithPV_pct();
+tabElec.sl_householdPVResidentialArea_pct.setValue(roundToInt(pv_pct), true);
+
+double battery_pct = p_residentialScenario_Current.getPvHousesWithBattery_pct();
+tabElec.sl_householdBatteriesResidentialArea_pct.setValue(roundToInt(battery_pct), true);
+
+//Electric cooking
+double cooking_pct = p_residentialScenario_Current.getCooking_pct();
+tabElec.sl_householdElectricCookingResidentialArea_pct.setValue(roundToInt(cooking_pct), true);
+
+//Consumption growth
+double electricityDemandIncrease_pct = p_residentialScenario_Current.getElectricityDemandIncrease_pct();
+tabElec.sl_electricityDemandIncreaseResidentialArea_pct.setValue(roundToInt(electricityDemandIncrease_pct), true);
+
+//Gridbatteries
+double averageNeighbourhoodBatterySize_kWh = p_residentialScenario_Current.getAverageNeighbourhoodBatterySize_kWh();
+tabElec.sl_gridBatteriesResidentialArea_kWh.setValue(averageNeighbourhoodBatterySize_kWh, true);
+
+////Heating
+tabHeating tabHeat = uI_Tabs.pop_tabHeating.get(0);
+
+double housesWithGasBurners_pct = p_residentialScenario_Current.getHousesWithGasBurners_pct();
+double housesWithHybridHeatpump_pct = p_residentialScenario_Current.getHousesWithHybridHeatpump_pct();
+double housesWithElectricHeatpump_pct = p_residentialScenario_Current.getHousesWithElectricHeatpump_pct();
+boolean cb_householdHTDistrictHeatingActive = p_residentialScenario_Current.getCb_householdHTDistrictHeatingActive();
+boolean cb_householdLTDistrictHeatingActive = p_residentialScenario_Current.getCb_householdLTDistrictHeatingActive();
+
+if(cb_householdHTDistrictHeatingActive || cb_householdLTDistrictHeatingActive){
+	tabHeat.sl_householdGasBurnerResidentialArea_pct.setValue(housesWithGasBurners_pct, false);
+	tabHeat.sl_householdHybridHeatpumpResidentialArea.setValue(housesWithHybridHeatpump_pct, false);
+	tabHeat.sl_householdElectricHeatPumpResidentialArea_pct.setValue(housesWithElectricHeatpump_pct, false);
+	if(cb_householdHTDistrictHeatingActive){
+		tabHeat.cb_householdHTDistrictHeatingResidentialArea.setSelected(cb_householdHTDistrictHeatingActive, false);
+		tabHeat.cb_householdLTDistrictHeatingResidentialArea.setSelected(cb_householdLTDistrictHeatingActive, true);
+	}
+	else if(cb_householdLTDistrictHeatingActive){
+		tabHeat.cb_householdHTDistrictHeatingResidentialArea.setSelected(cb_householdHTDistrictHeatingActive, false);
+		tabHeat.cb_householdLTDistrictHeatingResidentialArea.setSelected(cb_householdLTDistrictHeatingActive, true);
+	}
+}
+else{
+	tabHeat.sl_householdGasBurnerResidentialArea_pct.setValue(housesWithGasBurners_pct, true);
+	tabHeat.sl_householdHybridHeatpumpResidentialArea.setValue(housesWithHybridHeatpump_pct, true);
+	tabHeat.sl_householdElectricHeatPumpResidentialArea_pct.setValue(housesWithElectricHeatpump_pct, true);
+	tabHeat.cb_householdHTDistrictHeatingResidentialArea.setSelected(cb_householdHTDistrictHeatingActive, false);
+	tabHeat.cb_householdLTDistrictHeatingResidentialArea.setSelected(cb_householdLTDistrictHeatingActive, false);
+}
+
+
+//Houses with Airco
+double pctOfHousesWithAirco = p_residentialScenario_Current.getHousesWithAirco_pct();
+tabHeat.sl_householdAircoResidentialArea_pct.setValue(pctOfHousesWithAirco, true);
+
+//Houses with better isolation
+double pctOfHousesWithImprovedInsulation = p_residentialScenario_Current.getHousesWithImprovedInsulation_pct();
+tabHeat.sl_householdHeatDemandReductionResidentialArea_pct.setValue(roundToInt(pctOfHousesWithImprovedInsulation), true);
+
+//PT
+double nbHousesWithPT_pct = p_residentialScenario_Current.getNbHousesWithPT_pct();
+tabHeat.sl_rooftopPTHouses_pct.setValue(roundToInt(nbHousesWithPT_pct), true);
+
+
+
+////Mobility
+tabMobility tabMob = uI_Tabs.pop_tabMobility.get(0);
+
+//Private EV
+double privateEVs_pct = p_residentialScenario_Current.getPrivateEVs_pct();
+double privateEVsThatSupportV2G_pct = p_residentialScenario_Current.getPrivateEVsThatSupportV2G_pct();
+tabMob.sl_privateEVsResidentialArea_pct.setValue(roundToInt(privateEVs_pct), true);
+tabMob.sl_EVsThatSupportV2G_pct.setValue(roundToInt(privateEVsThatSupportV2G_pct), true);
+
+//Selected charging mode
+String selectedChargingAttitudeStringPrivateEV = p_residentialScenario_Current.getSelectedChargingAttitudeStringPrivateEVs();
+boolean V2GActivePrivateEV = p_residentialScenario_Current.getV2GActivePrivateEVs();
+
+tabMob.cb_chargingAttitudePrivateParkedCars.setValue(selectedChargingAttitudeStringPrivateEV, true);
+tabMob.cb_activateV2GPrivateParkedCars.setSelected(V2GActivePrivateEV, true);
+
+//Chargers
+double activePublicChargers_pct = p_residentialScenario_Current.getActivePublicChargers_pct();
+tabMob.sl_publicChargersResidentialArea_pct.setValue(roundToInt(activePublicChargers_pct), true);
+
+double V1G_pct = p_residentialScenario_Current.getChargersV1G_pct();
+double V2G_pct = p_residentialScenario_Current.getChargersV2G_pct();
+tabMob.sl_chargersThatSupportV1G_pct.setValue(roundToInt(V1G_pct), true);
+tabMob.sl_chargersThatSupportV2G_pct.setValue(roundToInt(V2G_pct), true);
+
+//Selected charging mode
+String selectedChargingAttitudeStringChargers = p_residentialScenario_Current.getSelectedChargingAttitudeStringChargers();
+boolean V2GActiveChargers = p_residentialScenario_Current.getV2GActiveChargers();
+
+tabMob.cb_chargingAttitudePrivatePublicChargers.setValue(selectedChargingAttitudeStringChargers, true);
+tabMob.cb_activateV2GPublicChargers.setSelected(V2GActiveChargers, true);
+/*ALCODEEND*/}
+
+double f_storeResidentialScenario_Current()
+{/*ALCODESTART::1761134737334*/
+//Create the class that will store the initial slider settings of a residential model
+p_residentialScenario_Current = new J_SliderSettings_Residential();
+
+////Electricity
+if(uI_Tabs.pop_tabElectricity.size() > 0){
+	tabElectricity tabElec = uI_Tabs.pop_tabElectricity.get(0);
+	
+	double housesWithPV_pct = tabElec.sl_householdPVResidentialArea_pct.getValue();
+	p_residentialScenario_Current.setHousesWithPV_pct(housesWithPV_pct);
+	
+	double pvHousesWithBattery_pct = tabElec.sl_householdBatteriesResidentialArea_pct.getValue();
+	p_residentialScenario_Current.setPvHousesWithBattery_pct(pvHousesWithBattery_pct);
+	
+	
+	//Electric cooking
+	double cooking_pct = tabElec.sl_householdElectricCookingResidentialArea_pct.getValue();
+	p_residentialScenario_Current.setCooking_pct(cooking_pct);
+	
+	//Consumption growth
+	double electricityDemandIncrease_pct = tabElec.sl_electricityDemandIncreaseResidentialArea_pct.getValue();
+	p_residentialScenario_Current.setElectricityDemandIncrease_pct(electricityDemandIncrease_pct);
+	
+	//Gridbatteries
+	double averageNeighbourhoodBatterySize_kWh = tabElec.sl_gridBatteriesResidentialArea_kWh.getValue();
+	p_residentialScenario_Current.setAverageNeighbourhoodBatterySize_kWh(averageNeighbourhoodBatterySize_kWh);
+}
+
+////Heating
+if(uI_Tabs.pop_tabHeating.size() > 0){
+	tabHeating tabHeat = uI_Tabs.pop_tabHeating.get(0);
+	
+	double housesWithGasBurners_pct = tabHeat.sl_householdGasBurnerResidentialArea_pct.getValue();
+	double housesWithHybridHeatpump_pct = tabHeat.sl_householdHybridHeatpumpResidentialArea.getValue();
+	double housesWithElectricHeatpump_pct = tabHeat.sl_householdElectricHeatPumpResidentialArea_pct.getValue();
+	boolean cb_householdHTDistrictHeatingActive = tabHeat.cb_householdHTDistrictHeatingResidentialArea.isSelected();
+	boolean cb_householdLTDistrictHeatingActive = tabHeat.cb_householdLTDistrictHeatingResidentialArea.isSelected();
+	
+	p_residentialScenario_Current.setHousesWithGasBurners_pct(housesWithGasBurners_pct);
+	p_residentialScenario_Current.setHousesWithHybridHeatpump_pct(housesWithHybridHeatpump_pct);
+	p_residentialScenario_Current.setHousesWithElectricHeatpump_pct(housesWithElectricHeatpump_pct);
+	p_residentialScenario_Current.setCb_householdHTDistrictHeatingActive(cb_householdHTDistrictHeatingActive);
+	p_residentialScenario_Current.setCb_householdLTDistrictHeatingActive(cb_householdLTDistrictHeatingActive);
+	
+	
+	//Houses with Airco
+	double housesWithAirco_pct = tabHeat.sl_householdAircoResidentialArea_pct.getValue();
+	p_residentialScenario_Current.setHousesWithAirco_pct(housesWithAirco_pct);
+	
+	//Houses with better isolation
+	double housesWithImprovedInsulation_pct = tabHeat.sl_householdHeatDemandReductionResidentialArea_pct.getValue();
+	p_residentialScenario_Current.setHousesWithImprovedInsulation_pct(housesWithImprovedInsulation_pct);
+	
+	//PT
+	double nbHousesWithPT_pct = tabHeat.sl_rooftopPTHouses_pct.getValue();
+	p_residentialScenario_Current.setNbHousesWithPT_pct(nbHousesWithPT_pct);
+}
+
+////Mobility
+if(uI_Tabs.pop_tabMobility.size() > 0){
+	tabMobility tabMob = uI_Tabs.pop_tabMobility.get(0);
+	
+	//Private EV
+	double privateEVs_pct = tabMob.sl_privateEVsResidentialArea_pct.getValue();
+	double privateEVsThatSupportV2G_pct = tabMob.sl_EVsThatSupportV2G_pct.getValue();
+	p_residentialScenario_Current.setPrivateEVs_pct(privateEVs_pct);
+	p_residentialScenario_Current.setPrivateEVsThatSupportV2G_pct(privateEVsThatSupportV2G_pct);
+	
+	//Selected charging mode
+	String selectedChargingAttitudeStringPrivateEVs = tabMob.cb_chargingAttitudePrivateParkedCars.getValue();
+	boolean V2GActivePrivateEVs = tabMob.cb_activateV2GPrivateParkedCars.isSelected();
+	p_residentialScenario_Current.setSelectedChargingAttitudeStringPrivateEVs(selectedChargingAttitudeStringPrivateEVs);
+	p_residentialScenario_Current.setV2GActivePrivateEVs(V2GActivePrivateEVs);
+	
+	//Chargers
+	double activePublicChargers_pct = tabMob.sl_publicChargersResidentialArea_pct.getValue();
+	double chargersV1G_pct = tabMob.sl_chargersThatSupportV1G_pct.getValue();
+	double chargersV2G_pct = tabMob.sl_chargersThatSupportV2G_pct.getValue();
+	
+	p_residentialScenario_Current.setActivePublicChargers_pct(activePublicChargers_pct);
+	p_residentialScenario_Current.setChargersV1G_pct(chargersV1G_pct);
+	p_residentialScenario_Current.setChargersV2G_pct(chargersV2G_pct);
+	
+	//Selected charging mode
+	String selectedChargingAttitudeStringChargers = tabMob.cb_chargingAttitudePrivatePublicChargers.getValue();
+	boolean V2GActiveChargers = tabMob.cb_activateV2GPublicChargers.isSelected();
+	p_residentialScenario_Current.setSelectedChargingAttitudeStringChargers(selectedChargingAttitudeStringChargers);
+	p_residentialScenario_Current.setV2GActiveChargers(V2GActiveChargers);
+}
+/*ALCODEEND*/}
+
diff --git a/_alp/Agents/Zero_Interface/Code/Functions.xml b/_alp/Agents/Zero_Interface/Code/Functions.xml
index e4bec3ec..40b38bc8 100644
--- a/_alp/Agents/Zero_Interface/Code/Functions.xml
+++ b/_alp/Agents/Zero_Interface/Code/Functions.xml
@@ -221,23 +221,6 @@
 		<ShowLabel>true</ShowLabel>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
-	<Function AccessType="default" StaticFunction="false">
-		<ReturnModificator>VOID</ReturnModificator>
-		<ReturnType>double</ReturnType>
-		<Id>1708595258540</Id>
-		<Name><![CDATA[f_createPrivateCompanyUI]]></Name>
-		<Description><![CDATA[function used to create the private ui for each company]]></Description>
-		<X>-260</X>
-		<Y>420</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Body xmlns:al="http://anylogic.com"/>
-	</Function>
 	<Function AccessType="public" StaticFunction="false">
 		<ReturnModificator>VOID</ReturnModificator>
 		<ReturnType>double</ReturnType>
@@ -647,54 +630,6 @@
 		<ShowLabel>true</ShowLabel>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
-	<Function AccessType="protected" StaticFunction="false">
-		<ReturnModificator>VOID</ReturnModificator>
-		<ReturnType>double</ReturnType>
-		<Id>1724857887019</Id>
-		<Name><![CDATA[f_createAdditionalUIs]]></Name>
-		<X>-280</X>
-		<Y>400</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Body xmlns:al="http://anylogic.com"/>
-	</Function>
-	<Function AccessType="default" StaticFunction="false">
-		<ReturnModificator>VOID</ReturnModificator>
-		<ReturnType>double</ReturnType>
-		<Id>1724857983890</Id>
-		<Name><![CDATA[f_createHydrogenUI]]></Name>
-		<X>-260</X>
-		<Y>490</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Body xmlns:al="http://anylogic.com"/>
-	</Function>
-	<Function AccessType="default" StaticFunction="false">
-		<ReturnModificator>VOID</ReturnModificator>
-		<ReturnType>double</ReturnType>
-		<Id>1724858039724</Id>
-		<Name><![CDATA[f_createBatteryUI]]></Name>
-		<X>-260</X>
-		<Y>540</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Body xmlns:al="http://anylogic.com"/>
-	</Function>
 	<Function AccessType="protected" StaticFunction="false">
 		<ReturnModificator>VOID</ReturnModificator>
 		<ReturnType>double</ReturnType>
@@ -808,7 +743,7 @@
 		<ReturnType>double</ReturnType>
 		<Id>1734442458629</Id>
 		<Name><![CDATA[f_applyFilter]]></Name>
-		<X>-1455</X>
+		<X>-1575</X>
 		<Y>130</Y>
 		<Label>
 			<X>10</X>
@@ -832,7 +767,7 @@
 		<ReturnType>double</ReturnType>
 		<Id>1734442462084</Id>
 		<Name><![CDATA[f_setFilter]]></Name>
-		<X>-1455</X>
+		<X>-1575</X>
 		<Y>60</Y>
 		<Label>
 			<X>10</X>
@@ -852,7 +787,7 @@
 		<ReturnType>double</ReturnType>
 		<Id>1734445008646</Id>
 		<Name><![CDATA[f_removeAllFilters]]></Name>
-		<X>-1450</X>
+		<X>-1570</X>
 		<Y>525</Y>
 		<Label>
 			<X>10</X>
@@ -868,7 +803,7 @@
 		<ReturnType>double</ReturnType>
 		<Id>1734447122780</Id>
 		<Name><![CDATA[f_selectGridLoop]]></Name>
-		<X>-1410</X>
+		<X>-1530</X>
 		<Y>310</Y>
 		<Label>
 			<X>10</X>
@@ -892,7 +827,7 @@
 		<ReturnType>double</ReturnType>
 		<Id>1734448628428</Id>
 		<Name><![CDATA[f_filterCompanies]]></Name>
-		<X>-1430</X>
+		<X>-1550</X>
 		<Y>150</Y>
 		<Label>
 			<X>10</X>
@@ -912,7 +847,7 @@
 		<ReturnType>double</ReturnType>
 		<Id>1734448687355</Id>
 		<Name><![CDATA[f_filterHouses]]></Name>
-		<X>-1430</X>
+		<X>-1550</X>
 		<Y>170</Y>
 		<Label>
 			<X>10</X>
@@ -932,7 +867,7 @@
 		<ReturnType>double</ReturnType>
 		<Id>1734448688472</Id>
 		<Name><![CDATA[f_filterDetailed]]></Name>
-		<X>-1430</X>
+		<X>-1550</X>
 		<Y>190</Y>
 		<Label>
 			<X>10</X>
@@ -952,7 +887,7 @@
 		<ReturnType>double</ReturnType>
 		<Id>1734448689519</Id>
 		<Name><![CDATA[f_filterEstimated]]></Name>
-		<X>-1430</X>
+		<X>-1550</X>
 		<Y>210</Y>
 		<Label>
 			<X>10</X>
@@ -972,7 +907,7 @@
 		<ReturnType>double</ReturnType>
 		<Id>1734448690487</Id>
 		<Name><![CDATA[f_filterHasPV]]></Name>
-		<X>-1430</X>
+		<X>-1550</X>
 		<Y>230</Y>
 		<Label>
 			<X>10</X>
@@ -992,7 +927,7 @@
 		<ReturnType>double</ReturnType>
 		<Id>1734448691508</Id>
 		<Name><![CDATA[f_filterHasTransport]]></Name>
-		<X>-1430</X>
+		<X>-1550</X>
 		<Y>250</Y>
 		<Label>
 			<X>10</X>
@@ -1012,7 +947,7 @@
 		<ReturnType>double</ReturnType>
 		<Id>1734451505770</Id>
 		<Name><![CDATA[f_removeFilter]]></Name>
-		<X>-1455</X>
+		<X>-1575</X>
 		<Y>105</Y>
 		<Label>
 			<X>10</X>
@@ -1036,7 +971,7 @@
 		<ReturnType>double</ReturnType>
 		<Id>1734517589341</Id>
 		<Name><![CDATA[f_filterGridLoops]]></Name>
-		<X>-1430</X>
+		<X>-1550</X>
 		<Y>290</Y>
 		<Label>
 			<X>10</X>
@@ -1100,7 +1035,7 @@
 		<ReturnType>double</ReturnType>
 		<Id>1737653178011</Id>
 		<Name><![CDATA[f_selectNeighborhood]]></Name>
-		<X>-1410</X>
+		<X>-1530</X>
 		<Y>370</Y>
 		<Label>
 			<X>10</X>
@@ -1124,7 +1059,7 @@
 		<ReturnType>double</ReturnType>
 		<Id>1737653178013</Id>
 		<Name><![CDATA[f_filterNeighborhoods]]></Name>
-		<X>-1430</X>
+		<X>-1550</X>
 		<Y>350</Y>
 		<Label>
 			<X>10</X>
@@ -1164,7 +1099,7 @@
 		<ReturnType>double</ReturnType>
 		<Id>1742226689515</Id>
 		<Name><![CDATA[f_filterManualSelection]]></Name>
-		<X>-1430</X>
+		<X>-1550</X>
 		<Y>415</Y>
 		<Label>
 			<X>10</X>
@@ -1184,7 +1119,7 @@
 		<ReturnType>double</ReturnType>
 		<Id>1742226787560</Id>
 		<Name><![CDATA[f_selectManualFilteredGC]]></Name>
-		<X>-1410</X>
+		<X>-1530</X>
 		<Y>435</Y>
 		<Label>
 			<X>10</X>
@@ -1264,7 +1199,7 @@
 		<ReturnType>double</ReturnType>
 		<Id>1743665953113</Id>
 		<Name><![CDATA[f_setInfoText]]></Name>
-		<X>-1900</X>
+		<X>-2010</X>
 		<Y>120</Y>
 		<Label>
 			<X>10</X>
@@ -1297,7 +1232,7 @@
 		<Id>1744894817569</Id>
 		<Name><![CDATA[f_getGroupPositionIteration]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>-1870</X>
+		<X>-1980</X>
 		<Y>265</Y>
 		<Label>
 			<X>10</X>
@@ -1318,7 +1253,7 @@
 		<Id>1744894817571</Id>
 		<Name><![CDATA[f_getAbsolutePosition]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>-1890</X>
+		<X>-2000</X>
 		<Y>240</Y>
 		<Label>
 			<X>10</X>
@@ -1339,7 +1274,7 @@
 		<Id>1744894817573</Id>
 		<Name><![CDATA[f_getPresentationPositionIteration]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>-1870</X>
+		<X>-1980</X>
 		<Y>285</Y>
 		<Label>
 			<X>10</X>
@@ -1534,7 +1469,7 @@
 		<Id>1750261221085</Id>
 		<Name><![CDATA[f_setTrafoText]]></Name>
 		<X>50</X>
-		<Y>1660</Y>
+		<Y>1620</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2240,8 +2175,8 @@
 		<ReturnType>ShapeRadioButtonGroup</ReturnType>
 		<Id>1756369604291</Id>
 		<Name><![CDATA[f_getScenarioButtons]]></Name>
-		<X>-1010</X>
-		<Y>-70</Y>
+		<X>-1020</X>
+		<Y>100</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2328,7 +2263,7 @@
 		<ReturnType>double</ReturnType>
 		<Id>1760085891920</Id>
 		<Name><![CDATA[f_filterHasEV]]></Name>
-		<X>-1430</X>
+		<X>-1550</X>
 		<Y>270</Y>
 		<Label>
 			<X>10</X>
@@ -2343,4 +2278,240 @@
 		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1760955904715</Id>
+		<Name><![CDATA[f_initializeAdditionalVehicles]]></Name>
+		<X>85</X>
+		<Y>-520</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1760978860758</Id>
+		<Name><![CDATA[f_createAdditionalUIs]]></Name>
+		<X>-280</X>
+		<Y>400</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="protected" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1761060882101</Id>
+		<Name><![CDATA[f_setCompaniesScenario]]></Name>
+		<X>-1180</X>
+		<Y>445</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[scenarioMap]]></Name>
+			<Type><![CDATA[LinkedHashMap]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1761117997540</Id>
+		<Name><![CDATA[f_initializeScenarioRadioButton]]></Name>
+		<X>-1180</X>
+		<Y>60</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="protected" StaticFunction="false">
+		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
+		<ReturnType>String</ReturnType>
+		<Id>1761119066060</Id>
+		<Name><![CDATA[f_setSelectedScenario]]></Name>
+		<X>-1180</X>
+		<Y>180</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="protected" StaticFunction="false">
+		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
+		<ReturnType>String[]</ReturnType>
+		<Id>1761119264046</Id>
+		<Name><![CDATA[f_getScenarioOptions]]></Name>
+		<X>-1150</X>
+		<Y>80</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="protected" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1761119479231</Id>
+		<Name><![CDATA[f_setScenario_Future]]></Name>
+		<X>-1180</X>
+		<Y>270</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="protected" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1761119479233</Id>
+		<Name><![CDATA[f_setScenario_Current]]></Name>
+		<X>-1180</X>
+		<Y>225</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="protected" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1761119842140</Id>
+		<Name><![CDATA[f_resetSpecialSlidersAndButtons]]></Name>
+		<X>-1180</X>
+		<Y>365</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="protected" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1761120167723</Id>
+		<Name><![CDATA[f_finalizeSettingOfScenario]]></Name>
+		<X>-1180</X>
+		<Y>200</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[selected_scenario]]></Name>
+			<Type><![CDATA[String]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="protected" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1761121949197</Id>
+		<Name><![CDATA[f_resetProjectSpecificSlidersAndButtons]]></Name>
+		<X>-1160</X>
+		<Y>385</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="protected" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1761122139097</Id>
+		<Name><![CDATA[f_projectSpecificScenarioSettings]]></Name>
+		<X>-1180</X>
+		<Y>415</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[selectedScenario]]></Name>
+			<Type><![CDATA[String]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="protected" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1761132028131</Id>
+		<Name><![CDATA[f_setResidentialScenario_Current]]></Name>
+		<X>-1180</X>
+		<Y>465</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="protected" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1761134737334</Id>
+		<Name><![CDATA[f_storeResidentialScenario_Current]]></Name>
+		<X>-1180</X>
+		<Y>130</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
 </Functions>
diff --git a/_alp/Agents/Zero_Interface/EmbeddedObjects.xml b/_alp/Agents/Zero_Interface/EmbeddedObjects.xml
index 9b4bdde9..852fc660 100644
--- a/_alp/Agents/Zero_Interface/EmbeddedObjects.xml
+++ b/_alp/Agents/Zero_Interface/EmbeddedObjects.xml
@@ -2,9 +2,9 @@
 <EmbeddedObjects>
 	<EmbeddedObject>
 		<Id>1708522361909</Id>
-		<Name><![CDATA[ui_companies]]></Name>
-		<X>-240</X>
-		<Y>440</Y>
+		<Name><![CDATA[pop_UI_Company]]></Name>
+		<X>-260</X>
+		<Y>460</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -28,16 +28,16 @@
 				<Name><![CDATA[p_companyName]]></Name>
 			</Parameter>
 			<Parameter>
-				<Name><![CDATA[p_amountOfGC]]></Name>
+				<Name><![CDATA[p_maxAddedVehicles]]></Name>
 			</Parameter>
 			<Parameter>
-				<Name><![CDATA[p_amountOfBuildings]]></Name>
+				<Name><![CDATA[p_scenarioSettings_Current]]></Name>
 			</Parameter>
 			<Parameter>
-				<Name><![CDATA[p_company]]></Name>
+				<Name><![CDATA[p_scenarioSettings_Future]]></Name>
 			</Parameter>
 			<Parameter>
-				<Name><![CDATA[p_maxAddedVehicles]]></Name>
+				<Name><![CDATA[p_gridConnection]]></Name>
 			</Parameter>
 		</Parameters>
 		<ReplicationFlag>true</ReplicationFlag>
@@ -64,7 +64,7 @@
 		<LocationNameCode Class="CodeValue">
 			<Code><![CDATA[""]]></Code>
 		</LocationNameCode>
-		<InitializationType>SPECIFIED_NUMBER</InitializationType>
+		<InitializationType>EMPTY</InitializationType>
 		<InitializationDatabaseTableQuery>
 			<Id>1658477089963</Id>
 			<TableReference/>
@@ -74,9 +74,9 @@
 	</EmbeddedObject>
 	<EmbeddedObject>
 		<Id>1709049456144</Id>
-		<Name><![CDATA[ui_Battery]]></Name>
-		<X>-240</X>
-		<Y>560</Y>
+		<Name><![CDATA[pop_UI_Battery]]></Name>
+		<X>-260</X>
+		<Y>540</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -234,11 +234,11 @@
 	</EmbeddedObject>
 	<EmbeddedObject>
 		<Id>1717506326727</Id>
-		<Name><![CDATA[ui_Hydrogen]]></Name>
-		<X>-240</X>
-		<Y>510</Y>
+		<Name><![CDATA[pop_UI_Hydrogen]]></Name>
+		<X>-260</X>
+		<Y>500</Y>
 		<Label>
-			<X>15</X>
+			<X>10</X>
 			<Y>0</Y>
 		</Label>
 		<PublicFlag>false</PublicFlag>
@@ -345,11 +345,11 @@
 	</EmbeddedObject>
 	<EmbeddedObject>
 		<Id>1722252541830</Id>
-		<Name><![CDATA[uI_EnergyHub]]></Name>
-		<X>2240</X>
-		<Y>-2220</Y>
+		<Name><![CDATA[pop_UI_EnergyHub]]></Name>
+		<X>-260</X>
+		<Y>420</Y>
 		<Label>
-			<X>20</X>
+			<X>10</X>
 			<Y>0</Y>
 		</Label>
 		<PublicFlag>false</PublicFlag>
@@ -381,9 +381,9 @@
 				<Name><![CDATA[p_energyHubLineStyle]]></Name>
 			</Parameter>
 		</Parameters>
-		<ReplicationFlag>false</ReplicationFlag>
+		<ReplicationFlag>true</ReplicationFlag>
 		<Replication Class="CodeValue">
-			<Code><![CDATA[100]]></Code>
+			<Code><![CDATA[0]]></Code>
 		</Replication>
 		<CollectionType>ARRAY_LIST_BASED</CollectionType>
 		<InitialLocationType>XYZ</InitialLocationType>
@@ -396,7 +396,7 @@
 		<LocationNameCode Class="CodeValue">
 			<Code><![CDATA[""]]></Code>
 		</LocationNameCode>
-		<InitializationType>SPECIFIED_NUMBER</InitializationType>
+		<InitializationType>EMPTY</InitializationType>
 		<InitializationDatabaseTableQuery>
 			<Id>0</Id>
 			<TableReference/>
diff --git a/_alp/Agents/Zero_Interface/Levels/Level.level.xml b/_alp/Agents/Zero_Interface/Levels/Level.level.xml
index 6fa99201..74bb7e12 100644
--- a/_alp/Agents/Zero_Interface/Levels/Level.level.xml
+++ b/_alp/Agents/Zero_Interface/Levels/Level.level.xml
@@ -101,7 +101,7 @@
 		<Presentation>
 			<EmbeddedObjectPresentation>
 				<Id>1747229957336</Id>
-				<Name><![CDATA[uI_EnergyHub_presentation]]></Name>
+				<Name><![CDATA[pop_UI_EnergyHub_presentation]]></Name>
 				<X>0</X>
 				<Y>0</Y>
 				<Label>
@@ -1005,35 +1005,21 @@ v_clickedObjectText</TextCode>
 	switch(v_clickedObjectType){
 	
 		case BUILDING:
-			UI_company companyUI = c_companyUIs.get(v_connectionOwnerIndexNr);
-			
-			//Connect resultsUI of the main with resultsUI of CompanyUI
-			companyUI.f_updateUIResultsCompanyUI();	
-	
-			//Set sliders to the correct GC if there are more than 1 GC
-			if(companyUI.c_ownedGridConnections.size()&gt;1){
-				GridConnection selectedGC = findFirst(companyUI.c_ownedGridConnections, GC -&gt; GC == c_selectedGridConnections.get(0));  
-				companyUI.GCnr_selection.setValue(companyUI.c_ownedGridConnections.indexOf(selectedGC), true);
-			}
-			else{
-				companyUI.uI_Results.f_setAllCharts();
-				companyUI.f_getNFATOValues();
-			}
-			
-			//Go to the companyUI view
-			c_companyUIs.get(v_connectionOwnerIndexNr).va_companyUI.navigateTo();
-			v_currentViewArea = c_companyUIs.get(v_connectionOwnerIndexNr).va_companyUI;
-			
+			uI_Company.f_setCompanyUI(c_selectedGridConnections.get(0));
+			uI_Company.va_companyUI.navigateTo();
+			v_currentViewArea = uI_Company.va_companyUI;
 			break;
 		
 		case ELECTROLYSER:
-			ui_Hydrogen.get(0).va_hydrogenUI.navigateTo();
-			v_currentViewArea = ui_Hydrogen.get(0).va_hydrogenUI;
+			//uI_Hydrogen.f_setHydrogenUI(c_selectedGridConnections.get(0));
+			uI_Hydrogen.va_hydrogenUI.navigateTo();
+			v_currentViewArea = uI_Hydrogen.va_hydrogenUI;
 			break;
 		
 		case BATTERY:
-			ui_Battery.get(0).va_batteryUI.navigateTo();
-			v_currentViewArea = ui_Battery.get(0).va_batteryUI;
+			//uI_Battery.f_setBatteryUI(c_selectedGridConnections.get(0));
+			uI_Battery.va_batteryUI.navigateTo();
+			v_currentViewArea = uI_Battery.va_batteryUI;
 			break;
 		
 		case SOLARFARM:
@@ -1055,7 +1041,7 @@ else{
 	</Control>
 	<Text>
 		<Id>1708595212229</Id>
-		<Name><![CDATA[t_privateUI]]></Name>
+		<Name><![CDATA[txt_additionalUIs]]></Name>
 		<X>-290</X>
 		<Y>370</Y>
 		<Label>
@@ -1070,7 +1056,7 @@ else{
 		<Z>0</Z>
 		<Rotation>0.0</Rotation>
 		<Color>-16777216</Color>
-		<Text><![CDATA[Private UI creation:]]></Text>
+		<Text><![CDATA[Additional UIs:]]></Text>
 		<Font>
 			<Name><![CDATA[SansSerif]]></Name>
 			<Size>14</Size>
@@ -1081,7 +1067,7 @@ else{
 	<Control Type="RadioButtons">
 		<EmbeddedIcon>false</EmbeddedIcon>
 		<Id>1709718299889</Id>
-		<Name><![CDATA[rb_scenarios]]></Name>
+		<Name><![CDATA[rb_scenarios_template]]></Name>
 		<X>19.333</X>
 		<Y>144.667</Y>
 		<Label>
@@ -1095,60 +1081,21 @@ else{
 		<BasicProperties Width="380" Height="135">
 			<EmbeddedIcon>false</EmbeddedIcon>
 			<TextColor>-16777216</TextColor>
+			<VisibleCode>false</VisibleCode>
 			<Enabled>true</Enabled>
-			<ActionCode>//Set selected scenario string
-String selected_scenario = "";
-
-//Disable traceln
-PrintStream originalPrintStream = f_disableTraceln();
-
-//YOUR CODE FOR SCENARIO SWITCHING HERE!!!!
-switch(rb_scenarios.getValue()){
-	
-	case 0:
-		selected_scenario = "1";
-		//f_setScenario_1();
-	break;
-	
-	case 1:
-		selected_scenario = "2";
-		//f_setScenario_2();
-	break;
-	
-	case 2:
-		selected_scenario = "3";
-		//f_setScenario_3();
-	break;
-	
-	case 3:
-		selected_scenario = "4";
-		//f_setScenario_4();
-	break;
-	
-	case 4:
-		selected_scenario = "Custom";
-		t_scenarioDescription.setText("");
-	break;
-	
-	default:
-		traceln("Unsupported scenario selected");
-}
-
-//Enable traceln
-f_enableTraceln(originalPrintStream);
+			<ActionCode>//Set boolean of running main interface scenario true
+b_runningMainInterfaceScenarios = true;
 
-//Set scenario name text to the correct scenario
-t_scenarioName.setText("Scenario: " + selected_scenario);
-traceln("Selected scenario: \"" + selected_scenario + "\"");</ActionCode>
+//Set selected scenario
+f_finalizeSettingOfScenario(f_setSelectedScenario());
+</ActionCode>
 		</BasicProperties>
 		<ExtendedProperties>
 			<Font Name="Dialog" Size="14" Style="0"/>
 			<DefaultValueCode>0</DefaultValueCode>
 			<Orientation>VERTICAL</Orientation>
-			<Button>S1</Button>
-			<Button>S2</Button>
-			<Button>S3</Button>
-			<Button>S4</Button>
+			<Button>Huidige situatie</Button>
+			<Button>Toekomstplannen</Button>
 			<Button>Custom</Button>
 			<LinkTo>false</LinkTo>
 		</ExtendedProperties>
@@ -1889,7 +1836,7 @@ v_selectedGridConnectionIndex &gt; 0 ?
 	<Rectangle>
 		<Id>1724419174775</Id>
 		<Name><![CDATA[rect_scenarioText]]></Name>
-		<X>-1060</X>
+		<X>-1210</X>
 		<Y>0</Y>
 		<Label>
 			<X>10</X>
@@ -1906,8 +1853,8 @@ v_selectedGridConnectionIndex &gt; 0 ?
 		<LineColor>-16777216</LineColor>
 		<LineMaterial>null</LineMaterial>
 		<LineStyle>SOLID</LineStyle>
-		<Width>299.107</Width>
-		<Height>330</Height>
+		<Width>460</Width>
+		<Height>700</Height>
 		<Rotation>0.0</Rotation>
 		<FillColor>-1</FillColor>
 		<FillMaterial>null</FillMaterial>
@@ -1915,7 +1862,7 @@ v_selectedGridConnectionIndex &gt; 0 ?
 	<Text>
 		<Id>1724419379552</Id>
 		<Name><![CDATA[txt_scenarioFunctions]]></Name>
-		<X>-1040</X>
+		<X>-1190</X>
 		<Y>20</Y>
 		<Label>
 			<X>0</X>
@@ -1933,7 +1880,7 @@ v_selectedGridConnectionIndex &gt; 0 ?
 		<Font>
 			<Name><![CDATA[SansSerif]]></Name>
 			<Size>14</Size>
-			<Style>0</Style>
+			<Style>1</Style>
 		</Font>
 		<Alignment>LEFT</Alignment>
 	</Text>
@@ -2164,7 +2111,7 @@ else{
 	<Rectangle>
 		<Id>1734442437753</Id>
 		<Name><![CDATA[rect_filterFunctions]]></Name>
-		<X>-1500</X>
+		<X>-1620</X>
 		<Y>0</Y>
 		<Label>
 			<X>10</X>
@@ -2215,7 +2162,7 @@ else{
 	<Text>
 		<Id>1734443865835</Id>
 		<Name><![CDATA[txt_filterFunctions]]></Name>
-		<X>-1460</X>
+		<X>-1580</X>
 		<Y>20</Y>
 		<Label>
 			<X>0</X>
@@ -2277,7 +2224,7 @@ else{
 	<Group>
 		<Id>1734444441402</Id>
 		<Name><![CDATA[gr_filterInterface]]></Name>
-		<X>-1350</X>
+		<X>-1470</X>
 		<Y>750</Y>
 		<Label>
 			<X>10</X>
@@ -3194,7 +3141,7 @@ fileChooser_exportBalanceLoadSelectedEnergyCoop.setEnabled(true);</ActionCode>
 	<Rectangle>
 		<Id>1746110300955</Id>
 		<Name><![CDATA[rect_ìnfoBubbleFunctions]]></Name>
-		<X>-1960</X>
+		<X>-2070</X>
 		<Y>0</Y>
 		<Label>
 			<X>10</X>
@@ -3220,7 +3167,7 @@ fileChooser_exportBalanceLoadSelectedEnergyCoop.setEnabled(true);</ActionCode>
 	<Text>
 		<Id>1746110305368</Id>
 		<Name><![CDATA[txt_infoBubbleFunctions]]></Name>
-		<X>-1930</X>
+		<X>-2040</X>
 		<Y>30</Y>
 		<Label>
 			<X>0</X>
@@ -3395,7 +3342,7 @@ fileChooser_exportBalanceLoadSelectedEnergyCoop.setEnabled(true);</ActionCode>
 	<Group>
 		<Id>1746110287596</Id>
 		<Name><![CDATA[gr_infoText]]></Name>
-		<X>-2150</X>
+		<X>-2260</X>
 		<Y>360</Y>
 		<Label>
 			<X>10</X>
@@ -7219,7 +7166,7 @@ officia deserunt mollit anim id est laborum."]]></Text>
 					<Group>
 						<Id>1750093126455</Id>
 						<Name><![CDATA[gr_extendedLegend]]></Name>
-						<X>140</X>
+						<X>170</X>
 						<Y>960</Y>
 						<Label>
 							<X>10</X>
@@ -7229,8 +7176,8 @@ officia deserunt mollit anim id est laborum."]]></Text>
 						<PresentationFlag>false</PresentationFlag>
 						<ShowLabel>false</ShowLabel>
 						<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
-						<XCode>140</XCode>
-						<YCode>0</YCode>
+						<XCode>120</XCode>
+						<YCode>-5</YCode>
 						<EmbeddedIcon>false</EmbeddedIcon>
 						<Z>0</Z>
 						<Rotation>0.0</Rotation>
@@ -7238,6 +7185,7 @@ officia deserunt mollit anim id est laborum."]]></Text>
 							<Rectangle>
 								<Id>1750093048056</Id>
 								<Name><![CDATA[rect_extendedLegend_line]]></Name>
+								<ExcludeFromBuild>true</ExcludeFromBuild>
 								<X>-100</X>
 								<Y>-100</Y>
 								<Label>
@@ -7251,22 +7199,49 @@ officia deserunt mollit anim id est laborum."]]></Text>
 								<EmbeddedIcon>false</EmbeddedIcon>
 								<Z>0</Z>
 								<ZHeight>10</ZHeight>
-								<LineWidth>0</LineWidth>
+								<LineWidth>1</LineWidth>
 								<LineColor/>
 								<LineMaterial>null</LineMaterial>
 								<LineStyle>SOLID</LineStyle>
 								<Width>200</Width>
-								<Height>200</Height>
+								<Height>205</Height>
 								<Rotation>0.0</Rotation>
-								<FillColor>-1644806</FillColor>
-								<FillColorCode>zenmocolor_blue1.getFillColor()</FillColorCode>
+								<FillColor>-542254</FillColor>
+								<FillColorCode>rect_legendaBackground.getFillColor()</FillColorCode>
+								<FillMaterial>null</FillMaterial>
+							</Rectangle>
+							<Rectangle>
+								<Id>1760980017754</Id>
+								<Name><![CDATA[rect_extendedLegendLine]]></Name>
+								<X>-114</X>
+								<Y>-85</Y>
+								<Label>
+									<X>10</X>
+									<Y>10</Y>
+								</Label>
+								<PublicFlag>true</PublicFlag>
+								<PresentationFlag>true</PresentationFlag>
+								<ShowLabel>false</ShowLabel>
+								<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
+								<EmbeddedIcon>false</EmbeddedIcon>
+								<Z>0</Z>
+								<ZHeight>10</ZHeight>
+								<LineWidth>1</LineWidth>
+								<LineColor>-6632142</LineColor>
+								<LineColorCode>rect_legenda.getLineColor()</LineColorCode>
+								<LineMaterial>null</LineMaterial>
+								<LineStyle>SOLID</LineStyle>
+								<Width>204</Width>
+								<Height>183</Height>
+								<Rotation>0.0</Rotation>
+								<FillColor>-1</FillColor>
 								<FillMaterial>null</FillMaterial>
 							</Rectangle>
 							<Rectangle>
 								<Id>1750092986493</Id>
 								<Name><![CDATA[rect_extendedLegend]]></Name>
 								<X>-115</X>
-								<Y>-84</Y>
+								<Y>-84.5</Y>
 								<Label>
 									<X>10</X>
 									<Y>10</Y>
@@ -7282,8 +7257,8 @@ officia deserunt mollit anim id est laborum."]]></Text>
 								<LineColor/>
 								<LineMaterial>null</LineMaterial>
 								<LineStyle>SOLID</LineStyle>
-								<Width>205</Width>
-								<Height>172</Height>
+								<Width>204</Width>
+								<Height>182</Height>
 								<Rotation>0.0</Rotation>
 								<FillColor>-1</FillColor>
 								<FillMaterial>null</FillMaterial>
@@ -7291,8 +7266,8 @@ officia deserunt mollit anim id est laborum."]]></Text>
 							<Rectangle>
 								<Id>1750093291589</Id>
 								<Name><![CDATA[rect_specialGISObjectLegend7]]></Name>
-								<X>-110</X>
-								<Y>-40</Y>
+								<X>-90</X>
+								<Y>-35</Y>
 								<Label>
 									<X>10</X>
 									<Y>10</Y>
@@ -7317,8 +7292,8 @@ officia deserunt mollit anim id est laborum."]]></Text>
 							<Text>
 								<Id>1750093291591</Id>
 								<Name><![CDATA[t_specialGISObjectLegend7]]></Name>
-								<X>-80</X>
-								<Y>-40</Y>
+								<X>-60</X>
+								<Y>-35</Y>
 								<Label>
 									<X>0</X>
 									<Y>-10</Y>
@@ -7342,8 +7317,8 @@ officia deserunt mollit anim id est laborum."]]></Text>
 							<Rectangle>
 								<Id>1750093292693</Id>
 								<Name><![CDATA[rect_specialGISObjectLegend8]]></Name>
-								<X>-110</X>
-								<Y>-20</Y>
+								<X>-90</X>
+								<Y>-15</Y>
 								<Label>
 									<X>10</X>
 									<Y>10</Y>
@@ -7368,8 +7343,8 @@ officia deserunt mollit anim id est laborum."]]></Text>
 							<Text>
 								<Id>1750093292695</Id>
 								<Name><![CDATA[t_specialGISObjectLegend8]]></Name>
-								<X>-80</X>
-								<Y>-20</Y>
+								<X>-60</X>
+								<Y>-15</Y>
 								<Label>
 									<X>0</X>
 									<Y>-10</Y>
@@ -7393,8 +7368,8 @@ officia deserunt mollit anim id est laborum."]]></Text>
 							<Rectangle>
 								<Id>1750093293851</Id>
 								<Name><![CDATA[rect_specialGISObjectLegend9]]></Name>
-								<X>-110</X>
-								<Y>0</Y>
+								<X>-90</X>
+								<Y>5</Y>
 								<Label>
 									<X>10</X>
 									<Y>10</Y>
@@ -7419,8 +7394,8 @@ officia deserunt mollit anim id est laborum."]]></Text>
 							<Text>
 								<Id>1750093293853</Id>
 								<Name><![CDATA[t_specialGISObjectLegend9]]></Name>
-								<X>-80</X>
-								<Y>0</Y>
+								<X>-60</X>
+								<Y>5</Y>
 								<Label>
 									<X>0</X>
 									<Y>-10</Y>
@@ -7444,8 +7419,8 @@ officia deserunt mollit anim id est laborum."]]></Text>
 							<Rectangle>
 								<Id>1750093295400</Id>
 								<Name><![CDATA[rect_specialGISObjectLegend10]]></Name>
-								<X>-110</X>
-								<Y>20</Y>
+								<X>-90</X>
+								<Y>25</Y>
 								<Label>
 									<X>10</X>
 									<Y>10</Y>
@@ -7470,8 +7445,8 @@ officia deserunt mollit anim id est laborum."]]></Text>
 							<Text>
 								<Id>1750093295402</Id>
 								<Name><![CDATA[t_specialGISObjectLegend10]]></Name>
-								<X>-80</X>
-								<Y>20</Y>
+								<X>-60</X>
+								<Y>25</Y>
 								<Label>
 									<X>0</X>
 									<Y>-10</Y>
@@ -7495,8 +7470,8 @@ officia deserunt mollit anim id est laborum."]]></Text>
 							<Rectangle>
 								<Id>1750093296550</Id>
 								<Name><![CDATA[rect_specialGISObjectLegend11]]></Name>
-								<X>-110</X>
-								<Y>40</Y>
+								<X>-90</X>
+								<Y>45</Y>
 								<Label>
 									<X>10</X>
 									<Y>10</Y>
@@ -7521,8 +7496,8 @@ officia deserunt mollit anim id est laborum."]]></Text>
 							<Text>
 								<Id>1750093296552</Id>
 								<Name><![CDATA[t_specialGISObjectLegend11]]></Name>
-								<X>-80</X>
-								<Y>40</Y>
+								<X>-60</X>
+								<Y>45</Y>
 								<Label>
 									<X>0</X>
 									<Y>-10</Y>
@@ -7546,8 +7521,8 @@ officia deserunt mollit anim id est laborum."]]></Text>
 							<Rectangle>
 								<Id>1750093324907</Id>
 								<Name><![CDATA[rect_specialGISObjectLegend12]]></Name>
-								<X>-110</X>
-								<Y>60</Y>
+								<X>-90</X>
+								<Y>65</Y>
 								<Label>
 									<X>10</X>
 									<Y>10</Y>
@@ -7572,8 +7547,8 @@ officia deserunt mollit anim id est laborum."]]></Text>
 							<Text>
 								<Id>1750093324909</Id>
 								<Name><![CDATA[t_specialGISObjectLegend12]]></Name>
-								<X>-80</X>
-								<Y>60</Y>
+								<X>-60</X>
+								<Y>65</Y>
 								<Label>
 									<X>0</X>
 									<Y>-10</Y>
@@ -7598,7 +7573,7 @@ officia deserunt mollit anim id est laborum."]]></Text>
 								<Id>1750093436378</Id>
 								<Name><![CDATA[line]]></Name>
 								<X>-115</X>
-								<Y>-54</Y>
+								<Y>-49</Y>
 								<Label>
 									<X>10</X>
 									<Y>0</Y>
@@ -7638,7 +7613,7 @@ officia deserunt mollit anim id est laborum."]]></Text>
 						<ShowLabel>false</ShowLabel>
 						<DrawMode>SHAPE_DRAW_2D</DrawMode>
 						<VisibleCode>t_specialGISObjectLegend7.isVisible();</VisibleCode>
-						<OnClickCode>if(gr_extendedLegend.isVisible()){
+						<OnClickCode>if(!gr_extendedLegend.isVisible()){
 	gr_extendedLegend.setVisible(true);
 	t_seeMoreLegend.setText("Zie minder...");
 }
@@ -8343,4 +8318,29 @@ else{
 		<Dy>0</Dy>
 		<Dz>0</Dz>
 	</Line>
+	<Text>
+		<Id>1761138344359</Id>
+		<Name><![CDATA[txt_projectSpecificScenarios]]></Name>
+		<X>-1190</X>
+		<Y>500</Y>
+		<Label>
+			<X>0</X>
+			<Y>-10</Y>
+		</Label>
+		<PublicFlag>true</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>false</ShowLabel>
+		<DrawMode>SHAPE_DRAW_2D</DrawMode>
+		<EmbeddedIcon>false</EmbeddedIcon>
+		<Z>0</Z>
+		<Rotation>0.0</Rotation>
+		<Color>-16777216</Color>
+		<Text><![CDATA[Project specific scenarios]]></Text>
+		<Font>
+			<Name><![CDATA[SansSerif]]></Name>
+			<Size>14</Size>
+			<Style>1</Style>
+		</Font>
+		<Alignment>LEFT</Alignment>
+	</Text>
 </Presentation>
diff --git a/_alp/Agents/Zero_Interface/Variables.xml b/_alp/Agents/Zero_Interface/Variables.xml
index 8f02534a..53b1dacf 100644
--- a/_alp/Agents/Zero_Interface/Variables.xml
+++ b/_alp/Agents/Zero_Interface/Variables.xml
@@ -268,7 +268,7 @@
 		<Id>1696863329269</Id>
 		<Name><![CDATA[v_gridConnectionInBuildingIndex]]></Name>
 		<X>50</X>
-		<Y>1520</Y>
+		<Y>1480</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -309,7 +309,7 @@
 		<Id>1701879001472</Id>
 		<Name><![CDATA[v_clickedObjectText]]></Name>
 		<X>50</X>
-		<Y>1540</Y>
+		<Y>1500</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -331,7 +331,7 @@
 		<Id>1701879014361</Id>
 		<Name><![CDATA[v_clickedObjectAdress]]></Name>
 		<X>50</X>
-		<Y>1560</Y>
+		<Y>1520</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -463,7 +463,7 @@
 		<Id>1702046920293</Id>
 		<Name><![CDATA[v_clickedObjectDetails]]></Name>
 		<X>50</X>
-		<Y>1580</Y>
+		<Y>1540</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -727,7 +727,7 @@
 		<Id>1705673181898</Id>
 		<Name><![CDATA[v_clickedGridNode]]></Name>
 		<X>50</X>
-		<Y>1420</Y>
+		<Y>1380</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -746,7 +746,7 @@
 		<Id>1705673647104</Id>
 		<Name><![CDATA[v_previousClickedObjectType]]></Name>
 		<X>50</X>
-		<Y>1390</Y>
+		<Y>1350</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -765,7 +765,7 @@
 		<Id>1705673714784</Id>
 		<Name><![CDATA[v_previousClickedGridNode]]></Name>
 		<X>50</X>
-		<Y>1440</Y>
+		<Y>1400</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -893,7 +893,7 @@
 		<Id>1707918668189</Id>
 		<Name><![CDATA[v_clickedObjectType]]></Name>
 		<X>50</X>
-		<Y>1370</Y>
+		<Y>1330</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -908,28 +908,6 @@
 			<Type><![CDATA[OL_GISObjectType]]></Type>
 		</Properties>
 	</Variable>
-	<Variable Class="PlainVariable">
-		<Id>1708597346305</Id>
-		<Name><![CDATA[v_connectionOwnerIndexNr]]></Name>
-		<X>50</X>
-		<Y>1340</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Properties SaveInSnapshot="true"
-              Constant="false"
-              AccessType="public"
-              StaticVariable="false">
-			<Type><![CDATA[int]]></Type>
-			<InitialValue Class="CodeValue">
-				<Code><![CDATA[0]]></Code>
-			</InitialValue>
-		</Properties>
-	</Variable>
 	<Variable Class="PlainVariable">
 		<Id>1709803708318</Id>
 		<Name><![CDATA[v_gridNodeFeedinColor]]></Name>
@@ -1604,7 +1582,7 @@
 		<Id>1725018118872</Id>
 		<Name><![CDATA[b_showCables]]></Name>
 		<X>50</X>
-		<Y>1620</Y>
+		<Y>1580</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1754,7 +1732,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1743092928263</Id>
 		<Name><![CDATA[b_inManualFilterSelectionMode]]></Name>
-		<X>-1410</X>
+		<X>-1530</X>
 		<Y>500</Y>
 		<Label>
 			<X>10</X>
@@ -1777,7 +1755,7 @@
 		<Id>1743666440153</Id>
 		<Name><![CDATA[v_currentActiveInfoBubble]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>-1880</X>
+		<X>-1990</X>
 		<Y>150</Y>
 		<Label>
 			<X>10</X>
@@ -1796,7 +1774,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1744205147072</Id>
 		<Name><![CDATA[v_infoText]]></Name>
-		<X>-1900</X>
+		<X>-2010</X>
 		<Y>80</Y>
 		<Label>
 			<X>10</X>
@@ -2230,7 +2208,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1756375264408</Id>
 		<Name><![CDATA[v_currentViewArea]]></Name>
-		<X>-1900</X>
+		<X>-2010</X>
 		<Y>100</Y>
 		<Label>
 			<X>10</X>
@@ -2322,7 +2300,7 @@
 	<Variable Class="Parameter">
 		<Id>1746106585457</Id>
 		<Name><![CDATA[p_currentActiveInfoBubble]]></Name>
-		<X>-1880</X>
+		<X>-1990</X>
 		<Y>170</Y>
 		<Label>
 			<X>10</X>
@@ -2511,11 +2489,111 @@
 			</ParameterEditor>
 		</Properties>
 	</Variable>
-	<Variable Class="CollectionVariable">
-		<Id>1707918668148</Id>
-		<Name><![CDATA[c_GISNeighborhoods]]></Name>
-		<X>-280</X>
-		<Y>230</Y>
+	<Variable Class="Parameter">
+		<Id>1760978961206</Id>
+		<Name><![CDATA[uI_Company]]></Name>
+		<X>-250</X>
+		<Y>480</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>false</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
+			<Type><![CDATA[UI_company]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<ParameterEditor>
+				<Id>1760978961204</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
+	<Variable Class="Parameter">
+		<Id>1760978964017</Id>
+		<Name><![CDATA[uI_Hydrogen]]></Name>
+		<X>-250</X>
+		<Y>520</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>false</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
+			<Type><![CDATA[UI_Hydrogen]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<ParameterEditor>
+				<Id>1760978964015</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
+	<Variable Class="Parameter">
+		<Id>1760978968830</Id>
+		<Name><![CDATA[uI_Battery]]></Name>
+		<X>-250</X>
+		<Y>560</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>false</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
+			<Type><![CDATA[UI_Battery]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<ParameterEditor>
+				<Id>1760978968828</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
+	<Variable Class="Parameter">
+		<Id>1760979190278</Id>
+		<Name><![CDATA[uI_EnergyHub]]></Name>
+		<X>-250</X>
+		<Y>440</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>false</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
+			<Type><![CDATA[UI_EnergyHub]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<ParameterEditor>
+				<Id>1760979190276</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
+	<Variable Class="Parameter">
+		<Id>1761118903683</Id>
+		<Name><![CDATA[rb_scenarios]]></Name>
+		<X>-1150</X>
+		<Y>100</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2523,17 +2601,140 @@
 		<PublicFlag>false</PublicFlag>
 		<PresentationFlag>true</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
-		<Properties SaveInSnapshot="true" AccessType="public" StaticVariable="false">
-			<CollectionClass>ArrayList</CollectionClass>
-			<ElementClass>GIS_Object</ElementClass>
-			<ValueElementClass>String</ValueElementClass>
+		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
+			<Type><![CDATA[ShapeRadioButtonGroup]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<ParameterEditor>
+				<Id>1761118903681</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
+	<Variable Class="Parameter">
+		<Id>1761119479237</Id>
+		<Name><![CDATA[t_scenario_current]]></Name>
+		<X>-1165</X>
+		<Y>245</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
+			<Type><![CDATA[String]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<DefaultValue Class="CodeValue">
+				<Code><![CDATA["Het huidige scenario bevat de energie dynamieken van dit moment. \n" +
+"Dit omvat o.a. de huidige zonnepanelen, het aantal elektrische \n" +
+"voertuigen in per buurt, de energie consumptie profielen van bedrijven \n" + 
+"en de huidige gasconsumptie voor verwarming."]]></Code>
+			</DefaultValue>
+			<ParameterEditor>
+				<Id>1761119479235</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
+	<Variable Class="Parameter">
+		<Id>1761119479242</Id>
+		<Name><![CDATA[t_scenario_future]]></Name>
+		<X>-1160</X>
+		<Y>290</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
+			<Type><![CDATA[String]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<DefaultValue Class="CodeValue">
+				<Code><![CDATA["Het toekomstige scenario bevat de energie dynamieken van dit moment, \n" +
+"plus de toekomst plannen van alle bedrijven die de enquete hebben \n" +
+"ingevuld. Deze plannen kunnen bevatten: het instaleren van extra \n" +
+"zonnepanelen, aangevraagde net uitbereiding, maar ook plannen voor \n" + 
+"het electrificeren van het transport."]]></Code>
+			</DefaultValue>
+			<ParameterEditor>
+				<Id>1761119479240</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
+	<Variable Class="Parameter">
+		<Id>1761119827711</Id>
+		<Name><![CDATA[t_scenario_custom]]></Name>
+		<X>-1160</X>
+		<Y>335</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
+			<Type><![CDATA[String]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<DefaultValue Class="CodeValue">
+				<Code><![CDATA[""]]></Code>
+			</DefaultValue>
+			<ParameterEditor>
+				<Id>1761119827709</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
+	<Variable Class="Parameter">
+		<Id>1761134798639</Id>
+		<Name><![CDATA[p_residentialScenario_Current]]></Name>
+		<X>-1160</X>
+		<Y>150</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
+			<Type><![CDATA[J_SliderSettings_Residential]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<ParameterEditor>
+				<Id>1761134798637</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
 		</Properties>
 	</Variable>
 	<Variable Class="CollectionVariable">
-		<Id>1709552799968</Id>
-		<Name><![CDATA[c_companyUIs]]></Name>
-		<X>-240</X>
-		<Y>460</Y>
+		<Id>1707918668148</Id>
+		<Name><![CDATA[c_GISNeighborhoods]]></Name>
+		<X>-280</X>
+		<Y>230</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2543,7 +2744,7 @@
 		<ShowLabel>true</ShowLabel>
 		<Properties SaveInSnapshot="true" AccessType="public" StaticVariable="false">
 			<CollectionClass>ArrayList</CollectionClass>
-			<ElementClass>UI_company</ElementClass>
+			<ElementClass>GIS_Object</ElementClass>
 			<ValueElementClass>String</ValueElementClass>
 		</Properties>
 	</Variable>
@@ -2730,7 +2931,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1734442668540</Id>
 		<Name><![CDATA[c_selectedFilterOptions]]></Name>
-		<X>-1430</X>
+		<X>-1550</X>
 		<Y>80</Y>
 		<Label>
 			<X>10</X>
@@ -2749,7 +2950,7 @@
 		<Id>1734512815255</Id>
 		<Name><![CDATA[c_previousSelectedObjects]]></Name>
 		<X>50</X>
-		<Y>1490</Y>
+		<Y>1450</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2767,7 +2968,7 @@
 		<Id>1734513139372</Id>
 		<Name><![CDATA[c_selectedObjects]]></Name>
 		<X>50</X>
-		<Y>1470</Y>
+		<Y>1430</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2784,7 +2985,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1742226708562</Id>
 		<Name><![CDATA[c_manualFilterDeselectedGC]]></Name>
-		<X>-1410</X>
+		<X>-1530</X>
 		<Y>475</Y>
 		<Label>
 			<X>10</X>
@@ -2802,7 +3003,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1742226748068</Id>
 		<Name><![CDATA[c_manualFilterSelectedGC]]></Name>
-		<X>-1410</X>
+		<X>-1530</X>
 		<Y>455</Y>
 		<Label>
 			<X>10</X>
@@ -2820,7 +3021,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1742376749972</Id>
 		<Name><![CDATA[c_filterSelectedGridLoops]]></Name>
-		<X>-1410</X>
+		<X>-1530</X>
 		<Y>330</Y>
 		<Label>
 			<X>10</X>
@@ -2838,7 +3039,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1742376765347</Id>
 		<Name><![CDATA[c_filterSelectedNeighborhoods]]></Name>
-		<X>-1410</X>
+		<X>-1530</X>
 		<Y>390</Y>
 		<Label>
 			<X>10</X>
@@ -2858,7 +3059,7 @@
 		<Name><![CDATA[c_presentations]]></Name>
 		<Description><![CDATA[Would have to be filled by hand with all presentations that are (indirectly) on the interface canvas. eg: c_presentations.add(uI_Tabs_presentation)]]></Description>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>-1910</X>
+		<X>-2020</X>
 		<Y>210</Y>
 		<Label>
 			<X>10</X>
@@ -3108,4 +3309,22 @@
 			<ValueElementClass>String</ValueElementClass>
 		</Properties>
 	</Variable>
+	<Variable Class="CollectionVariable">
+		<Id>1760715323344</Id>
+		<Name><![CDATA[c_additionalVehicles]]></Name>
+		<X>510</X>
+		<Y>-500</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>LinkedHashMap</CollectionClass>
+			<ElementClass>String</ElementClass>
+			<ValueElementClass>List&lt;J_EAVehicle&gt;</ValueElementClass>
+		</Properties>
+	</Variable>
 </Variables>
diff --git a/_alp/Agents/Zero_Loader/Code/Functions.java b/_alp/Agents/Zero_Loader/Code/Functions.java
index 7a06022d..b89ecbd3 100644
--- a/_alp/Agents/Zero_Loader/Code/Functions.java
+++ b/_alp/Agents/Zero_Loader/Code/Functions.java
@@ -2851,7 +2851,7 @@ boolean f_createElectricityTimeSeriesAssets(GridConnection gridConnection,com.ze
 		
 	default:
 		traceln("HEATING TYPE NOT FOUND FOR GC: " + parentGC);
-}								
+}											
 /*ALCODEEND*/}
 
 GridNode f_createHeatGridNode()
@@ -4417,8 +4417,11 @@ else if (surveyGC.getHeat() != null && surveyGC.getHeat().getAnnualDistrictHeati
 zero_Interface.c_scenarioMap_Current = saveObject.c_scenarioMap_Current;
 zero_Interface.c_scenarioMap_Future = saveObject.c_scenarioMap_Future;
 
+
+/*
 List<ConnectionOwner> c_COCompanies = findAll(zero_Interface.energyModel.pop_connectionOwners, p -> p.p_connectionOwnerType == OL_ConnectionOwnerType.COMPANY); 
 
+
 int i = 0;
 for (ConnectionOwner CO : c_COCompanies) {
 	UI_company companyUI = zero_Interface.c_companyUIs.get(CO.p_connectionOwnerIndexNr);
@@ -4428,7 +4431,7 @@ else if (surveyGC.getHeat() != null && surveyGC.getHeat().getAnnualDistrictHeati
 	companyUI.f_setSelectedGCSliders();
 	i++;
 }
-
+*/
 
 /*ALCODEEND*/}
 
diff --git a/_alp/Agents/Zero_Loader/Levels/Level.level.xml b/_alp/Agents/Zero_Loader/Levels/Level.level.xml
index eac5fa6f..681ca7fa 100644
--- a/_alp/Agents/Zero_Loader/Levels/Level.level.xml
+++ b/_alp/Agents/Zero_Loader/Levels/Level.level.xml
@@ -1311,9 +1311,6 @@ saveObject.c_scenarioMap_Current = zero_Interface.c_scenarioMap_Current;
 saveObject.c_scenarioMap_Future = zero_Interface.c_scenarioMap_Future;
 
 List&lt;LinkedHashMap&lt;String, List&lt;J_EAVehicle&gt;&gt;&gt; c_additionalVehicleHashMaps = new ArrayList&lt;LinkedHashMap&lt;String, List&lt;J_EAVehicle&gt;&gt;&gt;();
-for (UI_company companyUI : zero_Interface.c_companyUIs) {
-	c_additionalVehicleHashMaps.add(companyUI.c_additionalVehicles);
-}
 saveObject.c_additionalVehicleHashMaps = c_additionalVehicleHashMaps;
 
 
diff --git a/_alp/Agents/tabElectricity/Code/Functions.java b/_alp/Agents/tabElectricity/Code/Functions.java
index b2690f01..af7d4331 100644
--- a/_alp/Agents/tabElectricity/Code/Functions.java
+++ b/_alp/Agents/tabElectricity/Code/Functions.java
@@ -139,14 +139,6 @@
 			j_ea.setProfileScaling_fr( 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);
-		}
-	}
 }
 
 // Update variable to change to custom scenario
@@ -159,7 +151,7 @@
 
 double f_getCurrentPVOnLandAndWindturbineValues()
 {/*ALCODESTART::1745483988251*/
-for(GCEnergyProduction GCProd : uI_Tabs.f_getSliderGridConnections_production()){
+for(GCEnergyProduction GCProd : uI_Tabs.f_getAllSliderGridConnections_production()){
 	if(!GCProd.p_isSliderGC && GCProd.v_isActive){
 		for(J_EAProduction ea : GCProd.c_productionAssets){
 			if(ea.energyAssetType == OL_EnergyAssetType.PHOTOVOLTAIC){
@@ -223,11 +215,8 @@ Pair<Double, Double> f_getPVSystemPercentage(List<GridConnection> gcList)
 		if ( company.v_liveAssetsMetaData.activeAssetFlows.contains(OL_AssetFlowCategories.pvProductionElectric_kW) ) {
 			// find companyUI to check if the company already has PV on model startup			
 			remaining_kWp += company.v_liveAssetsMetaData.totalInstalledPVPower_kW;
-			f_removePVSystem( company );		
-			double PVAtStartup_kWp = 0;
-			if (zero_Interface.c_companyUIs.size() > 0) {
-				PVAtStartup_kWp = zero_Interface.c_scenarioMap_Current.get(company.p_uid).getCurrentPV_kW();
-			}
+			f_removePVSystem( company );
+			double PVAtStartup_kWp = zero_Interface.c_scenarioMap_Current.get(company.p_uid).getCurrentPV_kW();
 			if (PVAtStartup_kWp != 0) {
 				f_addPVSystem( company, PVAtStartup_kWp );
 				remaining_kWp -= PVAtStartup_kWp;
@@ -281,24 +270,6 @@ Pair<Double, Double> f_getPVSystemPercentage(List<GridConnection> gcList)
 else if ( gc instanceof GCUtility ) {
 	zero_Interface.c_orderedPVSystemsCompanies.remove(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);
-			companyUI.b_runningMainInterfaceSlider = true;
-			if(companyUI.c_ownedGridConnections.get(companyUI.v_currentSelectedGCnr) != gc){
-				int i = indexOf(companyUI.c_ownedGridConnections.stream().toArray(), gc);
-				if (i == -1) {
-					throw new RuntimeException("Error: Unable to find gc: " + gc.p_ownerID + " in companyUI number " + gc.p_owner.p_connectionOwnerIndexNr);
-				}
-				companyUI.GCnr_selection.setValue(i, true);
-			}
-			companyUI.b_runningMainInterfaceSlider = false;	
-			
-			companyUI.sl_rooftopPVCompany.setValue(roundToInt(capacity_kWp), false);
-			companyUI.v_defaultPVSlider = roundToInt(capacity_kWp);
-		}
-	}
 }
 else {
 	throw new RuntimeException("Unknown GridConnection type passed to f_addPVSystem.");
@@ -318,20 +289,6 @@ else if ( gc instanceof GCUtility ) {
 	else if ( gc instanceof GCUtility ) {
 		zero_Interface.c_orderedPVSystemsCompanies.remove(gc);
 		zero_Interface.c_orderedPVSystemsCompanies.add(0, (GCUtility)gc);
-		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);
-				companyUI.b_runningMainInterfaceSlider = 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.b_runningMainInterfaceSlider = false;	
-				
-				companyUI.sl_rooftopPVCompany.setValue(0, false);
-				companyUI.v_defaultPVSlider = roundToInt(0);
-			}
-		}
 	}
 }
 /*ALCODEEND*/}
@@ -472,7 +429,7 @@ else if(gr_electricitySliders_residential.isVisible()){
 
 double f_updateElectricitySliders_default()
 {/*ALCODESTART::1754926103685*/
-List<GridConnection> allConsumerGridConnections = uI_Tabs.f_getSliderGridConnections_consumption();
+List<GridConnection> allConsumerGridConnections = uI_Tabs.f_getActiveSliderGridConnections_consumption();
 
 
 //Savings
@@ -499,7 +456,7 @@ else if(gr_electricitySliders_residential.isVisible()){
 
 
 //Companies rooftop PV
-List<GCUtility> utilityGridConnections = uI_Tabs.f_getSliderGridConnections_utilities();
+List<GCUtility> utilityGridConnections = uI_Tabs.f_getActiveSliderGridConnections_utilities();
 
 List<GridConnection> utilityGridConnections_GC = new ArrayList<>(utilityGridConnections);
 Pair<Double, Double> pair = f_getPVSystemPercentage( utilityGridConnections_GC );
@@ -507,7 +464,7 @@ else if(gr_electricitySliders_residential.isVisible()){
 sl_rooftopPVCompanies_pct.setValue(PV_pct, false);
 
 //Houses rooftop PV
-List<GCHouse> houseGridConnections = uI_Tabs.f_getSliderGridConnections_houses();
+List<GCHouse> houseGridConnections = uI_Tabs.f_getActiveSliderGridConnections_houses();
 
 List<GridConnection> houseGridConnections_GC = new ArrayList<>(utilityGridConnections);
 pair = f_getPVSystemPercentage( houseGridConnections_GC );
@@ -518,7 +475,7 @@ else if(gr_electricitySliders_residential.isVisible()){
 double totalPVOnLand_kW = 0;
 double totalWind_kW = 0;
 
-for(GCEnergyProduction productionGC : uI_Tabs.f_getSliderGridConnections_production()){
+for(GCEnergyProduction productionGC : uI_Tabs.f_getAllSliderGridConnections_production()){
 	if(productionGC.v_isActive && productionGC.p_isSliderGC){
 		if(productionGC.v_liveAssetsMetaData.activeAssetFlows.contains(OL_AssetFlowCategories.pvProductionElectric_kW)){
 			for(J_EAProduction productionEA : productionGC.c_productionAssets){
@@ -553,7 +510,7 @@ else if(productionGC.v_liveAssetsMetaData.activeAssetFlows.contains(OL_AssetFlow
 
 //Large scale battery systems
 double totalBatteryStorage_kWh = 0;
-for(GCGridBattery batteryGC : uI_Tabs.f_getSliderGridConnections_gridBatteries()){
+for(GCGridBattery batteryGC : uI_Tabs.f_getAllSliderGridConnections_gridBatteries()){
 	if(batteryGC.v_isActive && batteryGC.p_isSliderGC){
 		totalBatteryStorage_kWh += batteryGC.p_batteryAsset.getStorageCapacity_kWh();
 	}
@@ -568,7 +525,7 @@ else if(productionGC.v_liveAssetsMetaData.activeAssetFlows.contains(OL_AssetFlow
 List<GCHouse> houseGridConnections = new ArrayList<>();
 List<GCGridBattery> gridBatteryGridConnections = new ArrayList<>();
 
-for (GridConnection GC : findAll(uI_Tabs.f_getSliderGridConnections_all(), gc -> gc.v_isActive)) {
+for (GridConnection GC : uI_Tabs.f_getActiveSliderGridConnections_all()) {
    	if(GC instanceof GCHouse){
 		houseGridConnections.add((GCHouse)GC);		
 	}
@@ -628,7 +585,7 @@ else if(GC instanceof GCGridBattery){
 double f_updateElectricitySliders_businesspark()
 {/*ALCODESTART::1754926103689*/
 //Get the utility connections
-List<GridConnection> utilityGridConnections = new ArrayList<>(uI_Tabs.f_getSliderGridConnections_utilities());
+List<GridConnection> utilityGridConnections = new ArrayList<>(uI_Tabs.f_getActiveSliderGridConnections_utilities());
 
 
 //Savings
@@ -662,7 +619,7 @@ else if(GC instanceof GCGridBattery){
 double totalPVOnLand_kW = 0;
 double totalWind_kW = 0;
 
-for(GCEnergyProduction productionGC : uI_Tabs.f_getSliderGridConnections_production()){
+for(GCEnergyProduction productionGC : uI_Tabs.f_getAllSliderGridConnections_production()){
 	if(productionGC.v_isActive && productionGC.p_isSliderGC){
 		if(productionGC.v_liveAssetsMetaData.activeAssetFlows.contains(OL_AssetFlowCategories.pvProductionElectric_kW)){
 			for(J_EAProduction productionEA : productionGC.c_productionAssets){
@@ -697,7 +654,7 @@ else if(productionGC.v_liveAssetsMetaData.activeAssetFlows.contains(OL_AssetFlow
 
 //Large scale battery systems
 double totalBatteryStorage_kWh = 0;
-for(GCGridBattery batteryGC : uI_Tabs.f_getSliderGridConnections_gridBatteries()){
+for(GCGridBattery batteryGC : uI_Tabs.f_getAllSliderGridConnections_gridBatteries()){
 	if(batteryGC.v_isActive && batteryGC.p_isSliderGC){
 		totalBatteryStorage_kWh += batteryGC.p_batteryAsset.getStorageCapacity_kWh();
 	}
@@ -745,13 +702,6 @@ else if(productionGC.v_liveAssetsMetaData.activeAssetFlows.contains(OL_AssetFlow
 {/*ALCODESTART::1754986167346*/
 for (GridConnection GC : gcList) {
 	GC.v_enableCurtailment = activateCurtailment;
-	
-	if (zero_Interface.c_companyUIs.size()>0 && GC instanceof GCUtility){
-		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.cb_curtailmentCompany.setSelected(activateCurtailment, false);
-		}
-	}
 }
 
 
diff --git a/_alp/Agents/tabElectricity/Levels/Level.level.xml b/_alp/Agents/tabElectricity/Levels/Level.level.xml
index 9d42092e..ef562406 100644
--- a/_alp/Agents/tabElectricity/Levels/Level.level.xml
+++ b/_alp/Agents/tabElectricity/Levels/Level.level.xml
@@ -112,7 +112,7 @@
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setDemandReduction( uI_Tabs.f_getSliderGridConnections_consumption(), sl_electricityDemandReduction_pct.getValue() );</ActionCode>
+					<ActionCode>f_setDemandReduction( uI_Tabs.f_getActiveSliderGridConnections_consumption(), sl_electricityDemandReduction_pct.getValue() );</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -216,7 +216,7 @@
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setPVSystemCompanies( uI_Tabs.f_getSliderGridConnections_utilities(), sl_rooftopPVCompanies_pct.getValue(), sl_rooftopPVCompanies_pct );
+					<ActionCode>f_setPVSystemCompanies( uI_Tabs.f_getActiveSliderGridConnections_utilities(), sl_rooftopPVCompanies_pct.getValue(), sl_rooftopPVCompanies_pct );
 
 if(zero_Interface.c_loadedMapOverlayTypes.get(zero_Interface.rb_mapOverlay.getValue()) == OL_MapOverlayTypes.PV_PRODUCTION){
 	zero_Interface.rb_mapOverlay.setValue(zero_Interface.c_loadedMapOverlayTypes.indexOf(OL_MapOverlayTypes.PV_PRODUCTION),true);
@@ -299,7 +299,7 @@ if(zero_Interface.c_loadedMapOverlayTypes.get(zero_Interface.rb_mapOverlay.getVa
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setPVOnLand(sl_largeScalePV_ha.getValue() - p_currentPVOnLand_ha, uI_Tabs.f_getSliderGridConnections_production());</ActionCode>
+					<ActionCode>f_setPVOnLand(sl_largeScalePV_ha.getValue() - p_currentPVOnLand_ha, uI_Tabs.f_getAllSliderGridConnections_production());</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -377,7 +377,7 @@ if(zero_Interface.c_loadedMapOverlayTypes.get(zero_Interface.rb_mapOverlay.getVa
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setWindTurbines( sl_largeScaleWind_MW.getValue() - p_currentWindTurbines_MW, uI_Tabs.f_getSliderGridConnections_production());</ActionCode>
+					<ActionCode>f_setWindTurbines( sl_largeScaleWind_MW.getValue() - p_currentWindTurbines_MW, uI_Tabs.f_getAllSliderGridConnections_production());</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -483,7 +483,7 @@ if(zero_Interface.c_loadedMapOverlayTypes.get(zero_Interface.rb_mapOverlay.getVa
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setPVSystemHouses( uI_Tabs.f_getSliderGridConnections_houses(), sl_rooftopPVHouses_pct.getValue() );
+					<ActionCode>f_setPVSystemHouses( uI_Tabs.f_getActiveSliderGridConnections_houses(), sl_rooftopPVHouses_pct.getValue() );
 
 if(zero_Interface.c_loadedMapOverlayTypes.get(zero_Interface.rb_mapOverlay.getValue()) == OL_MapOverlayTypes.PV_PRODUCTION){
 	zero_Interface.rb_mapOverlay.setValue(zero_Interface.c_loadedMapOverlayTypes.indexOf(OL_MapOverlayTypes.PV_PRODUCTION),true);
@@ -703,7 +703,7 @@ if(zero_Interface.c_loadedMapOverlayTypes.get(zero_Interface.rb_mapOverlay.getVa
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setGridBatteries(sl_collectiveBattery_MWh_default.getValue(), uI_Tabs.f_getSliderGridConnections_gridBatteries());
+					<ActionCode>f_setGridBatteries(sl_collectiveBattery_MWh_default.getValue(), uI_Tabs.f_getAllSliderGridConnections_gridBatteries());
 
 //Update variable to change to custom scenario
 if(!zero_Interface.b_runningMainInterfaceScenarios){
@@ -789,7 +789,7 @@ zero_Interface.f_resetSettings();</ActionCode>
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<TextColor>-16777216</TextColor>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setCurtailment(cb_curtailment_default.isSelected(), uI_Tabs.f_getSliderGridConnections_consumption());</ActionCode>
+					<ActionCode>f_setCurtailment(cb_curtailment_default.isSelected(), uI_Tabs.f_getActiveSliderGridConnections_consumption());</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<Font Name="Dialog" Size="11" Style="0"/>
@@ -1067,7 +1067,7 @@ zero_Interface.f_resetSettings();</ActionCode>
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setDemandReduction( uI_Tabs.f_getSliderGridConnections_consumption(), sl_electricityDemandReduction_pct_Businesspark.getValue() );</ActionCode>
+					<ActionCode>f_setDemandReduction( uI_Tabs.f_getActiveSliderGridConnections_consumption(), sl_electricityDemandReduction_pct_Businesspark.getValue() );</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -1171,7 +1171,7 @@ zero_Interface.f_resetSettings();</ActionCode>
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setPVSystemCompanies( uI_Tabs.f_getSliderGridConnections_utilities(), sl_rooftopPVCompanies_pct_Businesspark.getValue(), sl_rooftopPVCompanies_pct_Businesspark );
+					<ActionCode>f_setPVSystemCompanies( uI_Tabs.f_getActiveSliderGridConnections_utilities(), sl_rooftopPVCompanies_pct_Businesspark.getValue(), sl_rooftopPVCompanies_pct_Businesspark );
 
 //If on pv map overlay, adjust colouring
 if(zero_Interface.c_loadedMapOverlayTypes.get(zero_Interface.rb_mapOverlay.getValue()) == OL_MapOverlayTypes.PV_PRODUCTION){
@@ -1255,7 +1255,7 @@ if(zero_Interface.c_loadedMapOverlayTypes.get(zero_Interface.rb_mapOverlay.getVa
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setPVOnLand(sl_largeScalePV_ha_Businesspark.getValue()- p_currentPVOnLand_ha, uI_Tabs.f_getSliderGridConnections_production());</ActionCode>
+					<ActionCode>f_setPVOnLand(sl_largeScalePV_ha_Businesspark.getValue()- p_currentPVOnLand_ha, uI_Tabs.f_getAllSliderGridConnections_production());</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -1333,7 +1333,7 @@ if(zero_Interface.c_loadedMapOverlayTypes.get(zero_Interface.rb_mapOverlay.getVa
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setWindTurbines( sl_largeScaleWind_MW_Businesspark.getValue() - p_currentWindTurbines_MW, uI_Tabs.f_getSliderGridConnections_production());</ActionCode>
+					<ActionCode>f_setWindTurbines( sl_largeScaleWind_MW_Businesspark.getValue() - p_currentWindTurbines_MW, uI_Tabs.f_getAllSliderGridConnections_production());</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -1546,7 +1546,7 @@ if(zero_Interface.c_loadedMapOverlayTypes.get(zero_Interface.rb_mapOverlay.getVa
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<TextColor>-16777216</TextColor>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setCurtailment(cb_curtailment_businesspark.isSelected(), new ArrayList&lt;GridConnection&gt;(uI_Tabs.f_getSliderGridConnections_utilities()));</ActionCode>
+					<ActionCode>f_setCurtailment(cb_curtailment_businesspark.isSelected(), new ArrayList&lt;GridConnection&gt;(uI_Tabs.f_getActiveSliderGridConnections_utilities()));</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<Font Name="Dialog" Size="11" Style="0"/>
@@ -1676,7 +1676,7 @@ if(zero_Interface.c_loadedMapOverlayTypes.get(zero_Interface.rb_mapOverlay.getVa
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setGridBatteries(sl_collectiveBattery_MWh_businesspark.getValue(), uI_Tabs.f_getSliderGridConnections_gridBatteries());
+					<ActionCode>f_setGridBatteries(sl_collectiveBattery_MWh_businesspark.getValue(), uI_Tabs.f_getAllSliderGridConnections_gridBatteries());
 
 //Update variable to change to custom scenario
 if(!zero_Interface.b_runningMainInterfaceScenarios){
@@ -1811,7 +1811,7 @@ zero_Interface.f_resetSettings();</ActionCode>
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setPVSystemHouses( uI_Tabs.f_getSliderGridConnections_houses(), sl_householdPVResidentialArea_pct.getValue() );
+					<ActionCode>f_setPVSystemHouses( uI_Tabs.f_getActiveSliderGridConnections_houses(), sl_householdPVResidentialArea_pct.getValue() );
 
 //If on pv map overlay, adjust colouring
 if(zero_Interface.c_loadedMapOverlayTypes.get(zero_Interface.rb_mapOverlay.getValue()) == OL_MapOverlayTypes.PV_PRODUCTION){
@@ -1819,7 +1819,7 @@ if(zero_Interface.c_loadedMapOverlayTypes.get(zero_Interface.rb_mapOverlay.getVa
 }
 
 // Also updates the home batteries
-f_setResidentialBatteries( sl_householdBatteriesResidentialArea_pct.getValue(), uI_Tabs.f_getSliderGridConnections_houses() );</ActionCode>
+f_setResidentialBatteries( sl_householdBatteriesResidentialArea_pct.getValue(), uI_Tabs.f_getActiveSliderGridConnections_houses() );</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -1924,7 +1924,7 @@ f_setResidentialBatteries( sl_householdBatteriesResidentialArea_pct.getValue(),
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setResidentialBatteries( sl_householdBatteriesResidentialArea_pct.getValue(), uI_Tabs.f_getSliderGridConnections_houses() );</ActionCode>
+					<ActionCode>f_setResidentialBatteries( sl_householdBatteriesResidentialArea_pct.getValue(), uI_Tabs.f_getActiveSliderGridConnections_houses() );</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -1979,7 +1979,7 @@ f_setResidentialBatteries( sl_householdBatteriesResidentialArea_pct.getValue(),
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setGridBatteries_residential( sl_gridBatteriesResidentialArea_kWh.getValue(), uI_Tabs.f_getSliderGridConnections_gridBatteries() );
+					<ActionCode>f_setGridBatteries_residential( sl_gridBatteriesResidentialArea_kWh.getValue(), uI_Tabs.f_getAllSliderGridConnections_gridBatteries() );
 </ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
@@ -2142,7 +2142,7 @@ f_setResidentialBatteries( sl_householdBatteriesResidentialArea_pct.getValue(),
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setElectricCooking(uI_Tabs.f_getSliderGridConnections_houses(), sl_householdElectricCookingResidentialArea_pct.getValue() );</ActionCode>
+					<ActionCode>f_setElectricCooking(uI_Tabs.f_getActiveSliderGridConnections_houses(), sl_householdElectricCookingResidentialArea_pct.getValue() );</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
diff --git a/_alp/Agents/tabHeating/AOC.tabHeating.xml b/_alp/Agents/tabHeating/AOC.tabHeating.xml
index 2b22f8b6..fac38280 100644
--- a/_alp/Agents/tabHeating/AOC.tabHeating.xml
+++ b/_alp/Agents/tabHeating/AOC.tabHeating.xml
@@ -100,7 +100,6 @@
 	</ScaleRuler>
 	<CurrentLevel>1722253108632</CurrentLevel>
 	<ConnectionsId>1722253108626</ConnectionsId>
-	<Variables xmlns:al="http://anylogic.com"/>
 	<Functions xmlns:al="http://anylogic.com"/>
 	<AgentLinks>
 		<AgentLink>
diff --git a/_alp/Agents/tabHeating/Code/Functions.java b/_alp/Agents/tabHeating/Code/Functions.java
index fac1fe4f..bcf79920 100644
--- a/_alp/Agents/tabHeating/Code/Functions.java
+++ b/_alp/Agents/tabHeating/Code/Functions.java
@@ -127,14 +127,6 @@ int f_setHeatingSystemsCompanies(List<GCUtility> gcList,ShapeSlider sliderGasbur
 	if(gc.p_BuildingThermalAsset != null){
 		gc.p_BuildingThermalAsset.setLossScalingFactor_fr(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_heatDemandCompanyReduction.setValue(demandReduction_pct, false);
-		}
-	}
 }
 
 //Update variable to change to custom scenario
@@ -565,61 +557,128 @@ else if (house.p_BuildingThermalAsset != null){
 zero_Interface.f_resetSettings();
 /*ALCODEEND*/}
 
-int f_calculateNumberOfCustomHeatingSystems(List<GridConnection> gcList)
-{/*ALCODESTART::1754385214478*/
-int numberOfCustomHeatingSystems = 0;
-
-for (GridConnection gc : gcList) {
-	if ( gc.f_getCurrentHeatingType() == OL_GridConnectionHeatingType.CUSTOM && gc.v_isActive ) {
-		numberOfCustomHeatingSystems++;
-	}
+double f_setHeatingSliders(List<GridConnection> gcList,List<GridConnection> orderedHeatingSystemGCList,OL_GridConnectionHeatingType changedSliderHeatingType,ShapeSlider gasBurnerSlider,ShapeSlider hybridHeatPumpSlider,ShapeSlider heatPumpSlider,ShapeSlider HTdistrictHeatingSlider,ShapeSlider LTdistrictHeatingSlider,ShapeSlider customHeatingSlider)
+{/*ALCODESTART::1754391096443*/
+////Determine the changed slider index used in the distribution for loop
+int changedSliderIndex = 0;
+switch(changedSliderHeatingType){
+	case GAS_BURNER:
+		changedSliderIndex = 0;
+		break;
+	case HYBRID_HEATPUMP:
+		changedSliderIndex = 1;
+		break;
+	case ELECTRIC_HEATPUMP:
+		changedSliderIndex = 2;
+		break;
+	case DISTRICTHEAT:
+		changedSliderIndex = 3;
+		break;
+	case LT_DISTRICTHEAT:
+	case CUSTOM:
+		throw new RuntimeException("Changed a heating type slider with a currently unsupported type!");
 }
-return numberOfCustomHeatingSystems;
-/*ALCODEEND*/}
 
-double f_setHeatingSliders(int sliderIndex,ShapeSlider gasBurnerSlider,ShapeSlider heatPumpSlider,ShapeSlider hybridHeatPumpSlider,ShapeSlider districtHeatingSlider,ShapeSlider customHeatingSlider)
-{/*ALCODESTART::1754391096443*/
+//// Get current pct values (after slider change, but before correction; In other words total_pct != 100)
 double pct_naturalGasBurner = gasBurnerSlider.getValue();
-double pct_electricHeatPump = heatPumpSlider.getValue();
 double pct_hybridHeatPump = hybridHeatPumpSlider != null ? hybridHeatPumpSlider.getValue() : 0;
-double pct_districtHeating = districtHeatingSlider != null ? districtHeatingSlider.getValue() : 0;
+double pct_electricHeatPump = heatPumpSlider != null ? heatPumpSlider.getValue() : 0;
+double pct_HTdistrictHeating = HTdistrictHeatingSlider != null ? HTdistrictHeatingSlider.getValue() : 0;
+double pct_LTdistrictHeating = LTdistrictHeatingSlider != null ? LTdistrictHeatingSlider.getValue() : 0;
 double pct_customHeatingSlider = customHeatingSlider != null ? customHeatingSlider.getValue() : 0;
 
 //Set array with pct values
 double pctArray[] = {
     pct_naturalGasBurner,
-    pct_electricHeatPump,
     pct_hybridHeatPump,
-    pct_districtHeating,
+    pct_electricHeatPump,
+    pct_HTdistrictHeating,
+    pct_LTdistrictHeating,    
     pct_customHeatingSlider
 };
 
+//// Create a ghost asset array, and fill it. This is used to find minimums of certain sliders. Also get the total amount of GC with heating systems.
+int ghostAssetTotalArray[] = new int[pctArray.length];
+int totalGCWithHeating = 0;
+for(GridConnection GC : gcList){
+	if(GC.f_getCurrentHeatingType() != OL_GridConnectionHeatingType.NONE && GC.v_isActive){
+		totalGCWithHeating++;
+		
+		if(GC.p_heatingManagement instanceof J_HeatingManagementGhost){
+			switch(GC.f_getCurrentHeatingType()){
+				case GAS_BURNER:
+					ghostAssetTotalArray[0]++;
+					break;
+				case HYBRID_HEATPUMP:
+					ghostAssetTotalArray[1]++;
+					break;
+				case ELECTRIC_HEATPUMP:
+					ghostAssetTotalArray[2]++;
+					break;
+				case DISTRICTHEAT:
+					ghostAssetTotalArray[3]++;
+					break;
+				case LT_DISTRICTHEAT:
+					ghostAssetTotalArray[4]++;
+					break;
+				case CUSTOM:
+					ghostAssetTotalArray[5]++;
+					break;
+			}
+		}
+	}
+}
 
+//// Correct the slider change trough to the other sliders. But don't move the custom slider or set sliders lower than their unchangable ghost assets.
+int customSliderIndex = 5;
+double pctExcess = Arrays.stream(pctArray).sum() - 100;
+
+for (int i = 0; i < pctArray.length && pctExcess != 0 ; i++) {
+    if (i != changedSliderIndex && i != customSliderIndex) {
+        double ghostMin_pct = ((double) 100.0 * ghostAssetTotalArray[i]) / totalGCWithHeating;
+        double maxDown_pct = pctArray[i] - ghostMin_pct;
+        double maxUp_pct = 100 - pctArray[i];
+
+        // Determine the slider delta, positive delta -> slider increases, negative -> slider decreases
+        double deltaSlider_pct = 0;
+        if(pctExcess > 0){
+        	deltaSlider_pct = -min(maxDown_pct, pctExcess);
+        }
+        else{
+        	deltaSlider_pct = min(maxUp_pct, -pctExcess);
+        }
+
+        pctArray[i] += deltaSlider_pct;
+        pctExcess = Arrays.stream(pctArray).sum() - 100;
+    }
+}
 
-double pctFixed = pctArray[2] + pctArray[3] + pctArray[4]; // For now: hybrid heatpump, district heating and custom are fixed.
-double pctAdjustable = 100 - pctFixed;
-
-//Only adjust between gas and heat pump for now
-if (sliderIndex == 0) { // Gas moved
-    pctArray[0] = min(pctArray[0], pctAdjustable); // Limit gas to the available room
-    pctArray[1] = pctAdjustable - pctArray[0];     // HP gets the remaining
-} else if (sliderIndex == 1) { // Heat pump moved
-    pctArray[1] = min(pctArray[1], pctAdjustable); // Limit HP to the available room
-    pctArray[0] = pctAdjustable - pctArray[1];     // Gas gets the remaining
+//If still not 0, then adjust the changedSlider back to solve it.
+if (pctExcess != 0){
+	pctArray[changedSliderIndex] = max(0, pctArray[changedSliderIndex] - pctExcess);
 }
 
-// Set Sliders
+//// Set refound values to the sliders again
 gasBurnerSlider.setValue(roundToInt(pctArray[0]), false);
-heatPumpSlider.setValue(roundToInt(pctArray[1]), false);
 if(hybridHeatPumpSlider != null){
-	hybridHeatPumpSlider.setValue(roundToInt(pctArray[2]), false);
+	hybridHeatPumpSlider.setValue(roundToInt(pctArray[1]), false);
 }
-if(districtHeatingSlider != null){
-	districtHeatingSlider.setValue(roundToInt(pctArray[3]), false);
+if(heatPumpSlider != null){
+	heatPumpSlider.setValue(roundToInt(pctArray[2]), false);
+}
+if(HTdistrictHeatingSlider != null){
+	HTdistrictHeatingSlider.setValue(roundToInt(pctArray[3]), false);
+}
+if(LTdistrictHeatingSlider != null){
+	LTdistrictHeatingSlider.setValue(roundToInt(pctArray[4]), false);
 }
 if(customHeatingSlider != null){
-	customHeatingSlider.setValue(roundToInt(pctArray[4]), false);
+	customHeatingSlider.setValue(roundToInt(pctArray[5]), false);
 }
+
+
+//Set the heating systems in the engine to the correct setting
+f_setHeatingSystems(gcList, orderedHeatingSystemGCList, changedSliderHeatingType, pctArray[changedSliderIndex]);
 /*ALCODEEND*/}
 
 double f_updateSliders_Heating()
@@ -641,7 +700,7 @@ else if(gr_heatingSliders_residential.isVisible()){
 double f_updateHeatingSliders_default()
 {/*ALCODESTART::1754924509667*/
 ////Companies
-List<GCUtility> utilityGridConnections = uI_Tabs.f_getSliderGridConnections_utilities();
+List<GCUtility> utilityGridConnections = uI_Tabs.f_getActiveSliderGridConnections_utilities();
 
 //Savings (IN PROGRESS, WHAT ABOUT THERMAL BUILDINGS?????)
 double totalBaseConsumption_kWh = 0;
@@ -671,14 +730,50 @@ else if(gr_heatingSliders_residential.isVisible()){
 
 
 //Heating assets
-int GasBurners = count(utilityGridConnections, gc-> gc.f_getCurrentHeatingType() == OL_GridConnectionHeatingType.GAS_BURNER && gc.v_isActive);
-int GasBurners_pct = roundToInt(100.0 * GasBurners / count(utilityGridConnections, x -> x.v_isActive && x.f_getCurrentHeatingType() != OL_GridConnectionHeatingType.NONE));
+//Heating type
+int totalCompaniesWithHeating = 0;
+int nbOfCompaniesWithGasBurners = 0;
+int nbOfCompaniesWithHybridHeatpumps = 0;
+int nbOfCompaniesWithElectricHeatpumps = 0;
+int nbOfCompaniesOnHTHeatGrid = 0;
+int nbOfCompaniesOnLTHeatGrid = 0;
+
+for(GCUtility GC : utilityGridConnections){
+	if(GC.v_isActive && GC.f_getCurrentHeatingType() != OL_GridConnectionHeatingType.NONE){
+		totalCompaniesWithHeating++;
+		switch(GC.f_getCurrentHeatingType()){
+			case GAS_BURNER:
+				nbOfCompaniesWithGasBurners++;
+				break;
+			case HYBRID_HEATPUMP:
+				nbOfCompaniesWithHybridHeatpumps++;
+				break;
+			case ELECTRIC_HEATPUMP:
+				nbOfCompaniesWithElectricHeatpumps++;
+				break;
+			case DISTRICTHEAT:
+				nbOfCompaniesOnHTHeatGrid++;
+				break;
+			case LT_DISTRICTHEAT:
+				nbOfCompaniesOnLTHeatGrid++;
+				break;
+		}
+	}
+}
+
+int companiesWithGasBurners_pct = roundToInt(100.0 * nbOfCompaniesWithGasBurners / totalCompaniesWithHeating);
+int companiesWithHybridHeatpump_pct = roundToInt(100.0 * nbOfCompaniesWithHybridHeatpumps / totalCompaniesWithHeating);
+int companiesWithElectricHeatpump_pct = roundToInt(100.0 * nbOfCompaniesWithElectricHeatpumps / totalCompaniesWithHeating);
+int companiesWithHTDistrictHeat_pct = roundToInt(100.0 * nbOfCompaniesOnHTHeatGrid / totalCompaniesWithHeating);
+
+sl_gasBurnerCompanies_pct.setValue(companiesWithGasBurners_pct, false);
+sl_hybridHeatPumpCompanies_pct.setValue(companiesWithHybridHeatpump_pct, false);
+sl_electricHeatPumpCompanies_pct.setValue(companiesWithElectricHeatpump_pct, false);
+sl_districtHeatingCompanies_pct.setValue(companiesWithHTDistrictHeat_pct, false);
 
-sl_gasBurnerCompanies_pct.setValue(GasBurners_pct, false);
-f_setHeatingSliders( 0, sl_gasBurnerCompanies_pct, sl_electricHeatPumpCompanies_pct, null, null, null );
 
 ////Houses
-List<GCHouse> houseGridConnections = uI_Tabs.f_getSliderGridConnections_houses();
+List<GCHouse> houseGridConnections = uI_Tabs.f_getActiveSliderGridConnections_houses();
 
 //Savings
 double averageScalingFactor = 0;
@@ -712,42 +807,102 @@ else if(gr_heatingSliders_residential.isVisible()){
 sl_heatDemandReductionHouseholds_pct.setValue(roundToInt(averageSavingsFactor_pct), false);
 
 
-//Assets
-GasBurners = count(houseGridConnections, gc-> gc.f_getCurrentHeatingType() == OL_GridConnectionHeatingType.GAS_BURNER && gc.v_isActive);
-GasBurners_pct = roundToInt(100.0 * GasBurners / (count(houseGridConnections, x -> x.v_isActive && x.f_getCurrentHeatingType() != OL_GridConnectionHeatingType.NONE)));
+//Heating type
+int totalHousesWithHeating = 0;
+int nbOfHousesWithGasBurners = 0;
+int nbOfHousesWithHybridHeatpumps = 0;
+int nbOfHousesWithElectricHeatpumps = 0;
+int nbOfHousesOnHTHeatGrid = 0;
+int nbOfHousesOnLTHeatGrid = 0;
 
-sl_gasBurnerHouseholds_pct.setValue(GasBurners_pct, false);
-f_setHeatingSliders( 0, sl_gasBurnerHouseholds_pct, sl_electricHeatPumpHouseholds_pct, null, null, null );
+for(GCHouse GC : houseGridConnections){
+	if(GC.v_isActive && GC.f_getCurrentHeatingType() != OL_GridConnectionHeatingType.NONE){
+		totalHousesWithHeating++;
+		switch(GC.f_getCurrentHeatingType()){
+			case GAS_BURNER:
+				nbOfHousesWithGasBurners++;
+				break;
+			case HYBRID_HEATPUMP:
+				nbOfHousesWithHybridHeatpumps++;
+				break;
+			case ELECTRIC_HEATPUMP:
+				nbOfHousesWithElectricHeatpumps++;
+				break;
+			case DISTRICTHEAT:
+				nbOfHousesOnHTHeatGrid++;
+				break;
+			case LT_DISTRICTHEAT:
+				nbOfHousesOnLTHeatGrid++;
+				break;
+		}
+	}
+}
+
+int housesWithGasBurners_pct = roundToInt(100.0 * nbOfHousesWithGasBurners / totalHousesWithHeating);
+int housesWithHybridHeatpump_pct = roundToInt(100.0 * nbOfHousesWithHybridHeatpumps / totalHousesWithHeating);
+int housesWithElectricHeatpump_pct = roundToInt(100.0 * nbOfHousesWithElectricHeatpumps / totalHousesWithHeating);
+int housesWithHTDistrictHeat_pct = roundToInt(100.0 * nbOfHousesOnHTHeatGrid / totalHousesWithHeating);
+
+sl_gasBurnerHouseholds_pct.setValue(housesWithGasBurners_pct, false);
+sl_hybridHeatPumpHouseholds_pct.setValue(housesWithHybridHeatpump_pct, false);
+sl_electricHeatPumpHouseholds_pct.setValue(housesWithElectricHeatpump_pct, false);
+sl_districtHeatingHouseholds_pct.setValue(housesWithHTDistrictHeat_pct, false);
 
 /*ALCODEEND*/}
 
 double f_updateHeatingSliders_residential()
 {/*ALCODESTART::1754924542535*/
-List<GCHouse> houseGridConnections = uI_Tabs.f_getSliderGridConnections_houses();
+List<GCHouse> houseGridConnections = uI_Tabs.f_getActiveSliderGridConnections_houses();
 
 
 //Heating type
-int GasBurners = count(houseGridConnections, gc-> gc.f_getCurrentHeatingType() == OL_GridConnectionHeatingType.GAS_BURNER && gc.v_isActive);
-int GasBurners_pct = roundToInt(100.0 * GasBurners / (count(houseGridConnections, x -> x.v_isActive && x.f_getCurrentHeatingType() != OL_GridConnectionHeatingType.NONE)));
-int numberOfHousesOnHTHeatGrid = count(houseGridConnections, gc-> gc.f_getCurrentHeatingType() == OL_GridConnectionHeatingType.DISTRICTHEAT && gc.v_isActive);
-int numberOfHousesOnLTHeatGrid = count(houseGridConnections, gc-> gc.f_getCurrentHeatingType() == OL_GridConnectionHeatingType.LT_DISTRICTHEAT && gc.v_isActive);
+int totalHousesWithHeating = 0;
+int nbOfHousesWithGasBurners = 0;
+int nbOfHousesWithHybridHeatpumps = 0;
+int nbOfHousesWithElectricHeatpumps = 0;
+int nbOfHousesOnHTHeatGrid = 0;
+int nbOfHousesOnLTHeatGrid = 0;
+
+for(GCHouse GC : houseGridConnections){
+	if(GC.v_isActive && GC.f_getCurrentHeatingType() != OL_GridConnectionHeatingType.NONE){
+		totalHousesWithHeating++;
+		switch(GC.f_getCurrentHeatingType()){
+			case GAS_BURNER:
+				nbOfHousesWithGasBurners++;
+				break;
+			case HYBRID_HEATPUMP:
+				nbOfHousesWithHybridHeatpumps++;
+				break;
+			case ELECTRIC_HEATPUMP:
+				nbOfHousesWithElectricHeatpumps++;
+				break;
+			case DISTRICTHEAT:
+				nbOfHousesOnHTHeatGrid++;
+				break;
+			case LT_DISTRICTHEAT:
+				nbOfHousesOnLTHeatGrid++;
+				break;
+		}
+	}
+}
+
+int housesWithGasBurners_pct = roundToInt(100.0 * nbOfHousesWithGasBurners / totalHousesWithHeating);
+int housesWithHybridHeatpump_pct = roundToInt(100.0 * nbOfHousesWithHybridHeatpumps / totalHousesWithHeating);
+int housesWithElectricHeatpump_pct = roundToInt(100.0 * nbOfHousesWithElectricHeatpumps / totalHousesWithHeating);
+
+sl_householdGasBurnerResidentialArea_pct.setValue(housesWithGasBurners_pct, false);
+sl_householdHybridHeatpumpResidentialArea.setValue(housesWithHybridHeatpump_pct, false);
+sl_householdElectricHeatPumpResidentialArea_pct.setValue(housesWithElectricHeatpump_pct, false);
 cb_householdHTDistrictHeatingResidentialArea.setSelected(false, false);
 cb_householdLTDistrictHeatingResidentialArea.setSelected(false, false);
 
-if(numberOfHousesOnHTHeatGrid > 0 || numberOfHousesOnLTHeatGrid > 0){
-	sl_householdElectricHeatPumpResidentialArea_pct.setValue(0, false);
-	sl_householdGasBurnerResidentialArea_pct.setValue(0, false);
-	if(numberOfHousesOnHTHeatGrid > 0){
-		cb_householdHTDistrictHeatingResidentialArea.setSelected(true, false);
-	}
-	else{
-		cb_householdLTDistrictHeatingResidentialArea.setSelected(true, false);		
-	}
+if(nbOfHousesOnHTHeatGrid == totalHousesWithHeating){
+	cb_householdHTDistrictHeatingResidentialArea.setSelected(true, false);
 }
-else{
-	sl_householdGasBurnerResidentialArea_pct.setValue(GasBurners_pct, false);
-	f_setHeatingSliders( 0, sl_householdGasBurnerResidentialArea_pct, sl_householdElectricHeatPumpResidentialArea_pct, null, null, null );
+if(nbOfHousesOnLTHeatGrid == totalHousesWithHeating){
+	cb_householdLTDistrictHeatingResidentialArea.setSelected(true, false);
 }
+
 //Houses with Airco
 double nbHouses = houseGridConnections.size();
 double nbHousesWithAirco = count(houseGridConnections, x -> x.p_airco != null);
@@ -770,7 +925,7 @@ else if(gr_heatingSliders_residential.isVisible()){
 
 double f_updateHeatingSliders_businesspark()
 {/*ALCODESTART::1754924544023*/
-List<GCUtility> utilityGridConnections = uI_Tabs.f_getSliderGridConnections_utilities();
+List<GCUtility> utilityGridConnections = uI_Tabs.f_getActiveSliderGridConnections_utilities();
 
 //Savings (IN PROGRESS, WHAT ABOUT THERMAL BUILDINGS?????)
 double totalBaseConsumption_kWh = 0;
@@ -799,31 +954,55 @@ else if(gr_heatingSliders_residential.isVisible()){
 sl_heatDemandSlidersCompaniesHeatDemandReductionCompanies_pct.setValue(roundToInt(heatSavings_pct), false);
 
 
+//Heating type
+int totalCompaniesWithHeating = 0;
+int nbOfCompaniesWithGasBurners = 0;
+int nbOfCompaniesWithHybridHeatpumps = 0;
+int nbOfCompaniesWithElectricHeatpumps = 0;
+int nbOfCompaniesOnHTHeatGrid = 0;
+int nbOfCompaniesOnLTHeatGrid = 0;
+int nbOfCompaniesWithCustomHeating = 0;
+
+for(GCUtility GC : utilityGridConnections){
+	if(GC.v_isActive && GC.f_getCurrentHeatingType() != OL_GridConnectionHeatingType.NONE){
+		totalCompaniesWithHeating++;
+		switch(GC.f_getCurrentHeatingType()){
+			case GAS_BURNER:
+				nbOfCompaniesWithGasBurners++;
+				break;
+			case HYBRID_HEATPUMP:
+				nbOfCompaniesWithHybridHeatpumps++;
+				break;
+			case ELECTRIC_HEATPUMP:
+				nbOfCompaniesWithElectricHeatpumps++;
+				break;
+			case DISTRICTHEAT:
+				nbOfCompaniesOnHTHeatGrid++;
+				break;
+			case LT_DISTRICTHEAT:
+				nbOfCompaniesOnLTHeatGrid++;
+				break;
+			case CUSTOM:
+				nbOfCompaniesWithCustomHeating++;
+				break;
+		}
+	}
+}
 
-//For now custom only for businessparks, future it should be made functional for other models as well!
-v_totalNumberOfCustomHeatingSystems = f_calculateNumberOfCustomHeatingSystems(new ArrayList<GridConnection>(utilityGridConnections));
-
-int totalCompaniesWithHeating = count(utilityGridConnections, x -> x.v_isActive && x.f_getCurrentHeatingType() != OL_GridConnectionHeatingType.NONE);
-
-int gasBurners = count(utilityGridConnections, gc-> gc.f_getCurrentHeatingType() == OL_GridConnectionHeatingType.GAS_BURNER && gc.v_isActive);
-int hybridHeatpump = count(utilityGridConnections, gc-> gc.f_getCurrentHeatingType() == OL_GridConnectionHeatingType.HYBRID_HEATPUMP && gc.v_isActive);
-int electricHeatpump = count(utilityGridConnections, gc-> gc.f_getCurrentHeatingType() == OL_GridConnectionHeatingType.ELECTRIC_HEATPUMP && gc.v_isActive);
-int districtHeating = count(utilityGridConnections, gc-> gc.f_getCurrentHeatingType() == OL_GridConnectionHeatingType.DISTRICTHEAT && gc.v_isActive);
-int LTDistrictHeating = count(utilityGridConnections, gc-> gc.f_getCurrentHeatingType() == OL_GridConnectionHeatingType.LT_DISTRICTHEAT && gc.v_isActive);
+int companiesWithGasBurners_pct = roundToInt(100.0 * nbOfCompaniesWithGasBurners / totalCompaniesWithHeating);
+int companiesWithHybridHeatpump_pct = roundToInt(100.0 * nbOfCompaniesWithHybridHeatpumps / totalCompaniesWithHeating);
+int companiesWithElectricHeatpump_pct = roundToInt(100.0 * nbOfCompaniesWithElectricHeatpumps / totalCompaniesWithHeating);
+int companiesWithHTDistrictHeat_pct = roundToInt(100.0 * nbOfCompaniesOnHTHeatGrid / totalCompaniesWithHeating);
+int companiesWithLTDistrictHeat_pct = roundToInt(100.0 * nbOfCompaniesOnLTHeatGrid / totalCompaniesWithHeating);
+int companiesWithCustomHeating_pct = roundToInt(100.0 * nbOfCompaniesWithCustomHeating / totalCompaniesWithHeating);
 
-int gasBurners_pct = roundToInt(100.0 * gasBurners / totalCompaniesWithHeating);
-int hybridHeatpump_pct = roundToInt(100.0 * hybridHeatpump / totalCompaniesWithHeating);
-int electricHeatpump_pct = roundToInt(100.0 * electricHeatpump / totalCompaniesWithHeating);
-int districtHeating_pct = roundToInt(100.0 * districtHeating / totalCompaniesWithHeating);
-int LTDistrictHeating_pct = roundToInt(100.0 * LTDistrictHeating / totalCompaniesWithHeating);
-int customHeating_pct = roundToInt(100.0 * v_totalNumberOfCustomHeatingSystems/totalCompaniesWithHeating);
 
-sl_heatDemandSlidersCompaniesGasBurnerCompanies_pct.setValue(gasBurners_pct, false);
-sl_heatDemandSlidersCompaniesHybridHeatPumpCompanies_pct.setValue(hybridHeatpump_pct, false);
-sl_heatDemandSlidersCompaniesElectricHeatPumpCompanies_pct.setValue(electricHeatpump_pct, false);
-sl_heatDemandSlidersCompaniesDistrictHeatingCompanies_pct.setValue(districtHeating_pct, false);
-//sl_heatDemandSlidersCompaniesLTDistrictHeatingCompanies_pct.setValue(LTDistrictHeating_pct, false); Doesnt exist (yet) for companies
-sl_heatingTypeSlidersCompaniesCustom_pct.setValue(customHeating_pct, false);
+sl_heatDemandSlidersCompaniesGasBurnerCompanies_pct.setValue(companiesWithGasBurners_pct, false);
+sl_heatDemandSlidersCompaniesHybridHeatPumpCompanies_pct.setValue(companiesWithHybridHeatpump_pct, false);
+sl_heatDemandSlidersCompaniesElectricHeatPumpCompanies_pct.setValue(companiesWithElectricHeatpump_pct, false);
+sl_heatDemandSlidersCompaniesDistrictHeatingCompanies_pct.setValue(companiesWithHTDistrictHeat_pct, false);
+//sl_heatDemandSlidersCompaniesLTDistrictHeatingCompanies_pct.setValue(companiesWithLTDistrictHeat_pct, false); Doesnt exist (yet) for companies
+sl_heatingTypeSlidersCompaniesCustom_pct.setValue(companiesWithCustomHeating_pct, false);
 
 /*ALCODEEND*/}
 
@@ -834,3 +1013,283 @@ else if(gr_heatingSliders_residential.isVisible()){
 traceln("Forgot to override the update custom heating sliders functionality");
 /*ALCODEEND*/}
 
+double f_setHeatingSystems(List<GridConnection> gcList,List<GridConnection> orderedHeatingSystemGCList,OL_GridConnectionHeatingType changedSliderHeatingType,double sliderGoal_pct)
+{/*ALCODESTART::1760350664957*/
+int totalNrOfHeatingSystems = 0;
+int nbGasBurners = 0;
+int nbHybridHeatpumps = 0;
+int nbElectricHeatpumps = 0;
+int nbHTHeatGrid = 0;
+int nbLTHeatGrid = 0;
+int nbCustomHeating = 0;
+List<GridConnection> gasBurnerGCs = new ArrayList<>();
+List<GridConnection> hybridHeatpumpGCs = new ArrayList<>();
+List<GridConnection> electricHeatpumpGCs = new ArrayList<>();
+List<GridConnection> HTHeatGridGCs = new ArrayList<>();
+List<GridConnection> LTHeatGridGCs = new ArrayList<>();
+
+for(GridConnection GC : gcList){
+	if(GC.v_isActive && GC.f_getCurrentHeatingType() != OL_GridConnectionHeatingType.NONE){
+		totalNrOfHeatingSystems++; 		
+		switch(GC.f_getCurrentHeatingType()){
+			case GAS_BURNER:
+				nbGasBurners++;
+				if(!(GC.p_heatingManagement instanceof J_HeatingManagementGhost)){
+					gasBurnerGCs.add(GC);
+				}
+				break;
+			case HYBRID_HEATPUMP:
+				nbHybridHeatpumps++;
+				if(!(GC.p_heatingManagement instanceof J_HeatingManagementGhost)){
+					hybridHeatpumpGCs.add(GC);
+				}
+				break;
+			case ELECTRIC_HEATPUMP:
+				nbElectricHeatpumps++;
+				if(!(GC.p_heatingManagement instanceof J_HeatingManagementGhost)){
+					electricHeatpumpGCs.add(GC);
+				}
+				break;
+			case DISTRICTHEAT:
+				nbHTHeatGrid++;
+				if(!(GC.p_heatingManagement instanceof J_HeatingManagementGhost)){
+					HTHeatGridGCs.add(GC);
+				}
+				break;
+			case LT_DISTRICTHEAT:
+				nbLTHeatGrid++;
+				if(!(GC.p_heatingManagement instanceof J_HeatingManagementGhost)){
+					LTHeatGridGCs.add(GC);
+				}
+				break;
+			case CUSTOM:
+					nbCustomHeating++;
+				if(!(GC.p_heatingManagement instanceof J_HeatingManagementGhost)){
+					//No collection, as ghost cant be changed anyway
+				}
+				break;
+		}
+	}
+}
+
+int nbChangedHeatingTypeGoal = roundToInt(totalNrOfHeatingSystems*sliderGoal_pct/100.0);
+
+int currentNumberOfChangedHeatingType = 0;
+
+switch(changedSliderHeatingType){
+	case GAS_BURNER:
+		currentNumberOfChangedHeatingType = nbGasBurners;
+		break;
+	case HYBRID_HEATPUMP:
+		currentNumberOfChangedHeatingType = nbHybridHeatpumps;
+		break;
+	case ELECTRIC_HEATPUMP:
+		currentNumberOfChangedHeatingType = nbElectricHeatpumps;
+		break;
+	case DISTRICTHEAT:
+		currentNumberOfChangedHeatingType = nbHTHeatGrid;
+		break;
+	case LT_DISTRICTHEAT:
+		currentNumberOfChangedHeatingType = nbLTHeatGrid;
+		break;
+}
+
+
+
+if (currentNumberOfChangedHeatingType < nbChangedHeatingTypeGoal) {
+	while ( currentNumberOfChangedHeatingType < nbChangedHeatingTypeGoal ) {
+	
+		GridConnection changingGC = null;
+		if(changedSliderHeatingType != OL_GridConnectionHeatingType.GAS_BURNER && gasBurnerGCs.size() > 0){
+			changingGC = findFirst(orderedHeatingSystemGCList, gc -> gasBurnerGCs.contains(gc));
+			gasBurnerGCs.remove(changingGC);		
+		}
+		else if(changedSliderHeatingType != OL_GridConnectionHeatingType.HYBRID_HEATPUMP && hybridHeatpumpGCs.size() > 0){
+			changingGC = findFirst(orderedHeatingSystemGCList, gc -> hybridHeatpumpGCs.contains(gc));
+			hybridHeatpumpGCs.remove(changingGC);
+		}
+		else if (changedSliderHeatingType != OL_GridConnectionHeatingType.ELECTRIC_HEATPUMP && electricHeatpumpGCs.size() > 0 ) {
+			changingGC = findFirst(orderedHeatingSystemGCList, gc -> electricHeatpumpGCs.contains(gc));
+			electricHeatpumpGCs.remove(changingGC);
+		}
+		else if (changedSliderHeatingType != OL_GridConnectionHeatingType.DISTRICTHEAT && HTHeatGridGCs.size() > 0 ) {
+			changingGC = findFirst(orderedHeatingSystemGCList, gc -> HTHeatGridGCs.contains(gc));
+			HTHeatGridGCs.remove(changingGC);
+		}
+		else if (changedSliderHeatingType != OL_GridConnectionHeatingType.LT_DISTRICTHEAT && LTHeatGridGCs.size() > 0 ) {
+			changingGC = findFirst(orderedHeatingSystemGCList, gc -> LTHeatGridGCs.contains(gc));
+			LTHeatGridGCs.remove(changingGC);
+		}
+		else{
+			throw new RuntimeException("No more GC left to change into raised slider type!" );
+		}
+		
+		if(changingGC == null){
+			throw new RuntimeException("orderedHeatingSystemGClist does not contain a GC found by this function! This should not be possible!" );
+		}
+		
+		//Change the current heating type to the new one
+		changingGC.f_removeAllHeatingAssets();
+		f_addHeatAsset(changingGC, changedSliderHeatingType, f_calculatePeakHeatDemand_kW(changingGC));
+		changingGC.f_addHeatManagementToGC(changingGC, changedSliderHeatingType, false);
+		currentNumberOfChangedHeatingType ++;
+	}
+}
+else {
+	// Remove Gas burners Trucks
+	while ( currentNumberOfChangedHeatingType > nbChangedHeatingTypeGoal ) {
+		// replace a gasburner with a hybrid heatpump
+		GridConnection changingGC = null;
+		OL_GridConnectionHeatingType newHeatingType = OL_GridConnectionHeatingType.GAS_BURNER; // Always change into gasburner system.
+		if(changedSliderHeatingType == OL_GridConnectionHeatingType.GAS_BURNER){
+			changingGC = findFirst(orderedHeatingSystemGCList, gc -> gasBurnerGCs.contains(gc));
+			gasBurnerGCs.remove(changingGC);
+			newHeatingType = OL_GridConnectionHeatingType.HYBRID_HEATPUMP; // If removing gasburner, change into hybrid system.
+		}
+		else if(changedSliderHeatingType == OL_GridConnectionHeatingType.HYBRID_HEATPUMP){
+			changingGC = findFirst(orderedHeatingSystemGCList, gc -> hybridHeatpumpGCs.contains(gc));
+			hybridHeatpumpGCs.remove(changingGC);
+		}
+		else if(changedSliderHeatingType == OL_GridConnectionHeatingType.ELECTRIC_HEATPUMP){
+			changingGC = findFirst(orderedHeatingSystemGCList, gc -> electricHeatpumpGCs.contains(gc));
+			electricHeatpumpGCs.remove(changingGC);
+		}
+		else if(changedSliderHeatingType == OL_GridConnectionHeatingType.DISTRICTHEAT){
+			changingGC = findFirst(orderedHeatingSystemGCList, gc -> HTHeatGridGCs.contains(gc));
+			HTHeatGridGCs.remove(changingGC);
+		}
+		else if(changedSliderHeatingType == OL_GridConnectionHeatingType.LT_DISTRICTHEAT){
+			changingGC = findFirst(orderedHeatingSystemGCList, gc -> LTHeatGridGCs.contains(gc));
+			LTHeatGridGCs.remove(changingGC);
+		}
+		changingGC.f_removeAllHeatingAssets();
+		f_addHeatAsset(changingGC, newHeatingType, f_calculatePeakHeatDemand_kW(changingGC));
+		changingGC.f_addHeatManagementToGC(changingGC, newHeatingType, false);
+		currentNumberOfChangedHeatingType--;
+	}
+}
+
+
+//Update variable to change to custom scenario
+if(!zero_Interface.b_runningMainInterfaceScenarios){
+	zero_Interface.b_changeToCustomScenario = true;
+}
+zero_Interface.f_resetSettings();
+/*ALCODEEND*/}
+
+double f_addHeatAsset(GridConnection parentGC,OL_GridConnectionHeatingType heatAssetType,double maxHeatOutputPower_kW)
+{/*ALCODESTART::1760368810352*/
+//Initialize parameters
+double heatOutputCapacityGasBurner_kW;
+double inputCapacityElectric_kW;
+double efficiency;
+double baseTemperature_degC;
+double outputTemperature_degC;
+OL_AmbientTempType ambientTempType;
+double sourceAssetHeatPower_kW;
+double belowZeroHeatpumpEtaReductionFactor;
+maxHeatOutputPower_kW = maxHeatOutputPower_kW*2; // Make the asset capacity twice as high, to make sure it can handle the load in other scenarios with more heat consumption.
+J_AVGC_data avgc_data = zero_Interface.energyModel.avgc_data;
+double timeStep_h = zero_Interface.energyModel.p_timeStep_h;
+
+switch (heatAssetType){ // There is always only one heatingType, If there are many assets the type is CUSTOM
+
+	case GAS_BURNER:
+		heatOutputCapacityGasBurner_kW = max(avgc_data.p_minGasBurnerOutputCapacity_kW, maxHeatOutputPower_kW);			
+		J_EAConversionGasBurner gasBurner = new J_EAConversionGasBurner(parentGC, heatOutputCapacityGasBurner_kW , avgc_data.p_avgEfficiencyGasBurner_fr, timeStep_h, 90);
+		break;
+	
+	case HYBRID_HEATPUMP:
+	
+		//Add primary heating asset (heatpump) (if its not part of the basic profile already
+		inputCapacityElectric_kW = max(avgc_data.p_minHeatpumpElectricCapacity_kW, maxHeatOutputPower_kW / 3); //-- /3, kan nog kleiner want is hybride zodat gasbrander ook bij springt, dus kleiner MOETEN aanname voor hoe klein onderzoeken
+		
+		efficiency = avgc_data.p_avgEfficiencyHeatpump_fr;
+		baseTemperature_degC = zero_Interface.energyModel.pp_ambientTemperature_degC.getCurrentValue();
+		outputTemperature_degC = avgc_data.p_avgOutputTemperatureHeatpump_degC;
+		ambientTempType = OL_AmbientTempType.AMBIENT_AIR;
+		sourceAssetHeatPower_kW = 0;
+		belowZeroHeatpumpEtaReductionFactor = 1;
+		
+		J_EAConversionHeatPump heatPumpHybrid = new J_EAConversionHeatPump(parentGC, inputCapacityElectric_kW, efficiency, timeStep_h, outputTemperature_degC, baseTemperature_degC, sourceAssetHeatPower_kW, belowZeroHeatpumpEtaReductionFactor, ambientTempType);
+
+		zero_Interface.energyModel.c_ambientDependentAssets.add(heatPumpHybrid);
+		
+		//Add secondary heating asset (gasburner)
+		heatOutputCapacityGasBurner_kW = max(avgc_data.p_minGasBurnerOutputCapacity_kW, maxHeatOutputPower_kW);	
+		efficiency = avgc_data.p_avgEfficiencyGasBurner_fr;
+		outputTemperature_degC = avgc_data.p_avgOutputTemperatureGasBurner_degC;
+	
+		J_EAConversionGasBurner gasBurnerHybrid = new J_EAConversionGasBurner(parentGC, heatOutputCapacityGasBurner_kW, efficiency, timeStep_h, outputTemperature_degC);		
+		break;
+	
+	case ELECTRIC_HEATPUMP:
+		//Add primary heating asset (heatpump)
+		inputCapacityElectric_kW = max(avgc_data.p_minHeatpumpElectricCapacity_kW, maxHeatOutputPower_kW); // Could be smaller due to high cop	
+		efficiency = avgc_data.p_avgEfficiencyHeatpump_fr;
+		baseTemperature_degC = zero_Interface.energyModel.pp_ambientTemperature_degC.getCurrentValue();
+		outputTemperature_degC = avgc_data.p_avgOutputTemperatureHeatpump_degC;
+		ambientTempType = OL_AmbientTempType.AMBIENT_AIR;
+		sourceAssetHeatPower_kW = 0;
+		belowZeroHeatpumpEtaReductionFactor = 1;
+		
+		new J_EAConversionHeatPump(parentGC, inputCapacityElectric_kW, efficiency, timeStep_h, outputTemperature_degC, baseTemperature_degC, sourceAssetHeatPower_kW, belowZeroHeatpumpEtaReductionFactor, ambientTempType );		
+		break;
+
+	case GAS_CHP:
+		
+		double outputCapacityElectric_kW = (maxHeatOutputPower_kW/avgc_data.p_avgEfficiencyCHP_thermal_fr) * avgc_data.p_avgEfficiencyCHP_electric_fr;
+		outputTemperature_degC = avgc_data.p_avgOutputTemperatureCHP_degC;
+		efficiency = avgc_data.p_avgEfficiencyCHP_thermal_fr + avgc_data.p_avgEfficiencyCHP_electric_fr;
+		
+		new J_EAConversionGasCHP(parentGC, outputCapacityElectric_kW, maxHeatOutputPower_kW, efficiency, timeStep_h, outputTemperature_degC );
+		break;
+
+	case DISTRICTHEAT:
+		double heatOutputCapacityDeliverySet_kW = max(avgc_data.p_minDistrictHeatingDeliverySetOutputCapacity_kW, maxHeatOutputPower_kW);		
+		outputTemperature_degC = avgc_data.p_avgOutputTemperatureDistrictHeatingDeliverySet_degC;
+		efficiency = avgc_data.p_avgEfficiencyDistrictHeatingDeliverySet_fr;
+		
+		new J_EAConversionHeatDeliverySet(parentGC, heatOutputCapacityDeliverySet_kW, efficiency, timeStep_h, outputTemperature_degC);
+		
+		//Add GC to heat grid
+		GridNode heatgrid = findFirst(zero_Interface.energyModel.pop_gridNodes, node -> node.p_energyCarrier == OL_EnergyCarriers.HEAT);
+		if(heatgrid == null){
+			heatgrid = f_createNewHeatGrid();
+		}
+		//Connect
+		parentGC.p_parentNodeHeatID = heatgrid.p_gridNodeID;
+		parentGC.p_parentNodeHeat = heatgrid;
+		break;
+}
+
+/*ALCODEEND*/}
+
+GridNode f_createNewHeatGrid()
+{/*ALCODESTART::1760370085949*/
+GridNode GN_heat = zero_Interface.energyModel.add_pop_gridNodes();
+zero_Interface.energyModel.f_getGridNodesTopLevel().add(GN_heat);
+GN_heat.p_gridNodeID = "Heatgrid";
+
+// Check wether transformer capacity is known or estimated
+GN_heat.p_capacity_kW = 1000000;	
+GN_heat.p_realCapacityAvailable = false;
+
+// Basic GN information
+GN_heat.p_description = "Custom toegevoegde Warmtenet";
+
+//Define node type
+GN_heat.p_nodeType = OL_GridNodeType.HT;
+GN_heat.p_energyCarrier = OL_EnergyCarriers.HEAT;
+
+//Define GN location
+GN_heat.p_latitude = 0;
+GN_heat.p_longitude = 0;
+GN_heat.setLatLon(GN_heat.p_latitude, GN_heat.p_longitude);
+
+//Show warning that heat grid is not a simple solution
+zero_Interface.f_setErrorScreen("LET OP: Er is nu een 'warmtenet' gecreëerd. Maar er is geen warmtebron aanwezig in het model. Daarom zal de benodigde warmte voor het warmtenet in de resultaten te zien zijn als warmte import.", 0, 0);
+
+return GN_heat;
+/*ALCODEEND*/}
+
diff --git a/_alp/Agents/tabHeating/Code/Functions.xml b/_alp/Agents/tabHeating/Code/Functions.xml
index 30a54ee5..35bc2211 100644
--- a/_alp/Agents/tabHeating/Code/Functions.xml
+++ b/_alp/Agents/tabHeating/Code/Functions.xml
@@ -6,8 +6,9 @@
 		<Id>1722256102007</Id>
 		<Name><![CDATA[f_setHeatingSystemsCompanies]]></Name>
 		<Description><![CDATA[Function that adds or removes heatpumps to utility connections. Takes a percentage as a parameter and runs untill that percentage of all the utility connections has a heatpump. If a new heatpump is created it determines its heat demand on a heat_demand consumption asset if it exists, else it looks for a heat profile asset. The function also updates the radio button in the company UI.]]></Description>
-		<X>70</X>
-		<Y>720</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>100</X>
+		<Y>1190</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -47,8 +48,9 @@
 		<Id>1722256221655</Id>
 		<Name><![CDATA[f_setHeatingSystemsHouseholds]]></Name>
 		<Description><![CDATA[Function that adds or removes heatpumps to houses. Takes a percentage as a parameter and runs untill that percentage of all the houses has a heatpump. If a new heatpump is created it determines its heat demand on a heat_demand consumption asset if it exists, else it looks for a heat profile asset.]]></Description>
-		<X>70</X>
-		<Y>760</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>100</X>
+		<Y>1230</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -96,8 +98,9 @@
 		<ReturnType>int</ReturnType>
 		<Id>1729259449060</Id>
 		<Name><![CDATA[f_setHeatingSystemsWithCompanyUI]]></Name>
-		<X>90</X>
-		<Y>740</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>120</X>
+		<Y>1210</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -140,8 +143,8 @@
 		<ReturnType>double</ReturnType>
 		<Id>1749116448649</Id>
 		<Name><![CDATA[f_calculatePeakHeatDemand_kW]]></Name>
-		<X>40</X>
-		<Y>1100</Y>
+		<X>60</X>
+		<Y>1070</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -309,26 +312,6 @@
 		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
-	<Function AccessType="default" StaticFunction="false">
-		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
-		<ReturnType>int</ReturnType>
-		<Id>1754385214478</Id>
-		<Name><![CDATA[f_calculateNumberOfCustomHeatingSystems]]></Name>
-		<X>40</X>
-		<Y>1130</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="public" StaticFunction="false">
 		<ReturnModificator>VOID</ReturnModificator>
 		<ReturnType>double</ReturnType>
@@ -345,23 +328,35 @@
 		<PresentationFlag>true</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
 		<Parameter>
-			<Name><![CDATA[sliderIndex]]></Name>
-			<Type><![CDATA[int]]></Type>
+			<Name><![CDATA[gcList]]></Name>
+			<Type><![CDATA[List<GridConnection>]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[orderedHeatingSystemGCList]]></Name>
+			<Type><![CDATA[List<GridConnection>]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[changedSliderHeatingType]]></Name>
+			<Type><![CDATA[OL_GridConnectionHeatingType]]></Type>
 		</Parameter>
 		<Parameter>
 			<Name><![CDATA[gasBurnerSlider]]></Name>
 			<Type><![CDATA[ShapeSlider]]></Type>
 		</Parameter>
+		<Parameter>
+			<Name><![CDATA[hybridHeatPumpSlider]]></Name>
+			<Type><![CDATA[ShapeSlider]]></Type>
+		</Parameter>
 		<Parameter>
 			<Name><![CDATA[heatPumpSlider]]></Name>
 			<Type><![CDATA[ShapeSlider]]></Type>
 		</Parameter>
 		<Parameter>
-			<Name><![CDATA[hybridHeatPumpSlider]]></Name>
+			<Name><![CDATA[HTdistrictHeatingSlider]]></Name>
 			<Type><![CDATA[ShapeSlider]]></Type>
 		</Parameter>
 		<Parameter>
-			<Name><![CDATA[districtHeatingSlider]]></Name>
+			<Name><![CDATA[LTdistrictHeatingSlider]]></Name>
 			<Type><![CDATA[ShapeSlider]]></Type>
 		</Parameter>
 		<Parameter>
@@ -450,4 +445,80 @@
 		<ShowLabel>true</ShowLabel>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
+	<Function AccessType="public" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1760350664957</Id>
+		<Name><![CDATA[f_setHeatingSystems]]></Name>
+		<X>90</X>
+		<Y>711</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[orderedHeatingSystemGCList]]></Name>
+			<Type><![CDATA[List<GridConnection>]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[changedSliderHeatingType]]></Name>
+			<Type><![CDATA[OL_GridConnectionHeatingType]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[sliderGoal_pct]]></Name>
+			<Type><![CDATA[double]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="protected" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1760368810352</Id>
+		<Name><![CDATA[f_addHeatAsset]]></Name>
+		<X>110</X>
+		<Y>731</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[parentGC]]></Name>
+			<Type><![CDATA[GridConnection]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[heatAssetType]]></Name>
+			<Type><![CDATA[OL_GridConnectionHeatingType]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[maxHeatOutputPower_kW]]></Name>
+			<Type><![CDATA[double]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
+		<ReturnType>GridNode</ReturnType>
+		<Id>1760370085949</Id>
+		<Name><![CDATA[f_createNewHeatGrid]]></Name>
+		<X>130</X>
+		<Y>751</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
 </Functions>
diff --git a/_alp/Agents/tabHeating/Levels/Level.level.xml b/_alp/Agents/tabHeating/Levels/Level.level.xml
index 1d41da41..0b38466e 100644
--- a/_alp/Agents/tabHeating/Levels/Level.level.xml
+++ b/_alp/Agents/tabHeating/Levels/Level.level.xml
@@ -122,9 +122,8 @@
 			<Text>
 				<Id>1722253128682</Id>
 				<Name><![CDATA[t_hybridHeatPumpHouseholdsDescription]]></Name>
-				<ExcludeFromBuild>true</ExcludeFromBuild>
 				<X>30</X>
-				<Y>290</Y>
+				<Y>265</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -149,7 +148,7 @@
 				<Id>1722253128684</Id>
 				<Name><![CDATA[t_electricHeatPumpHouseholdsDescription]]></Name>
 				<X>30</X>
-				<Y>265</Y>
+				<Y>290</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -173,7 +172,6 @@
 			<Text>
 				<Id>1722253128686</Id>
 				<Name><![CDATA[t_districtHeatingHouseholdsDescription]]></Name>
-				<ExcludeFromBuild>true</ExcludeFromBuild>
 				<X>30</X>
 				<Y>315</Y>
 				<Label>
@@ -200,7 +198,7 @@
 				<Id>1722253128688</Id>
 				<Name><![CDATA[t_electricHeatPumpHouseholds_pct]]></Name>
 				<X>235</X>
-				<Y>265</Y>
+				<Y>290</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -251,7 +249,6 @@
 			<Text>
 				<Id>1722253128692</Id>
 				<Name><![CDATA[t_districtHeatingHouseholds_pct]]></Name>
-				<ExcludeFromBuild>true</ExcludeFromBuild>
 				<X>235</X>
 				<Y>315</Y>
 				<Label>
@@ -278,9 +275,8 @@
 			<Text>
 				<Id>1722253128694</Id>
 				<Name><![CDATA[t_hybridHeatPumpHouseholds_pct]]></Name>
-				<ExcludeFromBuild>true</ExcludeFromBuild>
 				<X>235</X>
-				<Y>290</Y>
+				<Y>265</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -306,7 +302,6 @@
 				<EmbeddedIcon>false</EmbeddedIcon>
 				<Id>1722253128696</Id>
 				<Name><![CDATA[sl_districtHeatingHouseholds_pct]]></Name>
-				<ExcludeFromBuild>true</ExcludeFromBuild>
 				<X>265</X>
 				<Y>310</Y>
 				<Label>
@@ -321,9 +316,8 @@
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<VisibleCode>false</VisibleCode>
 					<Enabled>false</Enabled>
-					<ActionCode>traceln("Slider doet nog niets!!");
-//f_setHeatingSliders(3);
-//f_resetNeighborhoodHeatingSystems(4);</ActionCode>
+					<ActionCode>f_setHeatingSliders( new ArrayList&lt;GridConnection&gt;(uI_Tabs.f_getActiveSliderGridConnections_houses()), new ArrayList&lt;GridConnection&gt;(zero_Interface.c_orderedHeatingSystemsHouses), OL_GridConnectionHeatingType.DISTRICTHEAT, sl_gasBurnerHouseholds_pct, sl_hybridHeatPumpHouseholds_pct, sl_electricHeatPumpHouseholds_pct, sl_districtHeatingHouseholds_pct, null, null );
+</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -351,8 +345,7 @@
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setHeatingSliders( 0, sl_gasBurnerHouseholds_pct, sl_electricHeatPumpHouseholds_pct, null, null, null );
-f_setHeatingSystemsHouseholds( uI_Tabs.f_getSliderGridConnections_houses(), sl_electricHeatPumpHouseholds_pct.getValue() );
+					<ActionCode>f_setHeatingSliders( new ArrayList&lt;GridConnection&gt;(uI_Tabs.f_getActiveSliderGridConnections_houses()), new ArrayList&lt;GridConnection&gt;(zero_Interface.c_orderedHeatingSystemsHouses), OL_GridConnectionHeatingType.GAS_BURNER, sl_gasBurnerHouseholds_pct, sl_hybridHeatPumpHouseholds_pct, sl_electricHeatPumpHouseholds_pct, sl_districtHeatingHouseholds_pct, null, null );
 </ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
@@ -368,9 +361,8 @@ f_setHeatingSystemsHouseholds( uI_Tabs.f_getSliderGridConnections_houses(), sl_e
 				<EmbeddedIcon>false</EmbeddedIcon>
 				<Id>1722253128700</Id>
 				<Name><![CDATA[sl_hybridHeatPumpHouseholds_pct]]></Name>
-				<ExcludeFromBuild>true</ExcludeFromBuild>
 				<X>265</X>
-				<Y>285</Y>
+				<Y>260</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -383,9 +375,7 @@ f_setHeatingSystemsHouseholds( uI_Tabs.f_getSliderGridConnections_houses(), sl_e
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<VisibleCode>false</VisibleCode>
 					<Enabled>false</Enabled>
-					<ActionCode>traceln("Slider doet nog niets!!");
-//f_setHeatingSliders(2);
-//f_resetNeighborhoodHeatingSystems(3);
+					<ActionCode>f_setHeatingSliders( new ArrayList&lt;GridConnection&gt;(uI_Tabs.f_getActiveSliderGridConnections_houses()), new ArrayList&lt;GridConnection&gt;(zero_Interface.c_orderedHeatingSystemsHouses), OL_GridConnectionHeatingType.HYBRID_HEATPUMP, sl_gasBurnerHouseholds_pct, sl_hybridHeatPumpHouseholds_pct, sl_electricHeatPumpHouseholds_pct, sl_districtHeatingHouseholds_pct, null, null );
 </ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
@@ -402,7 +392,7 @@ f_setHeatingSystemsHouseholds( uI_Tabs.f_getSliderGridConnections_houses(), sl_e
 				<Id>1722253128702</Id>
 				<Name><![CDATA[sl_electricHeatPumpHouseholds_pct]]></Name>
 				<X>265</X>
-				<Y>260</Y>
+				<Y>285</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -414,8 +404,7 @@ f_setHeatingSystemsHouseholds( uI_Tabs.f_getSliderGridConnections_houses(), sl_e
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setHeatingSliders( 1, sl_gasBurnerHouseholds_pct, sl_electricHeatPumpHouseholds_pct, null, null, null );
-f_setHeatingSystemsHouseholds( uI_Tabs.f_getSliderGridConnections_houses(), sl_electricHeatPumpHouseholds_pct.getValue() );
+					<ActionCode>f_setHeatingSliders( new ArrayList&lt;GridConnection&gt;(uI_Tabs.f_getActiveSliderGridConnections_houses()), new ArrayList&lt;GridConnection&gt;(zero_Interface.c_orderedHeatingSystemsHouses), OL_GridConnectionHeatingType.ELECTRIC_HEATPUMP, sl_gasBurnerHouseholds_pct, sl_hybridHeatPumpHouseholds_pct, sl_electricHeatPumpHouseholds_pct, sl_districtHeatingHouseholds_pct, null, null );
 </ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
@@ -444,7 +433,7 @@ f_setHeatingSystemsHouseholds( uI_Tabs.f_getSliderGridConnections_houses(), sl_e
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setDemandReductionHeating( new ArrayList&lt;GridConnection&gt;(uI_Tabs.f_getSliderGridConnections_houses()), sl_heatDemandReductionHouseholds_pct.getValue() );</ActionCode>
+					<ActionCode>f_setDemandReductionHeating( new ArrayList&lt;GridConnection&gt;(uI_Tabs.f_getActiveSliderGridConnections_houses()), sl_heatDemandReductionHouseholds_pct.getValue() );</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -548,7 +537,7 @@ f_setHeatingSystemsHouseholds( uI_Tabs.f_getSliderGridConnections_houses(), sl_e
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setDemandReductionHeating( new ArrayList&lt;GridConnection&gt;(uI_Tabs.f_getSliderGridConnections_utilities()), sl_heatDemandReductionCompanies_pct.getValue() );</ActionCode>
+					<ActionCode>f_setDemandReductionHeating( new ArrayList&lt;GridConnection&gt;(uI_Tabs.f_getActiveSliderGridConnections_utilities()), sl_heatDemandReductionCompanies_pct.getValue() );</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -638,9 +627,8 @@ f_setHeatingSystemsHouseholds( uI_Tabs.f_getSliderGridConnections_houses(), sl_e
 			<Text>
 				<Id>1722253128720</Id>
 				<Name><![CDATA[t_hybridHeatPumpCompaniesDescription]]></Name>
-				<ExcludeFromBuild>true</ExcludeFromBuild>
 				<X>25</X>
-				<Y>125</Y>
+				<Y>100</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -665,7 +653,7 @@ f_setHeatingSystemsHouseholds( uI_Tabs.f_getSliderGridConnections_houses(), sl_e
 				<Id>1722253128722</Id>
 				<Name><![CDATA[t_electricHeatPumpCompaniesDescription]]></Name>
 				<X>25</X>
-				<Y>100</Y>
+				<Y>125</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -689,7 +677,6 @@ f_setHeatingSystemsHouseholds( uI_Tabs.f_getSliderGridConnections_houses(), sl_e
 			<Text>
 				<Id>1722253128724</Id>
 				<Name><![CDATA[t_districtHeatingCompaniesDescription]]></Name>
-				<ExcludeFromBuild>true</ExcludeFromBuild>
 				<X>25</X>
 				<Y>150</Y>
 				<Label>
@@ -716,7 +703,7 @@ f_setHeatingSystemsHouseholds( uI_Tabs.f_getSliderGridConnections_houses(), sl_e
 				<Id>1722253128726</Id>
 				<Name><![CDATA[t_electricHeatPumpCompanies_pct]]></Name>
 				<X>235</X>
-				<Y>100</Y>
+				<Y>125</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -767,7 +754,6 @@ f_setHeatingSystemsHouseholds( uI_Tabs.f_getSliderGridConnections_houses(), sl_e
 			<Text>
 				<Id>1722253128730</Id>
 				<Name><![CDATA[t_districtHeatingCompanies_pct]]></Name>
-				<ExcludeFromBuild>true</ExcludeFromBuild>
 				<X>235</X>
 				<Y>150</Y>
 				<Label>
@@ -794,9 +780,8 @@ f_setHeatingSystemsHouseholds( uI_Tabs.f_getSliderGridConnections_houses(), sl_e
 			<Text>
 				<Id>1722253128732</Id>
 				<Name><![CDATA[t_hybridHeatPumpCompanies_pct]]></Name>
-				<ExcludeFromBuild>true</ExcludeFromBuild>
 				<X>235</X>
-				<Y>125</Y>
+				<Y>100</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -822,7 +807,6 @@ f_setHeatingSystemsHouseholds( uI_Tabs.f_getSliderGridConnections_houses(), sl_e
 				<EmbeddedIcon>false</EmbeddedIcon>
 				<Id>1722253128734</Id>
 				<Name><![CDATA[sl_districtHeatingCompanies_pct]]></Name>
-				<ExcludeFromBuild>true</ExcludeFromBuild>
 				<X>265</X>
 				<Y>145</Y>
 				<Label>
@@ -837,8 +821,8 @@ f_setHeatingSystemsHouseholds( uI_Tabs.f_getSliderGridConnections_houses(), sl_e
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<VisibleCode>false</VisibleCode>
 					<Enabled>true</Enabled>
-					<ActionCode>traceln("Slider doet nog niets!!");//f_setHeatingSlidersCompanies(3);
-//f_resetNeighborhoodHeatingSystems(4);</ActionCode>
+					<ActionCode>f_setHeatingSliders( new ArrayList&lt;GridConnection&gt;(uI_Tabs.f_getActiveSliderGridConnections_utilities()), new ArrayList&lt;GridConnection&gt;(zero_Interface.c_orderedHeatingSystemsCompanies), OL_GridConnectionHeatingType.DISTRICTHEAT, sl_gasBurnerCompanies_pct, sl_hybridHeatPumpCompanies_pct, sl_electricHeatPumpCompanies_pct, sl_districtHeatingCompanies_pct, null, null );
+</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -866,10 +850,8 @@ f_setHeatingSystemsHouseholds( uI_Tabs.f_getSliderGridConnections_houses(), sl_e
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setHeatingSliders( 0, sl_gasBurnerCompanies_pct, sl_electricHeatPumpCompanies_pct, null, null, null );
-f_setHeatingSystemsCompanies( uI_Tabs.f_getSliderGridConnections_utilities(), sl_gasBurnerCompanies_pct, sl_electricHeatPumpCompanies_pct, null, null, null  );
-
-zero_Interface.f_resetSettings();</ActionCode>
+					<ActionCode>f_setHeatingSliders( new ArrayList&lt;GridConnection&gt;(uI_Tabs.f_getActiveSliderGridConnections_utilities()), new ArrayList&lt;GridConnection&gt;(zero_Interface.c_orderedHeatingSystemsCompanies), OL_GridConnectionHeatingType.GAS_BURNER, sl_gasBurnerCompanies_pct, sl_hybridHeatPumpCompanies_pct, sl_electricHeatPumpCompanies_pct, sl_districtHeatingCompanies_pct, null, null );
+</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -884,9 +866,8 @@ zero_Interface.f_resetSettings();</ActionCode>
 				<EmbeddedIcon>false</EmbeddedIcon>
 				<Id>1722253128738</Id>
 				<Name><![CDATA[sl_hybridHeatPumpCompanies_pct]]></Name>
-				<ExcludeFromBuild>true</ExcludeFromBuild>
 				<X>265</X>
-				<Y>120</Y>
+				<Y>95</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -899,9 +880,8 @@ zero_Interface.f_resetSettings();</ActionCode>
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<VisibleCode>false</VisibleCode>
 					<Enabled>true</Enabled>
-					<ActionCode>traceln("Slider doet nog niets!!");//f_setHeatingSlidersCompanies(2);
-//f_resetNeighborhoodHeatingSystems(3);
-//sl_hybridHeatPumpCompanies.</ActionCode>
+					<ActionCode>f_setHeatingSliders( new ArrayList&lt;GridConnection&gt;(uI_Tabs.f_getActiveSliderGridConnections_utilities()), new ArrayList&lt;GridConnection&gt;(zero_Interface.c_orderedHeatingSystemsCompanies), OL_GridConnectionHeatingType.HYBRID_HEATPUMP, sl_gasBurnerCompanies_pct, sl_hybridHeatPumpCompanies_pct, sl_electricHeatPumpCompanies_pct, sl_districtHeatingCompanies_pct, null, null );
+</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -917,7 +897,7 @@ zero_Interface.f_resetSettings();</ActionCode>
 				<Id>1722253128740</Id>
 				<Name><![CDATA[sl_electricHeatPumpCompanies_pct]]></Name>
 				<X>265</X>
-				<Y>95</Y>
+				<Y>120</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -929,10 +909,8 @@ zero_Interface.f_resetSettings();</ActionCode>
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setHeatingSliders( 1, sl_gasBurnerCompanies_pct, sl_electricHeatPumpCompanies_pct, null, null, null );
-f_setHeatingSystemsCompanies( uI_Tabs.f_getSliderGridConnections_utilities(), sl_gasBurnerCompanies_pct, sl_electricHeatPumpCompanies_pct, null, null, null );
-
-zero_Interface.f_resetSettings();</ActionCode>
+					<ActionCode>f_setHeatingSliders( new ArrayList&lt;GridConnection&gt;(uI_Tabs.f_getActiveSliderGridConnections_utilities()), new ArrayList&lt;GridConnection&gt;(zero_Interface.c_orderedHeatingSystemsCompanies), OL_GridConnectionHeatingType.ELECTRIC_HEATPUMP, sl_gasBurnerCompanies_pct, sl_hybridHeatPumpCompanies_pct, sl_electricHeatPumpCompanies_pct, sl_districtHeatingCompanies_pct, null, null );
+</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -971,7 +949,7 @@ zero_Interface.f_resetSettings();</ActionCode>
 			<Image>
 				<Id>1746091940464</Id>
 				<Name><![CDATA[i_companyReduction]]></Name>
-				<X>160</X>
+				<X>170</X>
 				<Y>40</Y>
 				<Label>
 					<X>0</X>
@@ -998,7 +976,7 @@ zero_Interface.f_resetSettings();</ActionCode>
 			<Image>
 				<Id>1746092829752</Id>
 				<Name><![CDATA[i_companyGasBoiler]]></Name>
-				<X>160</X>
+				<X>170</X>
 				<Y>75</Y>
 				<Label>
 					<X>0</X>
@@ -1025,8 +1003,8 @@ zero_Interface.f_resetSettings();</ActionCode>
 			<Image>
 				<Id>1746092829788</Id>
 				<Name><![CDATA[i_companyElectricHeatpump]]></Name>
-				<X>160</X>
-				<Y>100</Y>
+				<X>170</X>
+				<Y>125</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -1052,9 +1030,8 @@ zero_Interface.f_resetSettings();</ActionCode>
 			<Image>
 				<Id>1746092829826</Id>
 				<Name><![CDATA[i_companyHybridHeatpump]]></Name>
-				<ExcludeFromBuild>true</ExcludeFromBuild>
-				<X>160</X>
-				<Y>125</Y>
+				<X>170</X>
+				<Y>100</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -1080,8 +1057,7 @@ zero_Interface.f_resetSettings();</ActionCode>
 			<Image>
 				<Id>1746092829863</Id>
 				<Name><![CDATA[i_companyHeatGrid]]></Name>
-				<ExcludeFromBuild>true</ExcludeFromBuild>
-				<X>160</X>
+				<X>170</X>
 				<Y>150</Y>
 				<Label>
 					<X>0</X>
@@ -1108,8 +1084,8 @@ zero_Interface.f_resetSettings();</ActionCode>
 			<Image>
 				<Id>1746092829905</Id>
 				<Name><![CDATA[i_householdElectricHeatpump]]></Name>
-				<X>160</X>
-				<Y>265</Y>
+				<X>170</X>
+				<Y>290</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -1135,7 +1111,7 @@ zero_Interface.f_resetSettings();</ActionCode>
 			<Image>
 				<Id>1746092829948</Id>
 				<Name><![CDATA[i_householdReduction]]></Name>
-				<X>160</X>
+				<X>170</X>
 				<Y>205</Y>
 				<Label>
 					<X>0</X>
@@ -1162,7 +1138,7 @@ zero_Interface.f_resetSettings();</ActionCode>
 			<Image>
 				<Id>1746092829986</Id>
 				<Name><![CDATA[i_householdGasBoiler]]></Name>
-				<X>160</X>
+				<X>170</X>
 				<Y>240</Y>
 				<Label>
 					<X>0</X>
@@ -1189,8 +1165,7 @@ zero_Interface.f_resetSettings();</ActionCode>
 			<Image>
 				<Id>1746092830024</Id>
 				<Name><![CDATA[i_householdHeatGrid]]></Name>
-				<ExcludeFromBuild>true</ExcludeFromBuild>
-				<X>160</X>
+				<X>170</X>
 				<Y>315</Y>
 				<Label>
 					<X>0</X>
@@ -1217,9 +1192,8 @@ zero_Interface.f_resetSettings();</ActionCode>
 			<Image>
 				<Id>1746092830063</Id>
 				<Name><![CDATA[i_householdHybridHeatpump]]></Name>
-				<ExcludeFromBuild>true</ExcludeFromBuild>
-				<X>160</X>
-				<Y>290</Y>
+				<X>170</X>
+				<Y>265</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -1305,7 +1279,7 @@ zero_Interface.f_resetSettings();</ActionCode>
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setDemandReductionHeating( new ArrayList&lt;GridConnection&gt;(uI_Tabs.f_getSliderGridConnections_utilities()), sl_heatDemandSlidersCompaniesHeatDemandReductionCompanies_pct.getValue());</ActionCode>
+					<ActionCode>f_setDemandReductionHeating( new ArrayList&lt;GridConnection&gt;(uI_Tabs.f_getActiveSliderGridConnections_utilities()), sl_heatDemandSlidersCompaniesHeatDemandReductionCompanies_pct.getValue());</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -1396,7 +1370,7 @@ zero_Interface.f_resetSettings();</ActionCode>
 				<Id>1722326800150</Id>
 				<Name><![CDATA[t_hybridHeatPumpCompaniesDescription1]]></Name>
 				<X>15</X>
-				<Y>140</Y>
+				<Y>115</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -1422,7 +1396,7 @@ zero_Interface.f_resetSettings();</ActionCode>
 				<Id>1722326800152</Id>
 				<Name><![CDATA[t_electricHeatPumpCompaniesDescription1]]></Name>
 				<X>15</X>
-				<Y>115</Y>
+				<Y>140</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -1473,7 +1447,7 @@ zero_Interface.f_resetSettings();</ActionCode>
 				<Id>1722326800156</Id>
 				<Name><![CDATA[t_electricHeatPumpCompanies_pct1]]></Name>
 				<X>225</X>
-				<Y>115</Y>
+				<Y>140</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -1552,7 +1526,7 @@ zero_Interface.f_resetSettings();</ActionCode>
 				<Id>1722326800162</Id>
 				<Name><![CDATA[t_hybridHeatPumpCompanies_pct1]]></Name>
 				<X>225</X>
-				<Y>140</Y>
+				<Y>115</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -1591,9 +1565,9 @@ zero_Interface.f_resetSettings();</ActionCode>
 				<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
-					<Enabled>false</Enabled>
-					<ActionCode>traceln("Slider doet nog niets!!");//f_setHeatingSlidersCompanies(3);
-//f_resetNeighborhoodHeatingSystems(4);</ActionCode>
+					<Enabled>true</Enabled>
+					<ActionCode>f_setHeatingSliders( new ArrayList&lt;GridConnection&gt;(uI_Tabs.f_getActiveSliderGridConnections_utilities()), new ArrayList&lt;GridConnection&gt;(zero_Interface.c_orderedHeatingSystemsCompanies), OL_GridConnectionHeatingType.DISTRICTHEAT, sl_heatDemandSlidersCompaniesGasBurnerCompanies_pct, sl_heatDemandSlidersCompaniesHybridHeatPumpCompanies_pct, sl_heatDemandSlidersCompaniesElectricHeatPumpCompanies_pct, sl_heatDemandSlidersCompaniesDistrictHeatingCompanies_pct, null, sl_heatingTypeSlidersCompaniesCustom_pct );
+</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -1621,10 +1595,8 @@ zero_Interface.f_resetSettings();</ActionCode>
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setHeatingSliders( 0, sl_heatDemandSlidersCompaniesGasBurnerCompanies_pct, sl_heatDemandSlidersCompaniesElectricHeatPumpCompanies_pct, sl_heatDemandSlidersCompaniesHybridHeatPumpCompanies_pct, sl_heatDemandSlidersCompaniesDistrictHeatingCompanies_pct, sl_heatingTypeSlidersCompaniesCustom_pct );
-f_setHeatingSystemsCompanies( uI_Tabs.f_getSliderGridConnections_utilities(), sl_heatDemandSlidersCompaniesGasBurnerCompanies_pct, sl_heatDemandSlidersCompaniesElectricHeatPumpCompanies_pct, sl_heatDemandSlidersCompaniesHybridHeatPumpCompanies_pct, sl_heatDemandSlidersCompaniesDistrictHeatingCompanies_pct, sl_heatingTypeSlidersCompaniesCustom_pct );
-
-zero_Interface.f_resetSettings();</ActionCode>
+					<ActionCode>f_setHeatingSliders( new ArrayList&lt;GridConnection&gt;(uI_Tabs.f_getActiveSliderGridConnections_utilities()), new ArrayList&lt;GridConnection&gt;(zero_Interface.c_orderedHeatingSystemsCompanies), OL_GridConnectionHeatingType.GAS_BURNER, sl_heatDemandSlidersCompaniesGasBurnerCompanies_pct, sl_heatDemandSlidersCompaniesHybridHeatPumpCompanies_pct, sl_heatDemandSlidersCompaniesElectricHeatPumpCompanies_pct, sl_heatDemandSlidersCompaniesDistrictHeatingCompanies_pct, null, sl_heatingTypeSlidersCompaniesCustom_pct );
+</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -1640,7 +1612,7 @@ zero_Interface.f_resetSettings();</ActionCode>
 				<Id>1722326800168</Id>
 				<Name><![CDATA[sl_heatDemandSlidersCompaniesHybridHeatPumpCompanies_pct]]></Name>
 				<X>255</X>
-				<Y>135</Y>
+				<Y>110</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -1651,12 +1623,9 @@ zero_Interface.f_resetSettings();</ActionCode>
 				<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
-					<Enabled>false</Enabled>
-					<ActionCode>//f_setHeatingSliders( 2, sl_heatDemandSlidersCompaniesGasBurnerCompanies_pct, sl_heatDemandSlidersCompaniesElectricHeatPumpCompanies_pct, sl_heatDemandSlidersCompaniesHybridHeatPumpCompanies_pct, null );
-
-traceln("Slider doet nog niets!!");//f_setHeatingSlidersCompanies(2);
-//f_resetNeighborhoodHeatingSystems(3);
-//sl_hybridHeatPumpCompanies.</ActionCode>
+					<Enabled>true</Enabled>
+					<ActionCode>f_setHeatingSliders( new ArrayList&lt;GridConnection&gt;(uI_Tabs.f_getActiveSliderGridConnections_utilities()), new ArrayList&lt;GridConnection&gt;(zero_Interface.c_orderedHeatingSystemsCompanies), OL_GridConnectionHeatingType.HYBRID_HEATPUMP, sl_heatDemandSlidersCompaniesGasBurnerCompanies_pct, sl_heatDemandSlidersCompaniesHybridHeatPumpCompanies_pct, sl_heatDemandSlidersCompaniesElectricHeatPumpCompanies_pct, sl_heatDemandSlidersCompaniesDistrictHeatingCompanies_pct, null, sl_heatingTypeSlidersCompaniesCustom_pct );
+</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -1672,7 +1641,7 @@ traceln("Slider doet nog niets!!");//f_setHeatingSlidersCompanies(2);
 				<Id>1722326800170</Id>
 				<Name><![CDATA[sl_heatDemandSlidersCompaniesElectricHeatPumpCompanies_pct]]></Name>
 				<X>255</X>
-				<Y>110</Y>
+				<Y>135</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -1684,10 +1653,8 @@ traceln("Slider doet nog niets!!");//f_setHeatingSlidersCompanies(2);
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setHeatingSliders( 1, sl_heatDemandSlidersCompaniesGasBurnerCompanies_pct, sl_heatDemandSlidersCompaniesElectricHeatPumpCompanies_pct, sl_heatDemandSlidersCompaniesHybridHeatPumpCompanies_pct, sl_heatDemandSlidersCompaniesDistrictHeatingCompanies_pct, sl_heatingTypeSlidersCompaniesCustom_pct );
-f_setHeatingSystemsCompanies( uI_Tabs.f_getSliderGridConnections_utilities(), sl_heatDemandSlidersCompaniesGasBurnerCompanies_pct, sl_heatDemandSlidersCompaniesElectricHeatPumpCompanies_pct, sl_heatDemandSlidersCompaniesHybridHeatPumpCompanies_pct, sl_heatDemandSlidersCompaniesDistrictHeatingCompanies_pct, sl_heatingTypeSlidersCompaniesCustom_pct );
-
-zero_Interface.f_resetSettings();</ActionCode>
+					<ActionCode>f_setHeatingSliders( new ArrayList&lt;GridConnection&gt;(uI_Tabs.f_getActiveSliderGridConnections_utilities()), new ArrayList&lt;GridConnection&gt;(zero_Interface.c_orderedHeatingSystemsCompanies), OL_GridConnectionHeatingType.ELECTRIC_HEATPUMP, sl_heatDemandSlidersCompaniesGasBurnerCompanies_pct, sl_heatDemandSlidersCompaniesHybridHeatPumpCompanies_pct, sl_heatDemandSlidersCompaniesElectricHeatPumpCompanies_pct, sl_heatDemandSlidersCompaniesDistrictHeatingCompanies_pct, null, sl_heatingTypeSlidersCompaniesCustom_pct );
+</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -1864,7 +1831,7 @@ zero_Interface.f_resetSettings();</ActionCode>
 				<Id>1746093187656</Id>
 				<Name><![CDATA[i_companyElectricHeatpump_Company]]></Name>
 				<X>160</X>
-				<Y>115</Y>
+				<Y>140</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -1891,7 +1858,7 @@ zero_Interface.f_resetSettings();</ActionCode>
 				<Id>1746093187698</Id>
 				<Name><![CDATA[i_companyHybridHeatpump_Company]]></Name>
 				<X>160</X>
-				<Y>140</Y>
+				<Y>115</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -2232,7 +2199,7 @@ zero_Interface.f_resetSettings();</ActionCode>
 				<Id>1749738869817</Id>
 				<Name><![CDATA[t_householdGasBurnerDescriptionResidentialArea]]></Name>
 				<X>20</X>
-				<Y>65</Y>
+				<Y>55</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -2246,7 +2213,7 @@ zero_Interface.f_resetSettings();</ActionCode>
 				<Z>0</Z>
 				<Rotation>0.0</Rotation>
 				<Color>-16777216</Color>
-				<Text><![CDATA[Gasburner]]></Text>
+				<Text><![CDATA[Gas brander]]></Text>
 				<Font>
 					<Name><![CDATA[Dialog]]></Name>
 					<Size>12</Size>
@@ -2258,7 +2225,7 @@ zero_Interface.f_resetSettings();</ActionCode>
 				<Id>1749738869821</Id>
 				<Name><![CDATA[t_householdElectricHeatPumpDescriptionResidentialArea]]></Name>
 				<X>20</X>
-				<Y>90</Y>
+				<Y>105</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -2272,7 +2239,7 @@ zero_Interface.f_resetSettings();</ActionCode>
 				<Z>0</Z>
 				<Rotation>0.0</Rotation>
 				<Color>-16777216</Color>
-				<Text><![CDATA[Elec. heatpump]]></Text>
+				<Text><![CDATA[Elec. warmtepomp]]></Text>
 				<Font>
 					<Name><![CDATA[Dialog]]></Name>
 					<Size>12</Size>
@@ -2284,7 +2251,7 @@ zero_Interface.f_resetSettings();</ActionCode>
 				<Id>1749738869823</Id>
 				<Name><![CDATA[t_householdElectricHeatPumpResidentialArea_pct]]></Name>
 				<X>230</X>
-				<Y>90</Y>
+				<Y>105</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -2311,7 +2278,7 @@ zero_Interface.f_resetSettings();</ActionCode>
 				<Id>1749738869825</Id>
 				<Name><![CDATA[t_householdGasBurnerResidentialArea_pct]]></Name>
 				<X>230</X>
-				<Y>65</Y>
+				<Y>55</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -2339,7 +2306,7 @@ zero_Interface.f_resetSettings();</ActionCode>
 				<Id>1749738869829</Id>
 				<Name><![CDATA[sl_householdGasBurnerResidentialArea_pct]]></Name>
 				<X>260</X>
-				<Y>60</Y>
+				<Y>50</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -2353,14 +2320,14 @@ zero_Interface.f_resetSettings();</ActionCode>
 					<Enabled>true</Enabled>
 					<ActionCode>if (cb_householdHTDistrictHeatingResidentialArea.isSelected()) {
 	cb_householdHTDistrictHeatingResidentialArea.setSelected(false, false);
-	f_removeDistrictHeatingFromAllHouses(uI_Tabs.f_getSliderGridConnections_houses());
+	f_removeDistrictHeatingFromAllHouses(uI_Tabs.f_getActiveSliderGridConnections_houses());
 }
 if (cb_householdLTDistrictHeatingResidentialArea.isSelected()) {
 	cb_householdLTDistrictHeatingResidentialArea.setSelected(false, false);
-	f_removeLTDH(uI_Tabs.f_getSliderGridConnections_houses());
+	f_removeLTDH(uI_Tabs.f_getActiveSliderGridConnections_houses());
 }
-f_setHeatingSliders( 0, sl_householdGasBurnerResidentialArea_pct, sl_householdElectricHeatPumpResidentialArea_pct, null, null, null );
-f_setHeatingSystemsHouseholds( uI_Tabs.f_getSliderGridConnections_houses(), sl_householdElectricHeatPumpResidentialArea_pct.getValue() );
+
+f_setHeatingSliders( new ArrayList&lt;GridConnection&gt;(uI_Tabs.f_getActiveSliderGridConnections_houses()), new ArrayList&lt;GridConnection&gt;(zero_Interface.c_orderedHeatingSystemsHouses), OL_GridConnectionHeatingType.GAS_BURNER, sl_householdGasBurnerResidentialArea_pct, sl_householdHybridHeatpumpResidentialArea, sl_householdElectricHeatPumpResidentialArea_pct, null, null, null );
 </ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
@@ -2377,7 +2344,7 @@ f_setHeatingSystemsHouseholds( uI_Tabs.f_getSliderGridConnections_houses(), sl_h
 				<Id>1749738869833</Id>
 				<Name><![CDATA[sl_householdElectricHeatPumpResidentialArea_pct]]></Name>
 				<X>260</X>
-				<Y>85</Y>
+				<Y>100</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -2391,14 +2358,14 @@ f_setHeatingSystemsHouseholds( uI_Tabs.f_getSliderGridConnections_houses(), sl_h
 					<Enabled>true</Enabled>
 					<ActionCode>if (cb_householdHTDistrictHeatingResidentialArea.isSelected()) {
 	cb_householdHTDistrictHeatingResidentialArea.setSelected(false, false);
-	f_removeDistrictHeatingFromAllHouses(uI_Tabs.f_getSliderGridConnections_houses());
+	f_removeDistrictHeatingFromAllHouses(uI_Tabs.f_getActiveSliderGridConnections_houses());
 }
 if (cb_householdLTDistrictHeatingResidentialArea.isSelected()) {
 	cb_householdLTDistrictHeatingResidentialArea.setSelected(false, false);
-	f_removeLTDH(uI_Tabs.f_getSliderGridConnections_houses());
+	f_removeLTDH(uI_Tabs.f_getActiveSliderGridConnections_houses());
 }
-f_setHeatingSliders( 1, sl_householdGasBurnerResidentialArea_pct, sl_householdElectricHeatPumpResidentialArea_pct, null, null, null );
-f_setHeatingSystemsHouseholds( uI_Tabs.f_getSliderGridConnections_houses(), sl_householdElectricHeatPumpResidentialArea_pct.getValue() );
+
+f_setHeatingSliders( new ArrayList&lt;GridConnection&gt;(uI_Tabs.f_getActiveSliderGridConnections_houses()), new ArrayList&lt;GridConnection&gt;(zero_Interface.c_orderedHeatingSystemsHouses), OL_GridConnectionHeatingType.ELECTRIC_HEATPUMP, sl_householdGasBurnerResidentialArea_pct, sl_householdHybridHeatpumpResidentialArea, sl_householdElectricHeatPumpResidentialArea_pct, null, null, null );
 </ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
@@ -2415,7 +2382,7 @@ f_setHeatingSystemsHouseholds( uI_Tabs.f_getSliderGridConnections_houses(), sl_h
 				<Id>1749738869835</Id>
 				<Name><![CDATA[sl_householdHeatDemandReductionResidentialArea_pct]]></Name>
 				<X>260</X>
-				<Y>235</Y>
+				<Y>245</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -2427,7 +2394,7 @@ f_setHeatingSystemsHouseholds( uI_Tabs.f_getSliderGridConnections_houses(), sl_h
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_householdInsulation( uI_Tabs.f_getSliderGridConnections_houses(), sl_householdHeatDemandReductionResidentialArea_pct.getValue() );</ActionCode>
+					<ActionCode>f_householdInsulation( uI_Tabs.f_getActiveSliderGridConnections_houses(), sl_householdHeatDemandReductionResidentialArea_pct.getValue() );</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -2442,7 +2409,7 @@ f_setHeatingSystemsHouseholds( uI_Tabs.f_getSliderGridConnections_houses(), sl_h
 				<Id>1749738869837</Id>
 				<Name><![CDATA[t_householdHeatDemandReductionResidentialArea_pct]]></Name>
 				<X>227</X>
-				<Y>240</Y>
+				<Y>250</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -2469,7 +2436,7 @@ f_setHeatingSystemsHouseholds( uI_Tabs.f_getSliderGridConnections_houses(), sl_h
 				<Id>1749738869839</Id>
 				<Name><![CDATA[t_householdHeatDemandReductionDescriptionResidentialArea]]></Name>
 				<X>20</X>
-				<Y>240</Y>
+				<Y>250</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -2483,7 +2450,7 @@ f_setHeatingSystemsHouseholds( uI_Tabs.f_getSliderGridConnections_houses(), sl_h
 				<Z>0</Z>
 				<Rotation>0.0</Rotation>
 				<Color>-16777216</Color>
-				<Text><![CDATA[Houses with better insulation]]></Text>
+				<Text><![CDATA[Huizen met betere isolatie]]></Text>
 				<Font>
 					<Name><![CDATA[Dialog]]></Name>
 					<Size>12</Size>
@@ -2521,7 +2488,7 @@ f_setHeatingSystemsHouseholds( uI_Tabs.f_getSliderGridConnections_houses(), sl_h
 				<Id>1749738869843</Id>
 				<Name><![CDATA[sl_householdAircoResidentialArea_pct]]></Name>
 				<X>260</X>
-				<Y>206</Y>
+				<Y>216</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -2533,7 +2500,7 @@ f_setHeatingSystemsHouseholds( uI_Tabs.f_getSliderGridConnections_houses(), sl_h
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setAircos(uI_Tabs.f_getSliderGridConnections_houses(), sl_householdAircoResidentialArea_pct.getValue() / 100.0);</ActionCode>
+					<ActionCode>f_setAircos(uI_Tabs.f_getActiveSliderGridConnections_houses(), sl_householdAircoResidentialArea_pct.getValue() / 100.0);</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -2548,7 +2515,7 @@ f_setHeatingSystemsHouseholds( uI_Tabs.f_getSliderGridConnections_houses(), sl_h
 				<Id>1749738869845</Id>
 				<Name><![CDATA[t_householdAircoDescriptionResidentialArea]]></Name>
 				<X>20</X>
-				<Y>210</Y>
+				<Y>220</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -2562,7 +2529,7 @@ f_setHeatingSystemsHouseholds( uI_Tabs.f_getSliderGridConnections_houses(), sl_h
 				<Z>0</Z>
 				<Rotation>0.0</Rotation>
 				<Color>-16777216</Color>
-				<Text><![CDATA[Houses with airconditioning]]></Text>
+				<Text><![CDATA[Huizen met Airco]]></Text>
 				<Font>
 					<Name><![CDATA[SansSerif]]></Name>
 					<Size>12</Size>
@@ -2574,7 +2541,7 @@ f_setHeatingSystemsHouseholds( uI_Tabs.f_getSliderGridConnections_houses(), sl_h
 				<Id>1749738869847</Id>
 				<Name><![CDATA[t_householdAircoResidentialArea_pct]]></Name>
 				<X>223</X>
-				<Y>210</Y>
+				<Y>220</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -2602,7 +2569,7 @@ f_setHeatingSystemsHouseholds( uI_Tabs.f_getSliderGridConnections_houses(), sl_h
 				<Id>1749738869849</Id>
 				<Name><![CDATA[cb_householdHTDistrictHeatingResidentialArea]]></Name>
 				<X>20</X>
-				<Y>120</Y>
+				<Y>130</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -2619,18 +2586,18 @@ f_setHeatingSystemsHouseholds( uI_Tabs.f_getSliderGridConnections_houses(), sl_h
 	sl_householdGasBurnerResidentialArea_pct.setValue(0, false);
 	sl_householdElectricHeatPumpResidentialArea_pct.setValue(0, false);
 	cb_householdLTDistrictHeatingResidentialArea.setSelected(false, false);
-	f_addDistrictHeatingToAllHouses(uI_Tabs.f_getSliderGridConnections_houses());
+	f_addDistrictHeatingToAllHouses(uI_Tabs.f_getActiveSliderGridConnections_houses());
 }
 else{
 	sl_householdGasBurnerResidentialArea_pct.setValue(100, false);
 	sl_householdElectricHeatPumpResidentialArea_pct.setValue(0, false);
 	cb_householdLTDistrictHeatingResidentialArea.setSelected(false, false);
-	f_removeDistrictHeatingFromAllHouses(uI_Tabs.f_getSliderGridConnections_houses());
+	f_removeDistrictHeatingFromAllHouses(uI_Tabs.f_getActiveSliderGridConnections_houses());
 }</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<Font Name="Dialog" Size="12" Style="0"/>
-					<LabelText>HT-district heating</LabelText>
+					<LabelText>HT-Warmtenet</LabelText>
 					<LinkTo>false</LinkTo>
 				</ExtendedProperties>
 			</Control>
@@ -2639,7 +2606,7 @@ else{
 				<Id>1749738869851</Id>
 				<Name><![CDATA[cb_householdLTDistrictHeatingResidentialArea]]></Name>
 				<X>20</X>
-				<Y>155</Y>
+				<Y>165</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -2656,18 +2623,18 @@ else{
 	sl_householdElectricHeatPumpResidentialArea_pct.setValue(0, false);
 	sl_householdGasBurnerResidentialArea_pct.setValue(0, false);
 	cb_householdHTDistrictHeatingResidentialArea.setSelected(false, false);
-	f_addLTDH(uI_Tabs.f_getSliderGridConnections_houses());
+	f_addLTDH(uI_Tabs.f_getActiveSliderGridConnections_houses());
 }
 else{
 	sl_householdElectricHeatPumpResidentialArea_pct.setValue(0, false);
 	sl_householdGasBurnerResidentialArea_pct.setValue(100, false);
 	cb_householdHTDistrictHeatingResidentialArea.setSelected(false, false);
-	f_removeLTDH(uI_Tabs.f_getSliderGridConnections_houses());
+	f_removeLTDH(uI_Tabs.f_getActiveSliderGridConnections_houses());
 }</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<Font Name="Dialog" Size="12" Style="0"/>
-					<LabelText>LT-district heating + booster</LabelText>
+					<LabelText>LT-Warmtenet</LabelText>
 					<LinkTo>false</LinkTo>
 				</ExtendedProperties>
 			</Control>
@@ -2675,7 +2642,7 @@ else{
 				<Id>1752231559962</Id>
 				<Name><![CDATA[i_householdGasBurner]]></Name>
 				<X>180</X>
-				<Y>65</Y>
+				<Y>55</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -2703,7 +2670,7 @@ else{
 				<Id>1752231559982</Id>
 				<Name><![CDATA[i_householdHeatPump]]></Name>
 				<X>180</X>
-				<Y>90</Y>
+				<Y>105</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -2731,7 +2698,7 @@ else{
 				<Id>1752231560000</Id>
 				<Name><![CDATA[i_householdHTDistrictHeating]]></Name>
 				<X>220</X>
-				<Y>125</Y>
+				<Y>135</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -2759,7 +2726,7 @@ else{
 				<Id>1752231560019</Id>
 				<Name><![CDATA[i_householdLTDistrictHeating]]></Name>
 				<X>220</X>
-				<Y>160</Y>
+				<Y>170</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -2787,7 +2754,7 @@ else{
 				<Id>1752231560038</Id>
 				<Name><![CDATA[i_householdAirconditioning]]></Name>
 				<X>180</X>
-				<Y>210</Y>
+				<Y>220</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -2815,7 +2782,7 @@ else{
 				<Id>1752231560056</Id>
 				<Name><![CDATA[i_householdAdditionalInsulation]]></Name>
 				<X>180</X>
-				<Y>240</Y>
+				<Y>250</Y>
 				<Label>
 					<X>0</X>
 					<Y>-10</Y>
@@ -2900,7 +2867,7 @@ else{
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setPTSystemHouses( uI_Tabs.f_getSliderGridConnections_houses(), sl_rooftopPTHouses_pct.getValue() );</ActionCode>
+					<ActionCode>f_setPTSystemHouses( uI_Tabs.f_getActiveSliderGridConnections_houses(), sl_rooftopPTHouses_pct.getValue() );</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -2929,7 +2896,7 @@ else{
 				<Z>0</Z>
 				<Rotation>0.0</Rotation>
 				<Color>-16777216</Color>
-				<Text><![CDATA[Share of houses with PT]]></Text>
+				<Text><![CDATA[Huizen met PT]]></Text>
 				<Font>
 					<Name><![CDATA[Dialog]]></Name>
 					<Size>12</Size>
@@ -2965,6 +2932,125 @@ else{
 				</ImageFiles>
 				<OriginalSize>false</OriginalSize>
 			</Image>
+			<Text>
+				<Id>1760349016791</Id>
+				<Name><![CDATA[txt_householdHybridHeatpumpDescriptionResidentialArea]]></Name>
+				<X>20</X>
+				<Y>80</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D</DrawMode>
+				<VisibleCode>sl_householdHybridHeatpumpResidentialArea.isVisible()</VisibleCode>
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Z>0</Z>
+				<Rotation>0.0</Rotation>
+				<Color>-16777216</Color>
+				<Text><![CDATA[Hybride warmtepomp]]></Text>
+				<Font>
+					<Name><![CDATA[Dialog]]></Name>
+					<Size>12</Size>
+					<Style>0</Style>
+				</Font>
+				<Alignment>LEFT</Alignment>
+			</Text>
+			<Control Type="Slider">
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Id>1760349016817</Id>
+				<Name><![CDATA[sl_householdHybridHeatpumpResidentialArea]]></Name>
+				<X>260</X>
+				<Y>75</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
+				<BasicProperties Width="100" Height="30">
+					<EmbeddedIcon>false</EmbeddedIcon>
+					<Enabled>true</Enabled>
+					<ActionCode>if (cb_householdHTDistrictHeatingResidentialArea.isSelected()) {
+	cb_householdHTDistrictHeatingResidentialArea.setSelected(false, false);
+	f_removeDistrictHeatingFromAllHouses(uI_Tabs.f_getActiveSliderGridConnections_houses());
+}
+if (cb_householdLTDistrictHeatingResidentialArea.isSelected()) {
+	cb_householdLTDistrictHeatingResidentialArea.setSelected(false, false);
+	f_removeLTDH(uI_Tabs.f_getActiveSliderGridConnections_houses());
+}
+
+f_setHeatingSliders( new ArrayList&lt;GridConnection&gt;(uI_Tabs.f_getActiveSliderGridConnections_houses()), new ArrayList&lt;GridConnection&gt;(zero_Interface.c_orderedHeatingSystemsHouses), OL_GridConnectionHeatingType.HYBRID_HEATPUMP, sl_householdGasBurnerResidentialArea_pct, sl_householdHybridHeatpumpResidentialArea, sl_householdElectricHeatPumpResidentialArea_pct, null, null, null );
+</ActionCode>
+				</BasicProperties>
+				<ExtendedProperties>
+					<DefaultValueCode>0</DefaultValueCode>
+					<Orientation>HORIZONTAL</Orientation>
+					<MinValue>0</MinValue>
+					<MaxValue>100</MaxValue>
+					<Step>1</Step>
+					<LinkTo>false</LinkTo>
+				</ExtendedProperties>
+			</Control>
+			<Image>
+				<Id>1760349016828</Id>
+				<Name><![CDATA[i_householdHybridHeatPump]]></Name>
+				<X>180</X>
+				<Y>80</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
+				<VisibleCode>sl_householdHybridHeatpumpResidentialArea.isVisible()</VisibleCode>
+				<OnClickCode>zero_Interface.f_setInfoText(i_householdHybridHeatPump, zero_Interface.v_infoText.householdHybridHeatpump, i_householdHybridHeatPump.getX() + uI_Tabs.v_presentationXOffset, i_householdHybridHeatPump.getY() + uI_Tabs.v_presentationYOffset);</OnClickCode>
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Z>0</Z>
+				<Width>20</Width>
+				<Height>20</Height>
+				<Rotation>0.0</Rotation>
+				<ImageFiles>
+					<ImageResourceReference>
+						<PackageName>zerointerfaceloader</PackageName>
+						<ClassName>icon_i.png</ClassName>
+					</ImageResourceReference>
+				</ImageFiles>
+				<OriginalSize>false</OriginalSize>
+			</Image>
+			<Text>
+				<Id>1760349443892</Id>
+				<Name><![CDATA[t_householdElectricHeatPumpResidentialArea_pct1]]></Name>
+				<X>230</X>
+				<Y>80</Y>
+				<Label>
+					<X>0</X>
+					<Y>-10</Y>
+				</Label>
+				<PublicFlag>true</PublicFlag>
+				<PresentationFlag>true</PresentationFlag>
+				<ShowLabel>false</ShowLabel>
+				<DrawMode>SHAPE_DRAW_2D</DrawMode>
+				<VisibleCode>sl_householdHybridHeatpumpResidentialArea.isVisible()</VisibleCode>
+				<EmbeddedIcon>false</EmbeddedIcon>
+				<Z>0</Z>
+				<Rotation>0.0</Rotation>
+				<Color>-16777216</Color>
+				<Text><![CDATA[#]]></Text>
+				<TextCode>sl_householdHybridHeatpumpResidentialArea.getIntValue() + "%"</TextCode>
+				<Font>
+					<Name><![CDATA[Dialog]]></Name>
+					<Size>12</Size>
+					<Style>0</Style>
+				</Font>
+				<Alignment>CENTER</Alignment>
+			</Text>
 		</Presentation>
 	</Group>
 	<Rectangle>
diff --git a/_alp/Agents/tabHeating/Variables.xml b/_alp/Agents/tabHeating/Variables.xml
deleted file mode 100644
index 42191f5b..00000000
--- a/_alp/Agents/tabHeating/Variables.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Variables>
-	<Variable Class="PlainVariable">
-		<Id>1754386301951</Id>
-		<Name><![CDATA[v_totalNumberOfCustomHeatingSystems]]></Name>
-		<X>60</X>
-		<Y>1150</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Properties SaveInSnapshot="true"
-              Constant="false"
-              AccessType="public"
-              StaticVariable="false">
-			<Type><![CDATA[int]]></Type>
-		</Properties>
-	</Variable>
-</Variables>
diff --git a/_alp/Agents/tabMobility/Code/Functions.java b/_alp/Agents/tabMobility/Code/Functions.java
index 9c38b1d6..1dffdbfa 100644
--- a/_alp/Agents/tabMobility/Code/Functions.java
+++ b/_alp/Agents/tabMobility/Code/Functions.java
@@ -70,16 +70,6 @@
 	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);			
-		}
-	}
 }
 
 //Update variable to change to custom scenario
@@ -96,19 +86,15 @@ Triple<Integer, Integer, Integer> f_calculateNumberOfGhostVehicles(List<GridConn
 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;
-			}
-		}
+for (GridConnection gc : gcList ) {
+	if(gc.v_hasQuarterHourlyValues && gc.v_isActive){
+		numberOfGhostVehicle_Cars += zero_Interface.c_scenarioMap_Current.get(gc.p_uid).getCurrentEVCars();
+		numberOfGhostVehicle_Vans += zero_Interface.c_scenarioMap_Current.get(gc.p_uid).getCurrentEVVans();
+		numberOfGhostVehicle_Trucks += zero_Interface.c_scenarioMap_Current.get(gc.p_uid).getCurrentEVTrucks();
 	}
 }
 
+
 return Triple.of(numberOfGhostVehicle_Cars, numberOfGhostVehicle_Vans, numberOfGhostVehicle_Trucks);
 /*ALCODEEND*/}
 
@@ -309,42 +295,22 @@ boolean f_dieselToElectricTruck(List<GridConnection> gcList)
 boolean foundAdditionalVehicle = false;
 
 // 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);
+for (GridConnection gc : gcList ) {
+	if(gc instanceof GCUtility && gc.v_isActive){
+		dieselTruck = (J_EADieselVehicle)findFirst(zero_Interface.c_additionalVehicles.get(gc.p_uid), p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK);
 		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()));
 }
 if (dieselTruck!=null) {
 	GridConnection gc = (GridConnection)dieselTruck.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_nbDieselTrucks--;
-			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 (foundAdditionalVehicle) {
-				companyUI.c_additionalVehicles.get(gc.p_uid).remove(dieselTruck);
-			}
-		}
-	}
 		
 	J_ActivityTrackerTrips tripTracker = dieselTruck.tripTracker;
 	boolean available = dieselTruck.getAvailability();
@@ -363,8 +329,8 @@ 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 && foundAdditionalVehicle){
-		companyUI.c_additionalVehicles.get(gc.p_uid).add(electricTruck);
+	if(foundAdditionalVehicle){
+		zero_Interface.c_additionalVehicles.get(gc.p_uid).add(electricTruck);
 	}
 }
 
@@ -382,20 +348,16 @@ boolean f_hydrogenToElectricTruck(List<GridConnection> gcList)
 boolean foundAdditionalVehicle = false;
 
 // 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);
+for (GridConnection gc : gcList ) {
+	if(gc instanceof GCUtility && gc.v_isActive){
+		hydrogenTruck = (J_EAHydrogenVehicle)findFirst(zero_Interface.c_additionalVehicles.get(gc.p_uid), p -> p.energyAssetType == OL_EnergyAssetType.HYDROGEN_TRUCK);
 		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()));
@@ -403,22 +365,6 @@ boolean f_hydrogenToElectricTruck(List<GridConnection> gcList)
 if (hydrogenTruck!=null) {
 	GridConnection gc = (GridConnection)hydrogenTruck.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_nbHydrogenTrucks--;
-			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(foundAdditionalVehicle){
-			companyUI.c_additionalVehicles.get(gc.p_uid).remove(hydrogenTruck);
-		}
-	}
-	
 	J_ActivityTrackerTrips tripTracker = hydrogenTruck.tripTracker;
 	boolean available = true;
 	available = hydrogenTruck.getAvailability();
@@ -438,8 +384,8 @@ 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 && foundAdditionalVehicle){
-		companyUI.c_additionalVehicles.get(gc.p_uid).add(electricTruck);
+	if(foundAdditionalVehicle){
+		zero_Interface.c_additionalVehicles.get(gc.p_uid).add(electricTruck);
 	}
 }
 else {
@@ -456,20 +402,16 @@ boolean f_electricToHydrogenTruck(List<GridConnection> gcList)
 boolean foundAdditionalVehicle = false;
 
 // 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);
+for (GridConnection gc : gcList ) {
+	if(gc instanceof GCUtility && gc.v_isActive){
+		electricTruck = (J_EAEV)findFirst(zero_Interface.c_additionalVehicles.get(gc.p_uid), p -> p.energyAssetType == OL_EnergyAssetType.ELECTRIC_TRUCK);
 		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()));
@@ -477,23 +419,6 @@ boolean f_electricToHydrogenTruck(List<GridConnection> gcList)
 if (electricTruck!=null) {
 	GridConnection gc = (GridConnection)electricTruck.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_nbEVTrucks--;
-			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(foundAdditionalVehicle){
-			companyUI.c_additionalVehicles.get(gc.p_uid).remove(electricTruck);
-		}
-	}
-	
 	J_ActivityTrackerTrips tripTracker = electricTruck.tripTracker;
 	boolean available = true;
 	available = electricTruck.getAvailability();
@@ -509,8 +434,8 @@ 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 && foundAdditionalVehicle){
-		companyUI.c_additionalVehicles.get(gc.p_uid).add(hydrogenVehicle);
+	if(foundAdditionalVehicle){
+		zero_Interface.c_additionalVehicles.get(gc.p_uid).add(hydrogenVehicle);
 	}
 }				
 else {
@@ -527,20 +452,16 @@ boolean f_dieselToHydrogenTruck(List<GridConnection> gcList)
 boolean foundAdditionalVehicle = false;
 
 // 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);
+for (GridConnection gc : gcList ) {
+	if(gc instanceof GCUtility && gc.v_isActive){
+		dieselTruck = (J_EADieselVehicle)findFirst(zero_Interface.c_additionalVehicles.get(gc.p_uid), p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK);
 		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()));
@@ -548,23 +469,6 @@ boolean f_dieselToHydrogenTruck(List<GridConnection> gcList)
 if (dieselTruck!=null) {
 	GridConnection gc = (GridConnection)dieselTruck.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_nbDieselTrucks--;
-			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(foundAdditionalVehicle){
-			companyUI.c_additionalVehicles.get(gc.p_uid).remove(dieselTruck);
-		}
-	}
-	
 	J_ActivityTrackerTrips tripTracker = dieselTruck.tripTracker;
 	boolean available = true;
 	available = dieselTruck.getAvailability();
@@ -580,8 +484,8 @@ 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 && foundAdditionalVehicle){
-		companyUI.c_additionalVehicles.get(gc.p_uid).add(hydrogenVehicle);
+	if(foundAdditionalVehicle){
+		zero_Interface.c_additionalVehicles.get(gc.p_uid).add(hydrogenVehicle);
 	}
 }
 else {
@@ -598,20 +502,16 @@ boolean f_electricToDieselTruck(List<GridConnection> gcList)
 boolean foundAdditionalVehicle = false;
 
 // 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);
+for (GridConnection gc : gcList ) {
+	if(gc instanceof GCUtility && gc.v_isActive){
+		electricTruck = (J_EAEV)findFirst(zero_Interface.c_additionalVehicles.get(gc.p_uid), p -> p.energyAssetType == OL_EnergyAssetType.ELECTRIC_TRUCK);
 		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()));
@@ -619,28 +519,6 @@ boolean f_electricToDieselTruck(List<GridConnection> gcList)
 if ( electricTruck != null ) {
 	GridConnection gc = (GridConnection)electricTruck.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_minEVTruckSlider >= companyUI.v_nbEVTrucks) {
-				traceln("Removed already existing Electric Truck from GC: " + companyUI.p_companyName);
-			}
-			else {
-				companyUI.v_nbEVTrucks--;
-				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(foundAdditionalVehicle){
-			companyUI.c_additionalVehicles.get(gc.p_uid).remove(electricTruck);
-		}
-	}
-	
 	J_ActivityTrackerTrips tripTracker = electricTruck.tripTracker;
 	boolean available = true;
 	available = electricTruck.getAvailability();
@@ -656,8 +534,8 @@ 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 && foundAdditionalVehicle){
-		companyUI.c_additionalVehicles.get(gc.p_uid).add(dieselVehicle);
+	if(foundAdditionalVehicle){
+		zero_Interface.c_additionalVehicles.get(gc.p_uid).add(dieselVehicle);
 	}
 }
 else {
@@ -674,20 +552,16 @@ boolean f_hydrogenToDieselTruck(List<GridConnection> gcList)
 boolean foundAdditionalVehicle = false;
 
 // 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);
+for (GridConnection gc : gcList ) {
+	if(gc instanceof GCUtility && gc.v_isActive){
+		hydrogenTruck = (J_EAHydrogenVehicle)findFirst(zero_Interface.c_additionalVehicles.get(gc.p_uid), p -> p.energyAssetType == OL_EnergyAssetType.HYDROGEN_TRUCK);
 		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()));
@@ -695,22 +569,6 @@ boolean f_hydrogenToDieselTruck(List<GridConnection> gcList)
 if ( hydrogenTruck != null ) {
 	GridConnection gc = (GridConnection)hydrogenTruck.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_nbHydrogenTrucks--;
-			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(foundAdditionalVehicle){
-			companyUI.c_additionalVehicles.get(gc.p_uid).remove(hydrogenTruck);
-		}
-	}
-	
 	J_ActivityTrackerTrips tripTracker = hydrogenTruck.tripTracker;
 	boolean available = true;
 	available = hydrogenTruck.getAvailability();
@@ -726,8 +584,8 @@ 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 && foundAdditionalVehicle){
-		companyUI.c_additionalVehicles.get(gc.p_uid).add(dieselVehicle);
+	if(foundAdditionalVehicle){
+		zero_Interface.c_additionalVehicles.get(gc.p_uid).add(dieselVehicle);
 	}
 }
 else {
@@ -801,42 +659,22 @@ boolean f_dieselToElectricVan(List<GridConnection> gcList)
 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);
+for (GridConnection gc : gcList ) {
+	if(gc instanceof GCUtility && gc.v_isActive){
+		dieselVan = (J_EADieselVehicle)findFirst(zero_Interface.c_additionalVehicles.get(gc.p_uid), p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_VAN);
 		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.p_uid).remove(dieselVan);
-			}
-		}
-	}
 		
 	J_ActivityTrackerTrips tripTracker = dieselVan.tripTracker;
 	boolean available = dieselVan.getAvailability();
@@ -855,8 +693,8 @@ boolean f_dieselToElectricVan(List<GridConnection> gcList)
 	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.p_uid).add(electricVan);
+	if(foundAdditionalVehicle){
+		zero_Interface.c_additionalVehicles.get(gc.p_uid).add(electricVan);
 	}
 }
 
@@ -874,20 +712,16 @@ boolean f_electricToDieselVan(List<GridConnection> gcList)
 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);
+for (GridConnection gc : gcList ) {
+	if(gc instanceof GCUtility && gc.v_isActive){
+		electricVan = (J_EAEV)findFirst(zero_Interface.c_additionalVehicles.get(gc.p_uid), p -> p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VAN);
 		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()));
@@ -895,28 +729,6 @@ boolean f_electricToDieselVan(List<GridConnection> gcList)
 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.p_uid).remove(electricVan);
-		}
-	}
-	
 	J_ActivityTrackerTrips tripTracker = electricVan.tripTracker;
 	boolean available = true;
 	available = electricVan.getAvailability();
@@ -932,8 +744,8 @@ boolean f_electricToDieselVan(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 && foundAdditionalVehicle){
-		companyUI.c_additionalVehicles.get(gc.p_uid).add(dieselVehicle);
+	if(foundAdditionalVehicle){
+		zero_Interface.c_additionalVehicles.get(gc.p_uid).add(dieselVehicle);
 	}
 }
 else {
@@ -950,42 +762,22 @@ boolean f_dieselToElectricCar(List<GridConnection> gcList)
 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);
+for (GridConnection gc : gcList ) {
+	if(gc instanceof GCUtility && gc.v_isActive){
+		dieselCar = (J_EADieselVehicle)findFirst(zero_Interface.c_additionalVehicles.get(gc.p_uid), p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_VEHICLE);
 		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.p_uid).remove(dieselCar);
-			}
-		}
-	}
 		
 	J_ActivityTrackerTrips tripTracker = dieselCar.tripTracker;
 	boolean available = dieselCar.getAvailability();
@@ -1004,8 +796,8 @@ boolean f_dieselToElectricCar(List<GridConnection> gcList)
 	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.p_uid).add(electricCar);
+	if(foundAdditionalVehicle){
+		zero_Interface.c_additionalVehicles.get(gc.p_uid).add(electricCar);
 	}
 }
 
@@ -1023,20 +815,16 @@ boolean f_electricToDieselCar(List<GridConnection> gcList)
 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);
+for (GridConnection gc : gcList ) {
+	if(gc instanceof GCUtility && gc.v_isActive){
+		electricCar = (J_EAEV)findFirst(zero_Interface.c_additionalVehicles.get(gc.p_uid), p -> p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VEHICLE);
 		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()));
@@ -1044,28 +832,6 @@ boolean f_electricToDieselCar(List<GridConnection> gcList)
 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.p_uid).remove(electricCar);
-		}
-	}
-	
 	J_ActivityTrackerTrips tripTracker = electricCar.tripTracker;
 	boolean available = true;
 	available = electricCar.getAvailability();
@@ -1081,8 +847,8 @@ boolean f_electricToDieselCar(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 && foundAdditionalVehicle){
-		companyUI.c_additionalVehicles.get(gc.p_uid).add(dieselVehicle);
+	if(foundAdditionalVehicle){
+		zero_Interface.c_additionalVehicles.get(gc.p_uid).add(dieselVehicle);
 	}
 }
 else {
@@ -1413,7 +1179,7 @@ else if ( sliderHydrogenCars == null && pct_hydrogenCarSlider != 0 ) {
 
 double f_updateSliders_Mobility()
 {/*ALCODESTART::1754928402690*/
-Triple<Integer, Integer, Integer> triple = f_calculateNumberOfGhostVehicles( new ArrayList<GridConnection>(uI_Tabs.f_getSliderGridConnections_utilities()) );
+Triple<Integer, Integer, Integer> triple = f_calculateNumberOfGhostVehicles( new ArrayList<GridConnection>(uI_Tabs.f_getActiveSliderGridConnections_utilities()) );
 v_totalNumberOfGhostVehicle_Cars = triple.getLeft();
 v_totalNumberOfGhostVehicle_Vans = triple.getMiddle();
 v_totalNumberOfGhostVehicle_Trucks = triple.getRight();
@@ -1432,7 +1198,7 @@ else if(gr_mobilitySliders_residential.isVisible()){
 
 double f_updateMobilitySliders_default()
 {/*ALCODESTART::1754928402694*/
-List<GridConnection> allConsumerGridConnections = uI_Tabs.f_getSliderGridConnections_consumption();
+List<GridConnection> allConsumerGridConnections = uI_Tabs.f_getActiveSliderGridConnections_consumption();
 
 ////Savings
 double totalBaseTravelDistance_km = 0;
@@ -1441,7 +1207,7 @@ else if(gr_mobilitySliders_residential.isVisible()){
 	if(GC.v_isActive){
 		for(J_ActivityTrackerTrips tripTracker : GC.c_tripTrackers){
 			totalBaseTravelDistance_km += tripTracker.getAnnualDistance_km();
-			totalSavedTravelDistance_km += (1-tripTracker.getDistanceScaling_fr())*totalBaseTravelDistance_km;
+			totalSavedTravelDistance_km += (1-tripTracker.getDistanceScaling_fr())*tripTracker.getAnnualDistance_km();
 		}
 	}
 }
@@ -1593,7 +1359,7 @@ else if (vehicle instanceof J_EAHydrogenVehicle){
 cb_activateV2GPrivateParkedCars.setSelected(false, false);
 gr_settingsV2G_privateParkedCars.setVisible(false);
 
-List<GCHouse> houseGridConnectionsWithPrivateParking = findAll(uI_Tabs.f_getSliderGridConnections_houses(), house -> house.p_eigenOprit);
+List<GCHouse> houseGridConnectionsWithPrivateParking = findAll(uI_Tabs.f_getActiveSliderGridConnections_houses(), house -> house.p_eigenOprit);
 List<J_EAVehicle> privateParkedCars = new ArrayList<J_EAVehicle>();
 houseGridConnectionsWithPrivateParking.forEach(gc -> privateParkedCars.addAll(gc.c_vehicleAssets));
 
diff --git a/_alp/Agents/tabMobility/Levels/Level.level.xml b/_alp/Agents/tabMobility/Levels/Level.level.xml
index ebe54968..00184ffb 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_setDieselCars( zero_Interface.energyModel.f_getActiveGridConnections(), sl_electricCars_pct, sl_fossilFuelCars_pct );</ActionCode>
+f_setDieselCars( uI_Tabs.f_getActiveSliderGridConnections_consumption(), sl_electricCars_pct, sl_fossilFuelCars_pct );</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -141,7 +141,7 @@ f_setDieselCars( zero_Interface.energyModel.f_getActiveGridConnections(), sl_ele
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
 					<ActionCode>f_setVehicleSliders( 0, sl_electricTrucks_pct, sl_hydrogenTrucks_pct, sl_fossilFuelTrucks_pct );
-f_setElectricTrucks( zero_Interface.energyModel.f_getActiveGridConnections(), sl_electricTrucks_pct, sl_hydrogenTrucks_pct, sl_fossilFuelTrucks_pct );</ActionCode>
+f_setElectricTrucks( uI_Tabs.f_getActiveSliderGridConnections_consumption(), sl_electricTrucks_pct, sl_hydrogenTrucks_pct, sl_fossilFuelTrucks_pct );</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -296,7 +296,7 @@ f_setElectricTrucks( zero_Interface.energyModel.f_getActiveGridConnections(), sl
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setDemandReduction( zero_Interface.energyModel.f_getActiveGridConnections(), sl_mobilityDemandReduction_pct.getValue() );
+					<ActionCode>f_setDemandReduction( uI_Tabs.f_getActiveSliderGridConnections_consumption(), sl_mobilityDemandReduction_pct.getValue() );
 </ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
@@ -352,7 +352,7 @@ f_setElectricTrucks( zero_Interface.energyModel.f_getActiveGridConnections(), sl
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
 					<ActionCode>f_setVehicleSliders( 1, sl_electricTrucks_pct, sl_hydrogenTrucks_pct, sl_fossilFuelTrucks_pct );
-f_setHydrogenTrucks( zero_Interface.energyModel.f_getActiveGridConnections(), sl_electricTrucks_pct, sl_hydrogenTrucks_pct, sl_fossilFuelTrucks_pct );</ActionCode>
+f_setHydrogenTrucks( uI_Tabs.f_getActiveSliderGridConnections_consumption(), sl_electricTrucks_pct, sl_hydrogenTrucks_pct, sl_fossilFuelTrucks_pct );</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -432,7 +432,7 @@ f_setHydrogenTrucks( zero_Interface.energyModel.f_getActiveGridConnections(), sl
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
 					<ActionCode>f_setVehicleSliders( 2, sl_electricTrucks_pct, sl_hydrogenTrucks_pct, sl_fossilFuelTrucks_pct );
-f_setDieselTrucks( zero_Interface.energyModel.f_getActiveGridConnections(), sl_electricTrucks_pct, sl_hydrogenTrucks_pct, sl_fossilFuelTrucks_pct );</ActionCode>
+f_setDieselTrucks( uI_Tabs.f_getActiveSliderGridConnections_consumption(), sl_electricTrucks_pct, sl_hydrogenTrucks_pct, sl_fossilFuelTrucks_pct );</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -537,7 +537,7 @@ f_setDieselTrucks( zero_Interface.energyModel.f_getActiveGridConnections(), sl_e
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
 					<ActionCode>sl_fossilFuelCars_pct.setValue(100 - sl_electricCars_pct.getIntValue(), false);
-f_setElectricCars( zero_Interface.energyModel.f_getActiveGridConnections(), sl_electricCars_pct, sl_fossilFuelCars_pct );</ActionCode>
+f_setElectricCars( uI_Tabs.f_getActiveSliderGridConnections_consumption(), sl_electricCars_pct, sl_fossilFuelCars_pct );</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -642,7 +642,7 @@ f_setElectricCars( zero_Interface.energyModel.f_getActiveGridConnections(), sl_e
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
 					<ActionCode>sl_electricVans_pct.setValue(100 - sl_fossilFuelVans_pct.getIntValue(), false);
-f_setDieselVans( zero_Interface.energyModel.f_getActiveGridConnections(), sl_electricVans_pct, sl_fossilFuelVans_pct );</ActionCode>
+f_setDieselVans( uI_Tabs.f_getActiveSliderGridConnections_consumption(), sl_electricVans_pct, sl_fossilFuelVans_pct );</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -722,7 +722,7 @@ f_setDieselVans( zero_Interface.energyModel.f_getActiveGridConnections(), sl_ele
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
 					<ActionCode>sl_fossilFuelVans_pct.setValue(100 - sl_electricVans_pct.getIntValue(), false);
-f_setElectricVans( zero_Interface.energyModel.f_getActiveGridConnections(), sl_electricVans_pct, sl_fossilFuelVans_pct );</ActionCode>
+f_setElectricVans( uI_Tabs.f_getActiveSliderGridConnections_consumption(), sl_electricVans_pct, sl_fossilFuelVans_pct );</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -1048,7 +1048,7 @@ if(cb_spreadChargingEVs.isSelected()){
 	selectedChargingAttitude = OL_ChargingAttitude.MAX_POWER; 
 }
 
-f_setChargingAttitude(selectedChargingAttitude, uI_Tabs.f_getSliderGridConnections_all());</ActionCode>
+f_setChargingAttitude(selectedChargingAttitude, uI_Tabs.f_getAllSliderGridConnections_all());</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<Font Name="Dialog" Size="11" Style="0"/>
@@ -1225,7 +1225,7 @@ switch(cb_setChargingAttitude.getValue()){
 }
 
 if(selectedChargingAttitude != null){
-	f_setChargingAttitude(selectedChargingAttitude, uI_Tabs.f_getSliderGridConnections_all());
+	f_setChargingAttitude(selectedChargingAttitude, uI_Tabs.f_getAllSliderGridConnections_all());
 }</ActionCode>
 		</BasicProperties>
 		<ExtendedProperties>
@@ -1484,7 +1484,7 @@ if(selectedChargingAttitude != null){
 				<BasicProperties Width="100" Height="30">
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
-					<ActionCode>f_setVehiclesPrivateParking(uI_Tabs.f_getSliderGridConnections_houses(), sl_privateEVsResidentialArea_pct.getValue(), sl_EVsThatSupportV2G_pct);</ActionCode>
+					<ActionCode>f_setVehiclesPrivateParking(uI_Tabs.f_getActiveSliderGridConnections_houses(), sl_privateEVsResidentialArea_pct.getValue(), sl_EVsThatSupportV2G_pct);</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -1869,7 +1869,7 @@ if(selectedChargingAttitude != null){
 							<EmbeddedIcon>false</EmbeddedIcon>
 							<TextColor>-16777216</TextColor>
 							<Enabled>true</Enabled>
-							<ActionCode>f_activateV2G(new ArrayList&lt;GridConnection&gt;(uI_Tabs.f_getSliderGridConnections_houses()), cb_activateV2GPrivateParkedCars.isSelected());
+							<ActionCode>f_activateV2G(new ArrayList&lt;GridConnection&gt;(uI_Tabs.f_getActiveSliderGridConnections_houses()), cb_activateV2GPrivateParkedCars.isSelected());
 gr_settingsV2G_privateParkedCars.setVisible(cb_activateV2GPrivateParkedCars.isSelected());</ActionCode>
 						</BasicProperties>
 						<ExtendedProperties>
@@ -2010,7 +2010,7 @@ switch(cb_chargingAttitudePrivateParkedCars.getValue()){
 }
 
 if(selectedChargingAttitude != null){
-	f_setChargingAttitude(selectedChargingAttitude, new ArrayList&lt;GridConnection&gt;(uI_Tabs.f_getSliderGridConnections_houses()));
+	f_setChargingAttitude(selectedChargingAttitude, new ArrayList&lt;GridConnection&gt;(uI_Tabs.f_getActiveSliderGridConnections_houses()));
 }
 else{
 	cb_chargingAttitudePrivateParkedCars.setValue("Niet slim laden", true);
@@ -2307,7 +2307,7 @@ gr_settingsV2G_publicChargers.setVisible(cb_activateV2GPublicChargers.isSelected
 						<BasicProperties Width="100" Height="30">
 							<EmbeddedIcon>false</EmbeddedIcon>
 							<Enabled>true</Enabled>
-							<ActionCode>f_setV2GEVCapabilities( uI_Tabs.f_getSliderGridConnections_houses(), sl_EVsThatSupportV2G_pct.getValue() );</ActionCode>
+							<ActionCode>f_setV2GEVCapabilities( uI_Tabs.f_getActiveSliderGridConnections_houses(), sl_EVsThatSupportV2G_pct.getValue() );</ActionCode>
 						</BasicProperties>
 						<ExtendedProperties>
 							<DefaultValueCode>0</DefaultValueCode>
diff --git a/_alp/Classes/Class.J_SliderSettings_Residential.java b/_alp/Classes/Class.J_SliderSettings_Residential.java
new file mode 100644
index 00000000..e0247960
--- /dev/null
+++ b/_alp/Classes/Class.J_SliderSettings_Residential.java
@@ -0,0 +1,224 @@
+/**
+ * J_SliderSettings_Residential
+ */	
+public class J_SliderSettings_Residential {
+	
+	////Electricity
+	private double housesWithPV_pct;
+	private double pvHousesWithBattery_pct;
+	private double cooking_pct;
+	private double electricityDemandIncrease_pct;
+	private double averageNeighbourhoodBatterySize_kWh;
+
+	////Heating
+	private double housesWithGasBurners_pct;
+	private double housesWithHybridHeatpump_pct;
+	private double housesWithElectricHeatpump_pct;
+	private boolean cb_householdHTDistrictHeatingActive;
+	private boolean cb_householdLTDistrictHeatingActive;
+	private double housesWithAirco_pct;
+	private double housesWithImprovedInsulation_pct;
+	private double nbHousesWithPT_pct;
+
+	////Mobility
+	private double privateEVs_pct;
+	private double privateEVsThatSupportV2G_pct;
+	private String selectedChargingAttitudeStringPrivateEVs;
+	private boolean V2GActivePrivateEVs;
+	private double activePublicChargers_pct;
+	private double chargersV1G_pct;
+	private double chargersV2G_pct;
+	private String selectedChargingAttitudeStringChargers;
+	private boolean V2GActiveChargers;
+	
+	
+	
+    /**
+     * Default constructor
+     */
+    public J_SliderSettings_Residential() {
+    }
+	
+	// ====== Setters ======
+	public void setHousesWithPV_pct(double housesWithPV_pct) {
+	    this.housesWithPV_pct = housesWithPV_pct;
+	}
+
+	public void setPvHousesWithBattery_pct(double pvHousesWithBattery_pct) {
+	    this.pvHousesWithBattery_pct = pvHousesWithBattery_pct;
+	}
+
+	public void setCooking_pct(double cooking_pct) {
+	    this.cooking_pct = cooking_pct;
+	}
+
+	public void setElectricityDemandIncrease_pct(double electricityDemandIncrease_pct) {
+	    this.electricityDemandIncrease_pct = electricityDemandIncrease_pct;
+	}
+
+	public void setAverageNeighbourhoodBatterySize_kWh(double averageNeighbourhoodBatterySize_kWh) {
+	    this.averageNeighbourhoodBatterySize_kWh = averageNeighbourhoodBatterySize_kWh;
+	}
+
+	// Heating
+	public void setHousesWithGasBurners_pct(double housesWithGasBurners_pct) {
+	    this.housesWithGasBurners_pct = housesWithGasBurners_pct;
+	}
+
+	public void setHousesWithHybridHeatpump_pct(double housesWithHybridHeatpump_pct) {
+	    this.housesWithHybridHeatpump_pct = housesWithHybridHeatpump_pct;
+	}
+
+	public void setHousesWithElectricHeatpump_pct(double housesWithElectricHeatpump_pct) {
+	    this.housesWithElectricHeatpump_pct = housesWithElectricHeatpump_pct;
+	}
+
+	public void setCb_householdHTDistrictHeatingActive(boolean cb_householdHTDistrictHeatingActive) {
+	    this.cb_householdHTDistrictHeatingActive = cb_householdHTDistrictHeatingActive;
+	}
+
+	public void setCb_householdLTDistrictHeatingActive(boolean cb_householdLTDistrictHeatingActive) {
+	    this.cb_householdLTDistrictHeatingActive = cb_householdLTDistrictHeatingActive;
+	}
+
+	public void setHousesWithAirco_pct(double housesWithAirco_pct) {
+	    this.housesWithAirco_pct = housesWithAirco_pct;
+	}
+
+	public void setHousesWithImprovedInsulation_pct(double housesWithImprovedInsulation_pct) {
+	    this.housesWithImprovedInsulation_pct = housesWithImprovedInsulation_pct;
+	}
+
+	public void setNbHousesWithPT_pct(double nbHousesWithPT_pct) {
+	    this.nbHousesWithPT_pct = nbHousesWithPT_pct;
+	}
+
+	// Mobility
+	public void setPrivateEVs_pct(double privateEVs_pct) {
+	    this.privateEVs_pct = privateEVs_pct;
+	}
+
+	public void setPrivateEVsThatSupportV2G_pct(double privateEVsThatSupportV2G_pct) {
+	    this.privateEVsThatSupportV2G_pct = privateEVsThatSupportV2G_pct;
+	}
+
+	public void setSelectedChargingAttitudeStringPrivateEVs(String selectedChargingAttitudeStringPrivateEVs) {
+	    this.selectedChargingAttitudeStringPrivateEVs = selectedChargingAttitudeStringPrivateEVs;
+	}
+
+	public void setV2GActivePrivateEVs(boolean V2GActivePrivateEVs) {
+	    this.V2GActivePrivateEVs = V2GActivePrivateEVs;
+	}
+
+	public void setActivePublicChargers_pct(double activePublicChargers_pct) {
+	    this.activePublicChargers_pct = activePublicChargers_pct;
+	}
+
+	public void setChargersV1G_pct(double chargersV1G_pct) {
+	    this.chargersV1G_pct = chargersV1G_pct;
+	}
+
+	public void setChargersV2G_pct(double chargersV2G_pct) {
+	    this.chargersV2G_pct = chargersV2G_pct;
+	}
+
+	public void setSelectedChargingAttitudeStringChargers(String selectedChargingAttitudeStringChargers) {
+	    this.selectedChargingAttitudeStringChargers = selectedChargingAttitudeStringChargers;
+	}
+
+	public void setV2GActiveChargers(boolean V2GActiveChargers) {
+	    this.V2GActiveChargers = V2GActiveChargers;
+	}
+
+	// ====== Getters ======
+	public double getHousesWithPV_pct() {
+	    return housesWithPV_pct;
+	}
+
+	public double getPvHousesWithBattery_pct() {
+	    return pvHousesWithBattery_pct;
+	}
+
+	public double getCooking_pct() {
+	    return cooking_pct;
+	}
+
+	public double getElectricityDemandIncrease_pct() {
+	    return electricityDemandIncrease_pct;
+	}
+
+	public double getAverageNeighbourhoodBatterySize_kWh() {
+	    return averageNeighbourhoodBatterySize_kWh;
+	}
+
+	// Heating
+	public double getHousesWithGasBurners_pct() {
+	    return housesWithGasBurners_pct;
+	}
+
+	public double getHousesWithHybridHeatpump_pct() {
+	    return housesWithHybridHeatpump_pct;
+	}
+
+	public double getHousesWithElectricHeatpump_pct() {
+	    return housesWithElectricHeatpump_pct;
+	}
+
+	public boolean getCb_householdHTDistrictHeatingActive() {
+	    return cb_householdHTDistrictHeatingActive;
+	}
+
+	public boolean getCb_householdLTDistrictHeatingActive() {
+	    return cb_householdLTDistrictHeatingActive;
+	}
+
+	public double getHousesWithAirco_pct() {
+	    return housesWithAirco_pct;
+	}
+
+	public double getHousesWithImprovedInsulation_pct() {
+	    return housesWithImprovedInsulation_pct;
+	}
+
+	public double getNbHousesWithPT_pct() {
+	    return nbHousesWithPT_pct;
+	}
+
+	// Mobility
+	public double getPrivateEVs_pct() {
+	    return privateEVs_pct;
+	}
+
+	public double getPrivateEVsThatSupportV2G_pct() {
+	    return privateEVsThatSupportV2G_pct;
+	}
+
+	public String getSelectedChargingAttitudeStringPrivateEVs() {
+	    return selectedChargingAttitudeStringPrivateEVs;
+	}
+
+	public boolean getV2GActivePrivateEVs() {
+	    return V2GActivePrivateEVs;
+	}
+
+	public double getActivePublicChargers_pct() {
+	    return activePublicChargers_pct;
+	}
+
+	public double getChargersV1G_pct() {
+	    return chargersV1G_pct;
+	}
+
+	public double getChargersV2G_pct() {
+	    return chargersV2G_pct;
+	}
+
+	public String getSelectedChargingAttitudeStringChargers() {
+	    return selectedChargingAttitudeStringChargers;
+	}
+
+	public boolean getV2GActiveChargers() {
+	    return V2GActiveChargers;
+	}
+	
+}
\ No newline at end of file