diff --git a/_alp/Agents/EnergyCoop/Code/Functions.java b/_alp/Agents/EnergyCoop/Code/Functions.java
index d546be3f..b59ed006 100644
--- a/_alp/Agents/EnergyCoop/Code/Functions.java
+++ b/_alp/Agents/EnergyCoop/Code/Functions.java
@@ -185,19 +185,18 @@
 
 
 for(GridConnection gc : c_memberGridConnections) { // Can't do this in parallel due to different threads writing to the same values!
-	
-	fm_currentBalanceFlows_kW.addFlows(gc.fm_currentBalanceFlows_kW);
-	fm_currentProductionFlows_kW.addFlows(gc.fm_currentProductionFlows_kW);
-	fm_currentConsumptionFlows_kW.addFlows(gc.fm_currentConsumptionFlows_kW);
-	fm_currentAssetFlows_kW.addFlows(gc.fm_currentAssetFlows_kW);
-	v_currentFinalEnergyConsumption_kW += gc.v_currentFinalEnergyConsumption_kW;
-	v_currentPrimaryEnergyProduction_kW += gc.v_currentPrimaryEnergyProduction_kW;
-	v_currentEnergyCurtailed_kW += gc.v_currentEnergyCurtailed_kW;
-	v_batteryStoredEnergy_kWh += gc.v_batteryStoredEnergy_kWh;
-	v_currentPrimaryEnergyProductionHeatpumps_kW += gc.v_currentPrimaryEnergyProductionHeatpumps_kW;
-	v_currentOwnElectricityProduction_kW += gc.fm_currentProductionFlows_kW.get(OL_EnergyCarriers.ELECTRICITY);
-	 	
-
+	if(gc.v_isActive){
+		fm_currentBalanceFlows_kW.addFlows(gc.fm_currentBalanceFlows_kW);
+		fm_currentProductionFlows_kW.addFlows(gc.fm_currentProductionFlows_kW);
+		fm_currentConsumptionFlows_kW.addFlows(gc.fm_currentConsumptionFlows_kW);
+		fm_currentAssetFlows_kW.addFlows(gc.fm_currentAssetFlows_kW);
+		v_currentFinalEnergyConsumption_kW += gc.v_currentFinalEnergyConsumption_kW;
+		v_currentPrimaryEnergyProduction_kW += gc.v_currentPrimaryEnergyProduction_kW;
+		v_currentEnergyCurtailed_kW += gc.v_currentEnergyCurtailed_kW;
+		v_batteryStoredEnergy_kWh += gc.v_batteryStoredEnergy_kWh;
+		v_currentPrimaryEnergyProductionHeatpumps_kW += gc.v_currentPrimaryEnergyProductionHeatpumps_kW;
+		v_currentOwnElectricityProduction_kW += gc.fm_currentProductionFlows_kW.get(OL_EnergyCarriers.ELECTRICITY);	
+	}
 }
 
 // gather electricity flows
@@ -222,15 +221,17 @@
 }
 
 for (GridConnection GC : c_customerGridConnections) { // Take 'behind the meter' production and consumption!
-	for (OL_EnergyCarriers energyCarrier : v_activeEnergyCarriers) {
-		double nettConsumption_kW = GC.fm_currentBalanceFlows_kW.get(energyCarrier);
-		fm_currentProductionFlows_kW.addFlow( energyCarrier, max(0, -nettConsumption_kW));
-		fm_currentConsumptionFlows_kW.addFlow( energyCarrier, max(0, nettConsumption_kW));
-		fm_currentBalanceFlows_kW.addFlow( energyCarrier, nettConsumption_kW);
-		
-		if (energyCarrier == OL_EnergyCarriers.ELECTRICITY) {
-			v_currentCustomerFeedIn_kW += max(0,-nettConsumption_kW);
-			v_currentCustomerDelivery_kW += max(0,nettConsumption_kW);
+	if(GC.v_isActive){
+		for (OL_EnergyCarriers energyCarrier : v_activeEnergyCarriers) {
+			double nettConsumption_kW = GC.fm_currentBalanceFlows_kW.get(energyCarrier);
+			fm_currentProductionFlows_kW.addFlow( energyCarrier, max(0, -nettConsumption_kW));
+			fm_currentConsumptionFlows_kW.addFlow( energyCarrier, max(0, nettConsumption_kW));
+			fm_currentBalanceFlows_kW.addFlow( energyCarrier, nettConsumption_kW);
+			
+			if (energyCarrier == OL_EnergyCarriers.ELECTRICITY) {
+				v_currentCustomerFeedIn_kW += max(0,-nettConsumption_kW);
+				v_currentCustomerDelivery_kW += max(0,nettConsumption_kW);
+			}
 		}
 	}				
 }
@@ -1412,7 +1413,6 @@ HashSet<GridConnection> f_getAllChildCustomerGridConnections_recursion(HashSet<G
 	//Connect to coop
 	coopBattery.c_parentCoops.add(this);
 	c_memberGridConnections.add(coopBattery);
-	//v_liveAssetsMetaData.hasBattery = true;
 }
 /*ALCODEEND*/}
 
@@ -1576,3 +1576,8 @@ EnergyCoop f_addAssetFlow(OL_AssetFlowCategories AC)
 
 /*ALCODEEND*/}
 
+List<GridConnection> f_getMemberGridConnectionsCollectionPointer()
+{/*ALCODESTART::1754908113703*/
+return this.c_memberGridConnections; // This should NOT be a copy, it should be a pointer!!
+/*ALCODEEND*/}
+
diff --git a/_alp/Agents/EnergyCoop/Code/Functions.xml b/_alp/Agents/EnergyCoop/Code/Functions.xml
index eb6d5d35..71e7911b 100644
--- a/_alp/Agents/EnergyCoop/Code/Functions.xml
+++ b/_alp/Agents/EnergyCoop/Code/Functions.xml
@@ -555,7 +555,7 @@
 		<Id>1742569887460</Id>
 		<Name><![CDATA[f_connectCoopBattery]]></Name>
 		<X>990</X>
-		<Y>300</Y>
+		<Y>290</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -689,4 +689,20 @@
 		<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>1754908113703</Id>
+		<Name><![CDATA[f_getMemberGridConnectionsCollectionPointer]]></Name>
+		<X>1440</X>
+		<Y>450</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
 </Functions>
diff --git a/_alp/Agents/EnergyCoop/Variables.xml b/_alp/Agents/EnergyCoop/Variables.xml
index 57c71f79..11252042 100644
--- a/_alp/Agents/EnergyCoop/Variables.xml
+++ b/_alp/Agents/EnergyCoop/Variables.xml
@@ -2049,7 +2049,7 @@
 		<PublicFlag>false</PublicFlag>
 		<PresentationFlag>true</PresentationFlag>
 		<ShowLabel>true</ShowLabel>
-		<Properties SaveInSnapshot="true" AccessType="public" StaticVariable="false">
+		<Properties SaveInSnapshot="true" AccessType="private" StaticVariable="false">
 			<CollectionClass>ArrayList</CollectionClass>
 			<ElementClass>GridConnection</ElementClass>
 			<ValueElementClass>Object</ValueElementClass>
diff --git a/_alp/Agents/EnergyModel/Code/Functions.java b/_alp/Agents/EnergyModel/Code/Functions.java
index cbe44827..578490ea 100644
--- a/_alp/Agents/EnergyModel/Code/Functions.java
+++ b/_alp/Agents/EnergyModel/Code/Functions.java
@@ -323,7 +323,6 @@
 }
 
 f_resetAnnualValues();
-traceln("Active asset flows in this model: %s", v_rapidRunData.assetsMetaData.activeAssetFlows);
 
 
 v_isRapidRun = true;
@@ -1125,3 +1124,13 @@ EnergyCoop f_addAssetFlow(OL_AssetFlowCategories AC)
 }
 /*ALCODEEND*/}
 
+List<GridConnection> f_getGridConnectionsCollectionPointer()
+{/*ALCODESTART::1754908171225*/
+return this.c_gridConnections;
+/*ALCODEEND*/}
+
+List<GridConnection> f_getPausedGridConnectionsCollectionPointer()
+{/*ALCODESTART::1755014169405*/
+return this.c_pausedGridConnections;
+/*ALCODEEND*/}
+
diff --git a/_alp/Agents/EnergyModel/Code/Functions.xml b/_alp/Agents/EnergyModel/Code/Functions.xml
index 1b3b9043..b8d77990 100644
--- a/_alp/Agents/EnergyModel/Code/Functions.xml
+++ b/_alp/Agents/EnergyModel/Code/Functions.xml
@@ -650,4 +650,36 @@
 		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
+	<Function AccessType="public" StaticFunction="false">
+		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
+		<ReturnType>List&lt;GridConnection&gt;</ReturnType>
+		<Id>1754908171225</Id>
+		<Name><![CDATA[f_getGridConnectionsCollectionPointer]]></Name>
+		<X>1580</X>
+		<Y>920</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>1755014169405</Id>
+		<Name><![CDATA[f_getPausedGridConnectionsCollectionPointer]]></Name>
+		<X>1580</X>
+		<Y>940</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/GCHouse/Code/AdditionalClassCode.java b/_alp/Agents/GCHouse/Code/AdditionalClassCode.java
index 2170f4e1..a3ffc46e 100644
--- a/_alp/Agents/GCHouse/Code/AdditionalClassCode.java
+++ b/_alp/Agents/GCHouse/Code/AdditionalClassCode.java
@@ -10,11 +10,6 @@ public void f_removeTheJ_EA(J_EA j_ea){
 	f_removeTheJ_EA_house(j_ea);
 }
 
-/*@Override
-public void f_operateFixedConsumptionAssets(){
-	f_operateFixedConsumptionAssets_overwrite();
-}*/
-
 @Override
 public void f_operateFlexAssets(){
 	f_operateFlexAssets_overwrite();
@@ -25,12 +20,4 @@ public void f_manageCharging(){
 	f_manageCharging_overwrite();
 }
 
-/*@Override 
-public void f_chargeOnPrice(double a, double b){
-	f_chargeOnPrice_overwrite(a,b);
-}*/
 
-@Override
-public void f_simpleCharging(){
-	f_simpleCharging_overwrite();
-}
diff --git a/_alp/Agents/GCHouse/Code/Functions.java b/_alp/Agents/GCHouse/Code/Functions.java
index 91a4bcdd..5bd2818f 100644
--- a/_alp/Agents/GCHouse/Code/Functions.java
+++ b/_alp/Agents/GCHouse/Code/Functions.java
@@ -11,7 +11,7 @@
 
 f_manageHeating();
 
-if( p_householdEV != null){
+if( c_electricVehicles.size() > 0){
 	double availableCapacityFromBatteries = p_batteryAsset == null ? 0 : p_batteryAsset.getCapacityAvailable_kW(); 
 	double availableChargingCapacity = v_liveConnectionMetaData.contractedDeliveryCapacity_kW + availableCapacityFromBatteries - fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY);
 	//f_maxPowerCharging( max(0, availableChargingCapacity));
@@ -218,7 +218,7 @@ else if (lastLoopsPriceLevel.equals("low") && powerAvailableAtLastLoop_kW > p_mi
 double availableCapacityFromBatteries = p_batteryAsset == null ? 0 : p_batteryAsset.getCapacityAvailable_kW(); 
 //double availableChargingCapacity = v_allowedCapacity_kW + availableCapacityFromBatteries - v_currentPowerElectricity_kW;
 double availableChargingCapacity = v_liveConnectionMetaData.contractedDeliveryCapacity_kW + availableCapacityFromBatteries - fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY);
-v_vehicleSOC_fr = p_householdEV.getCurrentStateOfCharge_fr();
+//v_vehicleSOC_fr = p_householdEV.getCurrentStateOfCharge_fr();
 
 switch (p_chargingAttitudeVehicles) {
 	case SIMPLE:
@@ -341,60 +341,8 @@ else if ( v_batterySOC_fr < 0.6 && v_currentPowerElectricity_kW < 1 && v_current
 
 double f_connectTo_J_EA_House(J_EA j_ea)
 {/*ALCODESTART::1693300820997*/
-/*
-if (j_ea instanceof J_EAConversion) {
-	if (j_ea.energyAssetType == OL_EnergyAssetType.GAS_BURNER || j_ea instanceof J_EAConversionHeatPump || j_ea instanceof J_EAConversionHeatDeliverySet || j_ea instanceof J_EAConversionElectricHeater ) {
-		switch (p_heatingType) {
-        	case HEATPUMP_AIR:
-        		p_primaryHeatingAsset = (J_EAConversion)j_ea;
-        		break;
-        	case HEATPUMP_GASPEAK:
-				p_primaryHeatingAsset = p_primaryHeatingAsset == null && j_ea instanceof J_EAConversionHeatPump? (J_EAConversion)j_ea : p_primaryHeatingAsset;
-	            p_secondaryHeatingAsset = p_secondaryHeatingAsset == null && j_ea instanceof J_EAConversionGasBurner? (J_EAConversion)j_ea : p_secondaryHeatingAsset;
-            	break;
-            case HEATPUMP_BOILERPEAK:    // ambigue wat we met boiler bedoelen; eboiler of grootschalige DH_boiler = gasburner!
-                p_primaryHeatingAsset = p_primaryHeatingAsset == null && j_ea instanceof J_EAConversionHeatPump? (J_EAConversion)j_ea : p_primaryHeatingAsset;
-                p_secondaryHeatingAsset = p_secondaryHeatingAsset == null && j_ea instanceof J_EAConversionGasBurner? (J_EAConversion)j_ea : p_secondaryHeatingAsset;
-                p_secondaryHeatingAsset = p_secondaryHeatingAsset == null && j_ea instanceof J_EAConversionElectricHeater? (J_EAConversion)j_ea : p_secondaryHeatingAsset;                                          
-            	break;
-            case GASBURNER:
-                p_primaryHeatingAsset = p_primaryHeatingAsset == null && j_ea instanceof J_EAConversionGasBurner? (J_EAConversion)j_ea : p_primaryHeatingAsset;
-                p_secondaryHeatingAsset = p_secondaryHeatingAsset == null && j_ea instanceof J_EAConversionGasCHP? (J_EAConversion)j_ea : p_secondaryHeatingAsset;
-            	break;
-            case DISTRICTHEAT:
-                if( j_ea instanceof J_EAConversionHeatDeliverySet ){
-					p_primaryHeatingAsset = (J_EAConversion)j_ea;
-					//traceln("Assigning heat delivery set as primary heating asset for house!");
-				}
-				else {
-					p_secondaryHeatingAsset = (J_EAConversion)j_ea;
-					// set water/water heatpump source energy-asset
-					
-					//if( j_ea instanceof J_EAConversionHeatPump && ((J_EAConversionHeatPump)j_ea).getAmbientTempType().equals("WATER") && p_primaryHeatingAsset instanceof J_EAConversionHeatDeliverySet ) {
-						//((J_EAConversionHeatPump)j_ea).p_linkedSourceEnergyAsset = p_primaryHeatingAsset;
-						//j_ea.updateAmbientTemperature( ((J_EAConversionHeatPump)j_ea).p_linkedSourceEnergyAsset.getCurrentTemperature() );
-					//}
-					
-				}	
-            	break;
-            case LT_DISTRICTHEAT:
-            	p_primaryHeatingAsset = (J_EAConversion)j_ea;
-            	break;
-            default: throw new IllegalStateException("Invalid HeatingType: " + p_heatingType);
-      	}
-    }
-}
-*/
-
-if (j_ea instanceof J_EAEV) {
-	if (p_householdEV != null){
-	    	throw new RuntimeException(String.format("Exception: trying to assign 2 EVs to a household!! --> one of them will not charge! "));
-	}
-	p_householdEV = (J_EAEV)j_ea;
-}
 if (j_ea instanceof J_EAAirco) {
 	p_airco = (J_EAAirco)j_ea;
-	//c_electricHeatpumpAssets.add(j_ea);
 }
 /*ALCODEEND*/}
 
@@ -408,21 +356,6 @@ else if ( v_batterySOC_fr < 0.6 && v_currentPowerElectricity_kW < 1 && v_current
 traceln("Placeholder function f_setEnergyLabel called! Nothing will happen.");
 /*ALCODEEND*/}
 
-double f_removeCurrentHeatingSystem()
-{/*ALCODESTART::1726129903799*/
-p_heatingType = OL_GridConnectionHeatingType.NONE;
-p_primaryHeatingAsset.removeEnergyAsset();
-if ( p_secondaryHeatingAsset != null){
-	p_secondaryHeatingAsset.removeEnergyAsset();
-}
-if ( p_tertiaryHeatingAsset != null){
-	p_tertiaryHeatingAsset.removeEnergyAsset();
-}
-if ( p_heatBuffer != null){
-	p_heatBuffer.removeEnergyAsset();
-}
-/*ALCODEEND*/}
-
 double f_manageCookingTracker()
 {/*ALCODESTART::1726334759211*/
 // Add heat from cooking assets to house
@@ -482,12 +415,8 @@ else if ( v_batterySOC_fr < 0.6 && v_currentPowerElectricity_kW < 1 && v_current
 
 double f_removeTheJ_EA_house(J_EA j_ea)
 {/*ALCODESTART::1749722407831*/
-if (j_ea instanceof J_EAEV) {
-	p_householdEV = null;
-}
 if (j_ea instanceof J_EAAirco) {
 	p_airco = null;
-	//c_electricHeatpumpAssets.remove(j_ea);
 }
 /*ALCODEEND*/}
 
diff --git a/_alp/Agents/GCHouse/Code/Functions.xml b/_alp/Agents/GCHouse/Code/Functions.xml
index 1b859245..ea9d7f2d 100644
--- a/_alp/Agents/GCHouse/Code/Functions.xml
+++ b/_alp/Agents/GCHouse/Code/Functions.xml
@@ -22,8 +22,8 @@
 		<Id>1669203453155</Id>
 		<Name><![CDATA[f_createThermalStorageModel]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>940</X>
-		<Y>-90</Y>
+		<X>1290</X>
+		<Y>1190</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -39,8 +39,8 @@
 		<Id>1674402121915</Id>
 		<Name><![CDATA[f_chargeOnPrice_overwrite]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>1230</X>
-		<Y>680</Y>
+		<X>1290</X>
+		<Y>1270</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -80,8 +80,9 @@
 		<Id>1675033218897</Id>
 		<Name><![CDATA[f_simpleCharging_overwrite]]></Name>
 		<Description><![CDATA[Charging when arriving home, not taking grid limits into account]]></Description>
-		<X>940</X>
-		<Y>330</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>1320</X>
+		<Y>1370</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -97,8 +98,8 @@
 		<Id>1675034695162</Id>
 		<Name><![CDATA[f_determineChargingDemandOfEV]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>1230</X>
-		<Y>700</Y>
+		<X>1290</X>
+		<Y>1290</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -114,8 +115,8 @@
 		<Id>1677664183773</Id>
 		<Name><![CDATA[f_chargeOnPriceSimpler]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>1240</X>
-		<Y>730</Y>
+		<X>1300</X>
+		<Y>1320</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -135,8 +136,8 @@
 		<Id>1678708804201</Id>
 		<Name><![CDATA[f_batteryManagementLoad]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>1240</X>
-		<Y>750</Y>
+		<X>1300</X>
+		<Y>1340</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -171,8 +172,8 @@
 		<ReturnType>double</ReturnType>
 		<Id>1696923950404</Id>
 		<Name><![CDATA[f_setAnnualEnergyDemand]]></Name>
-		<X>1090</X>
-		<Y>40</Y>
+		<X>1010</X>
+		<Y>-80</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -187,25 +188,8 @@
 		<ReturnType>double</ReturnType>
 		<Id>1696924006982</Id>
 		<Name><![CDATA[f_setEnergyLabel]]></Name>
-		<X>1090</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="default" StaticFunction="false">
-		<ReturnModificator>VOID</ReturnModificator>
-		<ReturnType>double</ReturnType>
-		<Id>1726129903799</Id>
-		<Name><![CDATA[f_removeCurrentHeatingSystem]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>1090</X>
-		<Y>20</Y>
+		<X>1010</X>
+		<Y>-60</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
diff --git a/_alp/Agents/GCHouse/Variables.xml b/_alp/Agents/GCHouse/Variables.xml
index 6ce592a0..1417df9e 100644
--- a/_alp/Agents/GCHouse/Variables.xml
+++ b/_alp/Agents/GCHouse/Variables.xml
@@ -3,8 +3,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1674397034293</Id>
 		<Name><![CDATA[v_vehicleSOC_fr]]></Name>
-		<X>1260</X>
-		<Y>610</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>1290</X>
+		<Y>1220</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -83,8 +84,8 @@
 		<Id>1675025488988</Id>
 		<Name><![CDATA[v_currentPriceLevel]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>1230</X>
-		<Y>660</Y>
+		<X>1290</X>
+		<Y>1250</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -277,6 +278,7 @@
 	<Variable Class="Parameter">
 		<Id>1675032836511</Id>
 		<Name><![CDATA[p_householdEV]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>600</X>
 		<Y>510</Y>
 		<Label>
@@ -360,8 +362,8 @@
 		<Id>1702369144256</Id>
 		<Name><![CDATA[p_hasElectricHob]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>570</X>
-		<Y>580</Y>
+		<X>1290</X>
+		<Y>1110</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -468,7 +470,7 @@
 		<Name><![CDATA[p_heatingKickinTreshold_degC]]></Name>
 		<Description><![CDATA[[degrees]]]></Description>
 		<X>570</X>
-		<Y>560</Y>
+		<Y>580</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
diff --git a/_alp/Agents/GridConnection/Code/Functions.java b/_alp/Agents/GridConnection/Code/Functions.java
index d6f0b163..fb0485c2 100644
--- a/_alp/Agents/GridConnection/Code/Functions.java
+++ b/_alp/Agents/GridConnection/Code/Functions.java
@@ -419,9 +419,6 @@
 		remainingChargePower_kW = availableChargingPower_kW - vehicle.getLastFlows().get(OL_EnergyCarriers.ELECTRICITY);;
 		
 	}
-	if( this instanceof GCHouse){
-	((GCHouse)this).v_vehicleSOC_fr = vehicle.getCurrentStateOfCharge_fr();
-}
 }
 
 
@@ -677,9 +674,6 @@ else if (productionAsset.energyAssetType == OL_EnergyAssetType.PHOTOTHERMAL){
 		remainingChargePower_kW = availableChargingPower_kW - vehicle.getLastFlows().get(OL_EnergyCarriers.ELECTRICITY);;
 		
 	}
-	if( this instanceof GCHouse){
-		((GCHouse)this).v_vehicleSOC_fr = vehicle.getCurrentStateOfCharge_fr();
-	}
 }
 
 
@@ -1100,7 +1094,6 @@ else if (flowsMap.get(EC) > 0){
 if ( caller instanceof J_EAConversionHeatPump ) {
 	v_currentPrimaryEnergyProductionHeatpumps_kW += energyUse_kW;
 }
-
 for(var AC : assetFlowsMap_kW.keySet()) {
 	fm_currentAssetFlows_kW.addFlow(AC, -assetFlowsMap_kW.get(AC));
 }
diff --git a/_alp/Agents/GridConnection/Code/Functions.xml b/_alp/Agents/GridConnection/Code/Functions.xml
index 1e788c39..55273589 100644
--- a/_alp/Agents/GridConnection/Code/Functions.xml
+++ b/_alp/Agents/GridConnection/Code/Functions.xml
@@ -464,7 +464,7 @@
 		<ReturnType>double</ReturnType>
 		<Id>1722512642645</Id>
 		<Name><![CDATA[f_removeFlows]]></Name>
-		<X>1040</X>
+		<X>1060</X>
 		<Y>240</Y>
 		<Label>
 			<X>10</X>
diff --git a/_alp/Agents/GridConnection/Variables.xml b/_alp/Agents/GridConnection/Variables.xml
index 62b58730..5817f5bd 100644
--- a/_alp/Agents/GridConnection/Variables.xml
+++ b/_alp/Agents/GridConnection/Variables.xml
@@ -2009,196 +2009,6 @@
 			<ValueElementClass>String</ValueElementClass>
 		</Properties>
 	</Variable>
-	<Variable Class="CollectionVariable">
-		<Id>1722516437894</Id>
-		<Name><![CDATA[c_fixedConsumptionElectricAssets]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>-280</X>
-		<Y>980</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_EA</ElementClass>
-			<ValueElementClass>String</ValueElementClass>
-		</Properties>
-	</Variable>
-	<Variable Class="CollectionVariable">
-		<Id>1722516468629</Id>
-		<Name><![CDATA[c_electricHobAssets]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>-280</X>
-		<Y>1050</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_EA</ElementClass>
-			<ValueElementClass>String</ValueElementClass>
-		</Properties>
-	</Variable>
-	<Variable Class="CollectionVariable">
-		<Id>1722516515981</Id>
-		<Name><![CDATA[c_conversionElectricAssets]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>-280</X>
-		<Y>1020</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_EA</ElementClass>
-			<ValueElementClass>String</ValueElementClass>
-		</Properties>
-	</Variable>
-	<Variable Class="CollectionVariable">
-		<Id>1722516532968</Id>
-		<Name><![CDATA[c_electricHeatpumpAssets]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>-280</X>
-		<Y>1070</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_EA</ElementClass>
-			<ValueElementClass>String</ValueElementClass>
-		</Properties>
-	</Variable>
-	<Variable Class="CollectionVariable">
-		<Id>1722516544883</Id>
-		<Name><![CDATA[c_electrolyserAssets]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>-280</X>
-		<Y>1090</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_EA</ElementClass>
-			<ValueElementClass>String</ValueElementClass>
-		</Properties>
-	</Variable>
-	<Variable Class="CollectionVariable">
-		<Id>1722516559744</Id>
-		<Name><![CDATA[c_EvAssets]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>-280</X>
-		<Y>1110</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_EA</ElementClass>
-			<ValueElementClass>String</ValueElementClass>
-		</Properties>
-	</Variable>
-	<Variable Class="CollectionVariable">
-		<Id>1722516579645</Id>
-		<Name><![CDATA[c_pvAssets]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>-280</X>
-		<Y>1200</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_EA</ElementClass>
-			<ValueElementClass>String</ValueElementClass>
-		</Properties>
-	</Variable>
-	<Variable Class="CollectionVariable">
-		<Id>1722516597938</Id>
-		<Name><![CDATA[c_windAssets]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>-280</X>
-		<Y>1220</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_EA</ElementClass>
-			<ValueElementClass>String</ValueElementClass>
-		</Properties>
-	</Variable>
-	<Variable Class="CollectionVariable">
-		<Id>1722517079192</Id>
-		<Name><![CDATA[c_batteryAssets]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>-280</X>
-		<Y>1130</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_EA</ElementClass>
-			<ValueElementClass>String</ValueElementClass>
-		</Properties>
-	</Variable>
-	<Variable Class="CollectionVariable">
-		<Id>1734089799023</Id>
-		<Name><![CDATA[c_chpAssets]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>-280</X>
-		<Y>1260</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_EA</ElementClass>
-			<ValueElementClass>String</ValueElementClass>
-		</Properties>
-	</Variable>
 	<Variable Class="CollectionVariable">
 		<Id>1742484728807</Id>
 		<Name><![CDATA[c_parentCoops]]></Name>
@@ -2235,25 +2045,6 @@
 			<ValueElementClass>String</ValueElementClass>
 		</Properties>
 	</Variable>
-	<Variable Class="CollectionVariable">
-		<Id>1751442406691</Id>
-		<Name><![CDATA[c_ptAssets]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>-280</X>
-		<Y>1240</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_EA</ElementClass>
-			<ValueElementClass>String</ValueElementClass>
-		</Properties>
-	</Variable>
 	<Variable Class="CollectionVariable">
 		<Id>1753088511626</Id>
 		<Name><![CDATA[c_heatingAssets]]></Name>