diff --git a/Zero_engine.alpx b/Zero_engine.alpx
index 3b82aa6c..43084e2d 100644
--- a/Zero_engine.alpx
+++ b/Zero_engine.alpx
@@ -173,6 +173,10 @@
 					<Id>1739979321556</Id>
 					<Name><![CDATA[COOP]]></Name>
 				</Option>
+				<Option>
+					<Id>1749729312023</Id>
+					<Name><![CDATA[PARKING]]></Name>
+				</Option>
 			</OptionList>
 			<OptionList>
 				<Id>1659118426374</Id>
@@ -349,6 +353,10 @@
 					<Id>1717159864803</Id>
 					<Name><![CDATA[FUEL_CELL]]></Name>
 				</Option>
+				<Option>
+					<Id>1749651086661</Id>
+					<Name><![CDATA[CHARGER]]></Name>
+				</Option>
 			</OptionList>
 			<OptionList>
 				<Id>1659525715752</Id>
@@ -937,6 +945,10 @@
 					<Id>1671011596610</Id>
 					<Name><![CDATA[CHEAP]]></Name>
 				</Option>
+				<Option>
+					<Id>1750246095668</Id>
+					<Name><![CDATA[V1G]]></Name>
+				</Option>
 				<Option>
 					<Id>1695825443639</Id>
 					<Name><![CDATA[V2G]]></Name>
@@ -1069,6 +1081,10 @@
 					<Id>1707990736908</Id>
 					<Name><![CDATA[OTHER]]></Name>
 				</Option>
+				<Option>
+					<Id>1750078140891</Id>
+					<Name><![CDATA[PARKINGSPACE_OP]]></Name>
+				</Option>
 			</OptionList>
 			<OptionList>
 				<Id>1718560423698</Id>
@@ -1207,6 +1223,30 @@
 					<Name><![CDATA[GRIDNODE]]></Name>
 				</Option>
 			</OptionList>
+			<OptionList>
+				<Id>1749738812988</Id>
+				<Name><![CDATA[OL_ParkingSpaceType]]></Name>
+				<Option>
+					<Id>1749738813678</Id>
+					<Name><![CDATA[DISABLED]]></Name>
+				</Option>
+				<Option>
+					<Id>1749738839937</Id>
+					<Name><![CDATA[PUBLIC]]></Name>
+				</Option>
+				<Option>
+					<Id>1749738872124</Id>
+					<Name><![CDATA[PRIVATE]]></Name>
+				</Option>
+				<Option>
+					<Id>1749738876030</Id>
+					<Name><![CDATA[ELECTRIC]]></Name>
+				</Option>
+				<Option>
+					<Id>1749738897847</Id>
+					<Name><![CDATA[KISS_AND_RIDE]]></Name>
+				</Option>
+			</OptionList>
 		</OptionLists>
 		<Folders/>
 		<ActiveObjectClasses/>
@@ -1522,6 +1562,18 @@
 				<Id>1746606645736</Id>
 				<Name><![CDATA[J_BatteryAlgorithmBas]]></Name>
 			</JavaClass>
+			<JavaClass>
+				<Id>1749648342034</Id>
+				<Name><![CDATA[J_EAAirco]]></Name>
+			</JavaClass>
+			<JavaClass>
+				<Id>1749649002419</Id>
+				<Name><![CDATA[J_ChargingSession]]></Name>
+			</JavaClass>
+			<JavaClass>
+				<Id>1749651263461</Id>
+				<Name><![CDATA[J_EACharger]]></Name>
+			</JavaClass>
 		</JavaClasses>
 		<RequiredLibraryReference>
 			<LibraryName>com.anylogic.libraries.modules.markup_descriptors</LibraryName>
diff --git a/_alp/Agents/EnergyModel/Code/Functions.java b/_alp/Agents/EnergyModel/Code/Functions.java
index de829a1c..b09ceef9 100644
--- a/_alp/Agents/EnergyModel/Code/Functions.java
+++ b/_alp/Agents/EnergyModel/Code/Functions.java
@@ -751,9 +751,12 @@
 
 /*ALCODEEND*/}
 
-ArrayList<GridConnection> f_getGridConnections()
+ArrayList<GridConnection> f_getActiveGridConnections()
 {/*ALCODESTART::1716890117265*/
-return c_gridConnections;
+ArrayList<GridConnection> copyOfGridConnectionList = new ArrayList<>(c_gridConnections);
+copyOfGridConnectionList.removeAll(Arrays.asList(pop_gridConnections)); // Remove all default gridconnections (no flex control, only used for gridnode profile)
+return copyOfGridConnectionList;
+
 /*ALCODEEND*/}
 
 double f_initializeEngine()
@@ -1307,7 +1310,7 @@ EnergyCoop f_addConsumptionEnergyCarrier(OL_EnergyCarriers EC)
 {/*ALCODESTART::1741710906926*/
 
 //Update main area
-v_liveAssetsMetaData.updateActiveAssetData(f_getGridConnections());
+v_liveAssetsMetaData.updateActiveAssetData(f_getActiveGridConnections());
 
 //Update coop
 if(pop_energyCoops.size()>0){
@@ -1315,7 +1318,7 @@ EnergyCoop f_addConsumptionEnergyCarrier(OL_EnergyCarriers EC)
 }	
 
 //Update grid connection active asset data
-for(GridConnection GC : f_getGridConnections()){
+for(GridConnection GC : f_getActiveGridConnections()){
 	GC.v_liveAssetsMetaData.updateActiveAssetData(new ArrayList<>(List.of(GC)));
 }
 
diff --git a/_alp/Agents/EnergyModel/Code/Functions.xml b/_alp/Agents/EnergyModel/Code/Functions.xml
index 07c4ec82..876800e1 100644
--- a/_alp/Agents/EnergyModel/Code/Functions.xml
+++ b/_alp/Agents/EnergyModel/Code/Functions.xml
@@ -260,7 +260,7 @@
 		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
 		<ReturnType>ArrayList&lt;GridConnection&gt;</ReturnType>
 		<Id>1716890117265</Id>
-		<Name><![CDATA[f_getGridConnections]]></Name>
+		<Name><![CDATA[f_getActiveGridConnections]]></Name>
 		<X>1360</X>
 		<Y>520</Y>
 		<Label>
diff --git a/_alp/Agents/EnergyModel/EmbeddedObjects.xml b/_alp/Agents/EnergyModel/EmbeddedObjects.xml
index a8cd3531..b7f29616 100644
--- a/_alp/Agents/EnergyModel/EmbeddedObjects.xml
+++ b/_alp/Agents/EnergyModel/EmbeddedObjects.xml
@@ -87,6 +87,9 @@
 			<Parameter>
 				<Name><![CDATA[p_originalCapacity_kW]]></Name>
 			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_hasProfileData]]></Name>
+			</Parameter>
 		</Parameters>
 		<ReplicationFlag>true</ReplicationFlag>
 		<Replication Class="CodeValue">
@@ -1141,6 +1144,9 @@
 			<Parameter>
 				<Name><![CDATA[p_parentNodeElectric]]></Name>
 			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_airco]]></Name>
+			</Parameter>
 		</Parameters>
 		<ReplicationFlag>true</ReplicationFlag>
 		<Replication Class="CodeValue">
@@ -2610,6 +2616,24 @@
 			<Parameter>
 				<Name><![CDATA[p_parentNodeElectric]]></Name>
 			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_isInitialCharger1]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_chargingProfileName1]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[chargingSessionSocket1]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[chargingSessionSocket2]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_chargerAsset]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_isChargingCentre]]></Name>
+			</Parameter>
 		</Parameters>
 		<ReplicationFlag>true</ReplicationFlag>
 		<Replication Class="CodeValue">
diff --git a/_alp/Agents/EnergyModel/Variables.xml b/_alp/Agents/EnergyModel/Variables.xml
index 289f3f5e..028d55a8 100644
--- a/_alp/Agents/EnergyModel/Variables.xml
+++ b/_alp/Agents/EnergyModel/Variables.xml
@@ -2765,4 +2765,22 @@
 			<ValueElementClass>String</ValueElementClass>
 		</Properties>
 	</Variable>
+	<Variable Class="CollectionVariable">
+		<Id>1749650197321</Id>
+		<Name><![CDATA[c_chargerProfiles]]></Name>
+		<X>-580</X>
+		<Y>220</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>List&lt;J_ChargingSession&gt;</ElementClass>
+			<ValueElementClass>String</ValueElementClass>
+		</Properties>
+	</Variable>
 </Variables>
diff --git a/_alp/Agents/GCHouse/Code/AdditionalClassCode.java b/_alp/Agents/GCHouse/Code/AdditionalClassCode.java
index 678be3fa..5667ec32 100644
--- a/_alp/Agents/GCHouse/Code/AdditionalClassCode.java
+++ b/_alp/Agents/GCHouse/Code/AdditionalClassCode.java
@@ -4,6 +4,12 @@ public void f_connectToJ_EA(J_EA j_ea){
 	f_connectTo_J_EA_House(j_ea);
 }
 
+@Override
+public void f_removeTheJ_EA(J_EA j_ea){
+	f_removeTheJ_EA_default(j_ea);
+	f_removeTheJ_EA_house(j_ea);
+}
+
 /*@Override
 public void f_operateFixedConsumptionAssets(){
 	f_operateFixedConsumptionAssets_overwrite();
diff --git a/_alp/Agents/GCHouse/Code/Functions.java b/_alp/Agents/GCHouse/Code/Functions.java
index e149f2b5..2a64a8d4 100644
--- a/_alp/Agents/GCHouse/Code/Functions.java
+++ b/_alp/Agents/GCHouse/Code/Functions.java
@@ -30,6 +30,7 @@
 }
 
 f_manageCookingTracker();
+f_manageAirco();
 
 if (p_BuildingThermalAsset != null && p_primaryHeatingAsset != null) {
 	p_primaryHeatingAsset.f_updateAllFlows(p_primaryHeatingAsset.v_powerFraction_fr);
@@ -76,6 +77,8 @@
 	v_batterySOC_fr = p_batteryAsset.getCurrentStateOfCharge();
 }
 */ 
+f_manageChargers();
+
 
 v_currentLoadLowPassed_kW += v_lowPassFactorLoad_fr * ( fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY) - v_currentLoadLowPassed_kW ); 
 
@@ -826,7 +829,10 @@ else if ( v_batterySOC_fr < 0.6 && v_currentPowerElectricity_kW < 1 && v_current
 	}
 	p_householdEV = (J_EAEV)j_ea;
 }
-
+if (j_ea instanceof J_EAAirco) {
+	p_airco = (J_EAAirco)j_ea;
+	c_electricHeatpumpAssets.add(j_ea);
+}
 /*ALCODEEND*/}
 
 double f_setAnnualEnergyDemand()
@@ -884,7 +890,7 @@ boolean f_calcCheapestHeatingPrice()
 	if (p_BuildingThermalAsset.getCurrentTemperature() < v_tempSetpoint_degC - p_heatingKickinTreshold_degC) {
 		double powerDemand_kW = v_hotwaterDemand_kW + (v_tempSetpoint_degC - p_BuildingThermalAsset.getCurrentTemperature()) * p_BuildingThermalAsset.getHeatCapacity_JpK() / 3.6e6;
 		p_primaryHeatingAsset.v_powerFraction_fr = min(1, powerDemand_kW / p_primaryHeatingAsset.getOutputCapacity_kW()  );
-		p_BuildingThermalAsset.v_powerFraction_fr = (  p_primaryHeatingAsset.v_powerFraction_fr * p_primaryHeatingAsset.getOutputCapacity_kW()  - v_hotwaterDemand_kW ) / p_BuildingThermalAsset.getCapacityHeat_kW();			
+		p_BuildingThermalAsset.v_powerFraction_fr = max(0, (p_primaryHeatingAsset.v_powerFraction_fr * p_primaryHeatingAsset.getOutputCapacity_kW()  - v_hotwaterDemand_kW) / p_BuildingThermalAsset.getCapacityHeat_kW() );			
 	}
 	else { // Just supply DHW
 		p_primaryHeatingAsset.v_powerFraction_fr = v_hotwaterDemand_kW / p_primaryHeatingAsset.getOutputCapacity_kW();
@@ -906,7 +912,7 @@ else if (p_primaryHeatingAsset instanceof J_EAConversionGasBurner && p_BuildingT
 	if (p_BuildingThermalAsset.getCurrentTemperature() < v_tempSetpoint_degC - p_heatingKickinTreshold_degC) {
 		double powerDemand_kW = v_hotwaterDemand_kW + (v_tempSetpoint_degC - p_BuildingThermalAsset.getCurrentTemperature()) * p_BuildingThermalAsset.getHeatCapacity_JpK() / 3.6e6;
 		p_primaryHeatingAsset.v_powerFraction_fr = min(1, powerDemand_kW / p_primaryHeatingAsset.getOutputCapacity_kW()  );
-		p_BuildingThermalAsset.v_powerFraction_fr = (  p_primaryHeatingAsset.v_powerFraction_fr * p_primaryHeatingAsset.getOutputCapacity_kW()  - v_hotwaterDemand_kW ) / p_BuildingThermalAsset.getCapacityHeat_kW();			
+		p_BuildingThermalAsset.v_powerFraction_fr = max(0, (  p_primaryHeatingAsset.v_powerFraction_fr * p_primaryHeatingAsset.getOutputCapacity_kW()  - v_hotwaterDemand_kW ) / p_BuildingThermalAsset.getCapacityHeat_kW());			
 	}
 	else { 
 		p_primaryHeatingAsset.v_powerFraction_fr = v_hotwaterDemand_kW / p_primaryHeatingAsset.getOutputCapacity_kW();
@@ -933,3 +939,57 @@ else if (p_primaryHeatingAsset instanceof J_EAConversionGasBurner && p_BuildingT
 }
 /*ALCODEEND*/}
 
+double f_manageAirco()
+{/*ALCODESTART::1749648447119*/
+if( p_airco != null ) {
+	if (p_airco.remainingONtimesteps == 0){
+		double switchOnProbability = 0;
+		switch (roundToInt(energyModel.v_currentAmbientTemperature_degC)) {
+			case 23:
+				switchOnProbability = 0.0025;
+				break;
+			case 24:
+				switchOnProbability = 0.005;
+				break;
+			case 25:
+				switchOnProbability = 0.008;
+				break;
+			case 26:
+				switchOnProbability = 0.01;
+				break;
+			case 27:
+				switchOnProbability = 0.012;
+				break;
+			case 28:
+				switchOnProbability = 0.014;
+				break;
+			case 29:
+				switchOnProbability = 0.016;
+				break;
+			case 30:
+				switchOnProbability = 0.018;
+				break;
+			case 31:
+				switchOnProbability = 0.02;
+				break;
+		}
+		if( randomTrue(switchOnProbability)){
+			int nbTimestepsOn = uniform_discr(4, 12);
+			p_airco.turnOnAirco( nbTimestepsOn );
+		}
+	}
+	p_airco.f_updateAllFlows( 1.0 );
+}
+/*ALCODEEND*/}
+
+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 87c3e755..9a605c5f 100644
--- a/_alp/Agents/GCHouse/Code/Functions.xml
+++ b/_alp/Agents/GCHouse/Code/Functions.xml
@@ -240,8 +240,8 @@
 		<ReturnType>double</ReturnType>
 		<Id>1693300820997</Id>
 		<Name><![CDATA[f_connectTo_J_EA_House]]></Name>
-		<X>1070</X>
-		<Y>130</Y>
+		<X>1140</X>
+		<Y>90</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -383,4 +383,40 @@
 		<ShowLabel>true</ShowLabel>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1749648447119</Id>
+		<Name><![CDATA[f_manageAirco]]></Name>
+		<X>1500</X>
+		<Y>850</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>1749722407831</Id>
+		<Name><![CDATA[f_removeTheJ_EA_house]]></Name>
+		<X>1140</X>
+		<Y>110</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[j_ea]]></Name>
+			<Type><![CDATA[J_EA]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
 </Functions>
diff --git a/_alp/Agents/GCHouse/Variables.xml b/_alp/Agents/GCHouse/Variables.xml
index 47bbace9..1f361f52 100644
--- a/_alp/Agents/GCHouse/Variables.xml
+++ b/_alp/Agents/GCHouse/Variables.xml
@@ -587,7 +587,7 @@
 		<Id>1717417303620</Id>
 		<Name><![CDATA[p_nageisoleerd]]></Name>
 		<X>250</X>
-		<Y>510</Y>
+		<Y>530</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -611,8 +611,8 @@
 	<Variable Class="Parameter">
 		<Id>1722350833847</Id>
 		<Name><![CDATA[p_eigenOprit]]></Name>
-		<X>440</X>
-		<Y>510</Y>
+		<X>250</X>
+		<Y>550</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -637,7 +637,7 @@
 		<Id>1726685123865</Id>
 		<Name><![CDATA[p_cookingMethod]]></Name>
 		<X>250</X>
-		<Y>460</Y>
+		<Y>510</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -661,4 +661,29 @@
 			</ParameterEditor>
 		</Properties>
 	</Variable>
+	<Variable Class="Parameter">
+		<Id>1749653249111</Id>
+		<Name><![CDATA[p_airco]]></Name>
+		<X>1510</X>
+		<Y>870</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_EAAirco]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<ParameterEditor>
+				<Id>1749653249109</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
 </Variables>
diff --git a/_alp/Agents/GCNeighborhood/Code/Functions.java b/_alp/Agents/GCNeighborhood/Code/Functions.java
index 65ffc109..0d9cc437 100644
--- a/_alp/Agents/GCNeighborhood/Code/Functions.java
+++ b/_alp/Agents/GCNeighborhood/Code/Functions.java
@@ -384,7 +384,7 @@ else if (j_ea.energyAssetType == OL_EnergyAssetType.WINDMILL) {
 	//energyModel.c_productionAssets.add((J_EAProduction)j_ea);
 	
 	if (j_ea.energyAssetType == OL_EnergyAssetType.PHOTOVOLTAIC) {
-		v_hasPV = true;
+		v_liveAssetsMetaData.hasPV = true;
 		v_liveAssetsMetaData.totalInstalledPVPower_kW += ((J_EAProduction)j_ea).getCapacityElectric_kW();
 		if ( p_parentNodeElectric != null ) {
 			p_parentNodeElectric.f_updateTotalInstalledProductionAssets(OL_EnergyAssetType.PHOTOVOLTAIC, ((J_EAProduction)j_ea).getCapacityElectric_kW(), true);
diff --git a/_alp/Agents/GCPublicCharger/Code/AdditionalClassCode.java b/_alp/Agents/GCPublicCharger/Code/AdditionalClassCode.java
index 634bdeff..6bf729bd 100644
--- a/_alp/Agents/GCPublicCharger/Code/AdditionalClassCode.java
+++ b/_alp/Agents/GCPublicCharger/Code/AdditionalClassCode.java
@@ -1,3 +1,4 @@
+
 /*@Override
 public void f_operateFixedAssets(){
 	f_operateFixedAssets_overwrite();
diff --git a/_alp/Agents/GCPublicCharger/Code/Functions.java b/_alp/Agents/GCPublicCharger/Code/Functions.java
index 07ec6fab..164e647b 100644
--- a/_alp/Agents/GCPublicCharger/Code/Functions.java
+++ b/_alp/Agents/GCPublicCharger/Code/Functions.java
@@ -20,5 +20,112 @@ else if( e.profileType == OL_ProfileAssetType.ELECTRICITYBASELOAD){
 {/*ALCODESTART::1726749088568*/
 //Manage charging
 f_manageCharging();
+
+f_manageChargers();
+
+/*ALCODEEND*/}
+
+double f_operateChargerNew()
+{/*ALCODESTART::1749648407069*/
+if( v_sessionIndex != -1){ //if we didnt reach the last session
+	f_manageChargingSessions(); //here we install a new charging session, but if end time of previous overlaps with start time of next there is a problem
+}
+
+double ratioOfCapacity = 0;
+double chargingPower = 0;
+v_shiftedLoadV1G_kW = 0;
+v_shiftedLoadV2G_kW = 0;
+
+if (chargingSessionSocket1 != null){
+	chargingPower += chargingSessionSocket1.operate();
+	v_shiftedLoadV1G_kW += chargingSessionSocket1.getShiftedLoadV1GCurrentTimestep();
+	v_shiftedLoadV2G_kW += chargingSessionSocket1.getShiftedLoadV2GCurrentTimestep();
+	if ( chargingSessionSocket1.timeStepsToDisconnect == 0 ){
+		//traceln("EndTime: " + (chargingSessionSocket1.endTime / 4.0) + ", current timestep: " + energyModel.t_h );
+		chargingSessionSocket1 = null;
+	}
+}
+
+if (chargingSessionSocket2 != null){
+	chargingPower += chargingSessionSocket2.operate();
+	v_shiftedLoadV1G_kW += chargingSessionSocket2.getShiftedLoadV1GCurrentTimestep();
+	v_shiftedLoadV2G_kW += chargingSessionSocket2.getShiftedLoadV2GCurrentTimestep();
+	if ( chargingSessionSocket2.timeStepsToDisconnect == 0 ){
+		chargingSessionSocket2 = null;
+	}
+}
+
+ratioOfCapacity = chargingPower / p_chargerAsset.capacityElectric_kW;
+if (!v_isActiveCharger){
+	ratioOfCapacity = 0;
+}
+
+p_chargerAsset.f_updateAllFlows( ratioOfCapacity );
+
+v_totalShiftedLoadV1G_kWh += v_shiftedLoadV1G_kW;
+v_totalShiftedLoadV2G_kWh += v_shiftedLoadV2G_kW;
+
+/*ALCODEEND*/}
+
+double f_manageChargingSessions()
+{/*ALCODESTART::1749648407072*/
+if( energyModel.t_h == v_nextSessionStartTime / 4.0){
+	int startIndex = Integer.parseInt(v_nextSessionInfo[0]);
+	int endIndex = Integer.parseInt(v_nextSessionInfo[1]);
+	double chargingDemand_kWh = Double.parseDouble(v_nextSessionInfo[2]);
+	double batteryCap_kWh = Double.parseDouble(v_nextSessionInfo[3]);
+	//
+	double chargingPower_kW = Double.parseDouble(v_nextSessionInfo[5]);
+	int socket = Integer.parseInt(v_nextSessionInfo[6]);
+	
+	if ( socket == 1){
+		if (chargingSessionSocket1 != null){
+			traceln("Error, new charging session but socket 1 is not empty, profile: " + p_chargingProfileName + ", startIndex: " + startIndex + ", existing session end index: " + chargingSessionSocket1.endTime);
+		}
+		chargingSessionSocket1 = new ChargingSession(startIndex, endIndex, chargingDemand_kWh, batteryCap_kWh, chargingPower_kW, socket, randomTrue(energyModel.v_V2GProbability), 0.25);
+		//traceln("new session created, start: " + startIndex + ", end: " +endIndex+ ", current timestep: " + energyModel.t_h * 4 + ", timeslots alive: " + chargingSessionSocket1.timeStepsToDisconnect );
+	}
+	else {
+		if (chargingSessionSocket2 != null){
+			traceln("Error, new charging session but socket 2 is not empty, profile: " + p_chargingProfileName + ", startIndex: " + startIndex + ", existing session end index: " + chargingSessionSocket2.endTime);
+		}
+		chargingSessionSocket2 = new ChargingSession(startIndex, endIndex, chargingDemand_kWh, batteryCap_kWh, chargingPower_kW, socket, randomTrue(energyModel.v_V2GProbability), 0.25);
+	}
+	
+	v_sessionIndex ++;
+	
+	
+	f_getNextSessionInfo();
+	if ( energyModel.t_h == v_nextSessionStartTime / 4.0 ){
+		//traceln("Multiple charging sessions starting at the same timestap in charging profile: " + p_chargingProfileName + " at time: " + v_nextSessionStartTime);
+		f_manageChargingSessions(); 
+	}
+	else if ( energyModel.t_h > v_nextSessionStartTime / 4.0){
+		traceln(" charging profile data incorrect, next charging session is in the past");
+	}
+	
+}
+
+
+/*ALCODEEND*/}
+
+double f_getNextSessionInfo()
+{/*ALCODESTART::1749648407074*/
+// example: 2/54/50.3/72.1/21.8/10.8/2
+
+String sessie = selectFirstValue(
+	"SELECT " + p_chargingProfileName + " FROM chargingsessions WHERE " + 
+		"session = ? LIMIT 1;",
+		v_sessionIndex);
+
+if( sessie != null){
+	v_nextSessionInfo = sessie.split("/"); 
+	v_nextSessionStartTime = Integer.parseInt(v_nextSessionInfo[0]);
+	//traceln("Profile " + p_chargingProfileName + " next start time: " + v_nextSessionInfo[0]);
+}
+else{
+	v_sessionIndex = -1;
+	//traceln( "No new charging session available in data for " + p_chargingProfileName +  ", current session index: " + v_sessionIndex);
+}
 /*ALCODEEND*/}
 
diff --git a/_alp/Agents/GCPublicCharger/Code/Functions.xml b/_alp/Agents/GCPublicCharger/Code/Functions.xml
index f42b4ad8..cf6c7e88 100644
--- a/_alp/Agents/GCPublicCharger/Code/Functions.xml
+++ b/_alp/Agents/GCPublicCharger/Code/Functions.xml
@@ -33,4 +33,55 @@
 		<ShowLabel>true</ShowLabel>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1749648407069</Id>
+		<Name><![CDATA[f_operateChargerNew]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>1950</X>
+		<Y>650</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="public" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1749648407072</Id>
+		<Name><![CDATA[f_manageChargingSessions]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>1960</X>
+		<Y>670</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="public" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1749648407074</Id>
+		<Name><![CDATA[f_getNextSessionInfo]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>1960</X>
+		<Y>690</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
 </Functions>
diff --git a/_alp/Agents/GCPublicCharger/Levels/Level.level.xml b/_alp/Agents/GCPublicCharger/Levels/Level.level.xml
index 8cf8ed5b..ca6bc6af 100644
--- a/_alp/Agents/GCPublicCharger/Levels/Level.level.xml
+++ b/_alp/Agents/GCPublicCharger/Levels/Level.level.xml
@@ -51,4 +51,30 @@
 		</Font>
 		<Alignment>LEFT</Alignment>
 	</Text>
+	<Rectangle>
+		<Id>1749648398363</Id>
+		<Name><![CDATA[rect_woonwijkOud]]></Name>
+		<X>1540</X>
+		<Y>470</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>-16777216</LineColor>
+		<LineMaterial>null</LineMaterial>
+		<LineStyle>SOLID</LineStyle>
+		<Width>370</Width>
+		<Height>290</Height>
+		<Rotation>0.0</Rotation>
+		<FillColor>-1</FillColor>
+		<FillMaterial>null</FillMaterial>
+	</Rectangle>
 </Presentation>
diff --git a/_alp/Agents/GCPublicCharger/Variables.xml b/_alp/Agents/GCPublicCharger/Variables.xml
index 18bc03de..b914c6c2 100644
--- a/_alp/Agents/GCPublicCharger/Variables.xml
+++ b/_alp/Agents/GCPublicCharger/Variables.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Variables>
 	<Variable Class="PlainVariable">
-		<Id>1718899895524</Id>
-		<Name><![CDATA[v_isActiveCharger]]></Name>
+		<Id>1720728863554</Id>
+		<Name><![CDATA[v_netBewustLadenActive]]></Name>
 		<X>270</X>
-		<Y>460</Y>
+		<Y>480</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -17,13 +17,37 @@
               AccessType="public"
               StaticVariable="false">
 			<Type><![CDATA[boolean]]></Type>
+			<InitialValue Class="CodeValue">
+				<Code><![CDATA[false]]></Code>
+			</InitialValue>
 		</Properties>
 	</Variable>
 	<Variable Class="PlainVariable">
-		<Id>1720728863554</Id>
-		<Name><![CDATA[v_netBewustLadenActive]]></Name>
-		<X>270</X>
-		<Y>480</Y>
+		<Id>1749648407076</Id>
+		<Name><![CDATA[v_isActiveCharger1]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>1950</X>
+		<Y>500</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true"
+              Constant="false"
+              AccessType="public"
+              StaticVariable="false">
+			<Type><![CDATA[boolean]]></Type>
+		</Properties>
+	</Variable>
+	<Variable Class="PlainVariable">
+		<Id>1749648407078</Id>
+		<Name><![CDATA[v_netBewustLadenActive1]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>1950</X>
+		<Y>520</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -41,6 +65,158 @@
 			</InitialValue>
 		</Properties>
 	</Variable>
+	<Variable Class="PlainVariable">
+		<Id>1749648407080</Id>
+		<Name><![CDATA[v_sessionIndex]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>1950</X>
+		<Y>720</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>1749648407082</Id>
+		<Name><![CDATA[v_nextSessionStartTime]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>1950</X>
+		<Y>740</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>1749648407084</Id>
+		<Name><![CDATA[v_v2gProbability]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>1950</X>
+		<Y>780</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true"
+              Constant="false"
+              AccessType="public"
+              StaticVariable="false">
+			<Type><![CDATA[double]]></Type>
+			<InitialValue Class="CodeValue">
+				<Code><![CDATA[0]]></Code>
+			</InitialValue>
+		</Properties>
+	</Variable>
+	<Variable Class="PlainVariable">
+		<Id>1749648407086</Id>
+		<Name><![CDATA[v_nextSessionInfo]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>1950</X>
+		<Y>760</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[String[]]]></Type>
+		</Properties>
+	</Variable>
+	<Variable Class="PlainVariable">
+		<Id>1749648407088</Id>
+		<Name><![CDATA[v_shiftedLoadV1G_kW]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>1950</X>
+		<Y>810</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true"
+              Constant="false"
+              AccessType="public"
+              StaticVariable="false">
+			<Type><![CDATA[double]]></Type>
+		</Properties>
+	</Variable>
+	<Variable Class="PlainVariable">
+		<Id>1749648407090</Id>
+		<Name><![CDATA[v_shiftedLoadV2G_kW]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>1950</X>
+		<Y>830</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true"
+              Constant="false"
+              AccessType="public"
+              StaticVariable="false">
+			<Type><![CDATA[double]]></Type>
+		</Properties>
+	</Variable>
+	<Variable Class="PlainVariable">
+		<Id>1749648407096</Id>
+		<Name><![CDATA[v_sessionIndexStored]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>2060</X>
+		<Y>720</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="Parameter">
 		<Id>1717959948784</Id>
 		<Name><![CDATA[p_gisregion]]></Name>
@@ -217,4 +393,159 @@
 			</ParameterEditor>
 		</Properties>
 	</Variable>
+	<Variable Class="Parameter">
+		<Id>1749648407099</Id>
+		<Name><![CDATA[p_isInitialCharger1]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>1950</X>
+		<Y>540</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[boolean]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<ParameterEditor>
+				<Id>1749648407097</Id>
+				<EditorContolType>CHECK_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
+	<Variable Class="Parameter">
+		<Id>1749648407102</Id>
+		<Name><![CDATA[p_chargingProfileName1]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>1950</X>
+		<Y>560</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>
+			<ParameterEditor>
+				<Id>1749648407100</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
+	<Variable Class="Parameter">
+		<Id>1749648407105</Id>
+		<Name><![CDATA[chargingSessionSocket1]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>1950</X>
+		<Y>600</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[ChargingSession]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<ParameterEditor>
+				<Id>1749648407103</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
+	<Variable Class="Parameter">
+		<Id>1749648407108</Id>
+		<Name><![CDATA[chargingSessionSocket2]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>1950</X>
+		<Y>620</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[ChargingSession]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<ParameterEditor>
+				<Id>1749648407106</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
+	<Variable Class="Parameter">
+		<Id>1749648407111</Id>
+		<Name><![CDATA[p_chargerAsset]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>1950</X>
+		<Y>580</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_EAPublicCharger]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<ParameterEditor>
+				<Id>1749648407109</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
+	<Variable Class="Parameter">
+		<Id>1750335661857</Id>
+		<Name><![CDATA[p_isChargingCentre]]></Name>
+		<X>270</X>
+		<Y>540</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[boolean]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<ParameterEditor>
+				<Id>1750335661855</Id>
+				<EditorContolType>CHECK_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
 </Variables>
diff --git a/_alp/Agents/GridConnection/Code/Functions.java b/_alp/Agents/GridConnection/Code/Functions.java
index 6e6e956c..035a1156 100644
--- a/_alp/Agents/GridConnection/Code/Functions.java
+++ b/_alp/Agents/GridConnection/Code/Functions.java
@@ -124,9 +124,11 @@ else if (j_ea instanceof J_EAConversionCurtailer || j_ea instanceof J_EAConversi
 double f_connectionMetering()
 {/*ALCODESTART::1660212665961*/
 if ( abs(fm_currentConsumptionFlows_kW.get(OL_EnergyCarriers.HEAT) - fm_currentProductionFlows_kW.get(OL_EnergyCarriers.HEAT)) > 0.1 && p_parentNodeHeat == null ) {
-	traceln((fm_currentConsumptionFlows_kW.get(OL_EnergyCarriers.HEAT) - fm_currentProductionFlows_kW.get(OL_EnergyCarriers.HEAT)));
-	traceln("Heat unbalance in gridConnection: " + p_gridConnectionID);
-	pauseSimulation();
+	if (p_BuildingThermalAsset == null || !p_BuildingThermalAsset.hasHeatBuffer()) {
+		traceln((fm_currentConsumptionFlows_kW.get(OL_EnergyCarriers.HEAT) - fm_currentProductionFlows_kW.get(OL_EnergyCarriers.HEAT)));
+		traceln("Heat unbalance in gridConnection: " + p_gridConnectionID);
+		pauseSimulation();
+	}
 }
 
 if (energyModel.v_isRapidRun){
@@ -1167,7 +1169,7 @@ else if (p_primaryHeatingAsset== null && p_secondaryHeatingAsset != null && v_ha
 	//energyModel.c_productionAssets.add((J_EAProduction)j_ea);
 	
 	if (j_ea.energyAssetType == OL_EnergyAssetType.PHOTOVOLTAIC) {
-		v_hasPV = true;
+		v_liveAssetsMetaData.hasPV = true;
 		double capacity_kW = ((J_EAProduction)j_ea).getCapacityElectric_kW();
 		v_liveAssetsMetaData.totalInstalledPVPower_kW += capacity_kW;
 		if ( p_parentNodeElectric != null ) {
@@ -1276,8 +1278,13 @@ else if (j_ea.energyAssetType == OL_EnergyAssetType.WINDMILL) {
 		}
 } else if (j_ea instanceof J_EADieselTractor) {
 	c_profileAssets.add((J_EAProfile)j_ea);
+} else if (j_ea instanceof J_EACharger) {
+	c_chargers.add((J_EACharger)j_ea);
+	c_EvAssets.add(j_ea);
 } else {
-	traceln("Unrecognized energy asset %s in gridconnection %s", j_ea, this);
+	if (!(this instanceof GCHouse && j_ea instanceof J_EAAirco)) {
+		traceln("Unrecognized energy asset %s in gridconnection %s", j_ea, this);
+	} 
 }
 
 /*ALCODEEND*/}
@@ -1531,7 +1538,7 @@ else if (j_ea.getEAType() == OL_EnergyAssetType.WINDMILL) {
 	if (j_ea.energyAssetType == OL_EnergyAssetType.PHOTOVOLTAIC) {
 		J_EAProduction otherPV = findFirst(c_productionAssets, x -> x.getEAType() == OL_EnergyAssetType.PHOTOVOLTAIC);
 		if (otherPV == null) {
-			v_hasPV = false;
+			v_liveAssetsMetaData.hasPV = false;
 		}
 		double capacity_kW = ((J_EAProduction)j_ea).getCapacityElectric_kW();
 		v_liveAssetsMetaData.totalInstalledPVPower_kW -= capacity_kW;
@@ -1602,6 +1609,9 @@ else if (j_ea.energyAssetType == OL_EnergyAssetType.WINDMILL) {
 } else if  (j_ea instanceof J_EAProfile) {
 	//p_energyProfile = null;
 	c_profileAssets.remove((J_EAProfile)j_ea);
+} else if (j_ea instanceof J_EACharger) {
+	c_chargers.remove(j_ea);
+	c_EvAssets.remove(j_ea);	
 } else {
 	traceln("Unrecognized energy asset %s in gridconnection %s", j_ea, this);
 }
@@ -2430,3 +2440,23 @@ else if (flowsMap.get(EC) > 0){
 */
 /*ALCODEEND*/}
 
+double f_manageChargers()
+{/*ALCODESTART::1750258434630*/
+if ( c_chargers.size() > 0 ) { // && v_isActiveCharger ) {
+	switch (p_chargingAttitudeVehicles) {			
+		case V1G:
+		case MAX_POWER:
+		case MAX_SPREAD:
+			c_chargers.forEach( x -> x.f_updateAllFlows(energyModel.t_h, true, false) );
+			break;
+		case V2G:
+			c_chargers.forEach( x -> x.f_updateAllFlows(energyModel.t_h, true, true) );
+			break;
+		case SIMPLE:
+		default:
+			c_chargers.forEach( x -> x.f_updateAllFlows(energyModel.t_h, false, false) );
+			break;
+	}
+}
+/*ALCODEEND*/}
+
diff --git a/_alp/Agents/GridConnection/Code/Functions.xml b/_alp/Agents/GridConnection/Code/Functions.xml
index d5cdb55a..38ffe642 100644
--- a/_alp/Agents/GridConnection/Code/Functions.xml
+++ b/_alp/Agents/GridConnection/Code/Functions.xml
@@ -43,7 +43,7 @@
 		<Id>1660212665961</Id>
 		<Name><![CDATA[f_connectionMetering]]></Name>
 		<X>910</X>
-		<Y>520</Y>
+		<Y>550</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -535,7 +535,7 @@
 		<Id>1720442672576</Id>
 		<Name><![CDATA[f_curtailment]]></Name>
 		<X>910</X>
-		<Y>500</Y>
+		<Y>530</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -641,7 +641,7 @@
 		<Id>1722518225504</Id>
 		<Name><![CDATA[f_fillLiveDataSets]]></Name>
 		<X>930</X>
-		<Y>540</Y>
+		<Y>570</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -657,7 +657,7 @@
 		<Id>1722518905501</Id>
 		<Name><![CDATA[f_rapidRunDataLogging]]></Name>
 		<X>930</X>
-		<Y>560</Y>
+		<Y>590</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -740,4 +740,20 @@
 		<ShowLabel>true</ShowLabel>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1750258434630</Id>
+		<Name><![CDATA[f_manageChargers]]></Name>
+		<X>920</X>
+		<Y>500</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
 </Functions>
diff --git a/_alp/Agents/GridConnection/Variables.xml b/_alp/Agents/GridConnection/Variables.xml
index 6a5c4c3c..7a913836 100644
--- a/_alp/Agents/GridConnection/Variables.xml
+++ b/_alp/Agents/GridConnection/Variables.xml
@@ -849,25 +849,6 @@
 			<Type><![CDATA[double]]></Type>
 		</Properties>
 	</Variable>
-	<Variable Class="PlainVariable">
-		<Id>1692972667627</Id>
-		<Name><![CDATA[v_hasPV]]></Name>
-		<X>270</X>
-		<Y>300</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Properties SaveInSnapshot="true"
-              Constant="false"
-              AccessType="public"
-              StaticVariable="false">
-			<Type><![CDATA[boolean]]></Type>
-		</Properties>
-	</Variable>
 	<Variable Class="PlainVariable">
 		<Id>1695824940090</Id>
 		<Name><![CDATA[v_WTRV2G_eurpkWh]]></Name>
@@ -2822,4 +2803,22 @@
 			<ValueElementClass>String</ValueElementClass>
 		</Properties>
 	</Variable>
+	<Variable Class="CollectionVariable">
+		<Id>1750258408126</Id>
+		<Name><![CDATA[c_chargers]]></Name>
+		<X>600</X>
+		<Y>431</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_EACharger</ElementClass>
+			<ValueElementClass>String</ValueElementClass>
+		</Properties>
+	</Variable>
 </Variables>
diff --git a/_alp/Agents/GridNode/AOC.GridNode.xml b/_alp/Agents/GridNode/AOC.GridNode.xml
index 2372ef2d..07712a60 100644
--- a/_alp/Agents/GridNode/AOC.GridNode.xml
+++ b/_alp/Agents/GridNode/AOC.GridNode.xml
@@ -112,7 +112,7 @@ if (p_energyType.equals(OL_EnergyCarriers.HEAT)) {
 		<DataSet>
 			<Id>1705919330576</Id>
 			<Name><![CDATA[data_liveLoad_kW]]></Name>
-			<X>40</X>
+			<X>50</X>
 			<Y>850</Y>
 			<Label>
 				<X>15</X>
@@ -140,7 +140,7 @@ if (p_energyType.equals(OL_EnergyCarriers.HEAT)) {
 		<DataSet>
 			<Id>1712668669449</Id>
 			<Name><![CDATA[data_liveCapacityDemand_kW]]></Name>
-			<X>40</X>
+			<X>50</X>
 			<Y>890</Y>
 			<Label>
 				<X>15</X>
@@ -168,7 +168,7 @@ if (p_energyType.equals(OL_EnergyCarriers.HEAT)) {
 		<DataSet>
 			<Id>1712673776914</Id>
 			<Name><![CDATA[data_liveCapacitySupply_kW]]></Name>
-			<X>40</X>
+			<X>50</X>
 			<Y>870</Y>
 			<Label>
 				<X>15</X>
@@ -196,7 +196,7 @@ if (p_energyType.equals(OL_EnergyCarriers.HEAT)) {
 		<DataSet>
 			<Id>1715167370828</Id>
 			<Name><![CDATA[data_totalLoad_kW]]></Name>
-			<X>40</X>
+			<X>50</X>
 			<Y>920</Y>
 			<Label>
 				<X>15</X>
@@ -222,7 +222,7 @@ if (p_energyType.equals(OL_EnergyCarriers.HEAT)) {
 		<DataSet>
 			<Id>1715167392629</Id>
 			<Name><![CDATA[data_summerWeekLoad_kW]]></Name>
-			<X>40</X>
+			<X>50</X>
 			<Y>940</Y>
 			<Label>
 				<X>15</X>
@@ -248,7 +248,7 @@ if (p_energyType.equals(OL_EnergyCarriers.HEAT)) {
 		<DataSet>
 			<Id>1715167408643</Id>
 			<Name><![CDATA[data_winterWeekLoad_kW]]></Name>
-			<X>40</X>
+			<X>50</X>
 			<Y>960</Y>
 			<Label>
 				<X>15</X>
diff --git a/_alp/Agents/GridNode/Levels/Level.level.xml b/_alp/Agents/GridNode/Levels/Level.level.xml
index 946da032..0b6ee2d2 100644
--- a/_alp/Agents/GridNode/Levels/Level.level.xml
+++ b/_alp/Agents/GridNode/Levels/Level.level.xml
@@ -218,7 +218,7 @@
 		<Id>1670317065284</Id>
 		<Name><![CDATA[line2]]></Name>
 		<X>50</X>
-		<Y>470</Y>
+		<Y>520</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -246,7 +246,7 @@
 		<Id>1670317065286</Id>
 		<Name><![CDATA[text2]]></Name>
 		<X>80</X>
-		<Y>450</Y>
+		<Y>500</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
diff --git a/_alp/Agents/GridNode/Variables.xml b/_alp/Agents/GridNode/Variables.xml
index 0c517fe4..c3ba996c 100644
--- a/_alp/Agents/GridNode/Variables.xml
+++ b/_alp/Agents/GridNode/Variables.xml
@@ -4,7 +4,7 @@
 		<Id>1665061187538</Id>
 		<Name><![CDATA[v_congested]]></Name>
 		<X>50</X>
-		<Y>650</Y>
+		<Y>640</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -26,7 +26,7 @@
 		<Id>1666594510176</Id>
 		<Name><![CDATA[v_congestionMode]]></Name>
 		<X>50</X>
-		<Y>670</Y>
+		<Y>660</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -148,7 +148,7 @@ geupdate vanuit
 		<Id>1668600984923</Id>
 		<Name><![CDATA[v_currentLoadElectricityLowPassed_kW]]></Name>
 		<X>50</X>
-		<Y>591</Y>
+		<Y>581</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -170,7 +170,7 @@ geupdate vanuit
 		<Id>1668603168061</Id>
 		<Name><![CDATA[v_lowPassFactor_fr]]></Name>
 		<X>50</X>
-		<Y>571</Y>
+		<Y>561</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -308,7 +308,7 @@ geupdate vanuit
 		<Id>1675683578599</Id>
 		<Name><![CDATA[v_currentCongestionPrice_eurpkWh]]></Name>
 		<X>50</X>
-		<Y>690</Y>
+		<Y>680</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -327,7 +327,7 @@ geupdate vanuit
 		<Id>1689233711411</Id>
 		<Name><![CDATA[v_filteredLoadCongestionPricing_kW]]></Name>
 		<X>50</X>
-		<Y>730</Y>
+		<Y>720</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -346,7 +346,7 @@ geupdate vanuit
 		<Id>1689234315318</Id>
 		<Name><![CDATA[v_lowPassFactorCongestionPricing_fr]]></Name>
 		<X>50</X>
-		<Y>710</Y>
+		<Y>700</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -697,7 +697,7 @@ geupdate vanuit
 	<Variable Class="PlainVariable">
 		<Id>1718111623480</Id>
 		<Name><![CDATA[data_netbelastingDuurkromme_kW]]></Name>
-		<X>37</X>
+		<X>47</X>
 		<Y>1010</Y>
 		<Label>
 			<X>10</X>
@@ -716,7 +716,7 @@ geupdate vanuit
 	<Variable Class="PlainVariable">
 		<Id>1718111623645</Id>
 		<Name><![CDATA[data_netbelastingDuurkrommeVorige_kW]]></Name>
-		<X>37</X>
+		<X>47</X>
 		<Y>1030</Y>
 		<Label>
 			<X>10</X>
@@ -735,7 +735,7 @@ geupdate vanuit
 	<Variable Class="PlainVariable">
 		<Id>1718111623647</Id>
 		<Name><![CDATA[data_summerWeekNetbelastingDuurkromme_kW]]></Name>
-		<X>37</X>
+		<X>47</X>
 		<Y>1050</Y>
 		<Label>
 			<X>10</X>
@@ -754,7 +754,7 @@ geupdate vanuit
 	<Variable Class="PlainVariable">
 		<Id>1718111623649</Id>
 		<Name><![CDATA[data_winterWeekNetbelastingDuurkromme_kW]]></Name>
-		<X>37</X>
+		<X>47</X>
 		<Y>1070</Y>
 		<Label>
 			<X>10</X>
@@ -773,7 +773,7 @@ geupdate vanuit
 	<Variable Class="PlainVariable">
 		<Id>1718111623651</Id>
 		<Name><![CDATA[data_daytimeNetbelastingDuurkromme_kW]]></Name>
-		<X>37</X>
+		<X>47</X>
 		<Y>1090</Y>
 		<Label>
 			<X>10</X>
@@ -792,7 +792,7 @@ geupdate vanuit
 	<Variable Class="PlainVariable">
 		<Id>1718111623653</Id>
 		<Name><![CDATA[data_nighttimeNetbelastingDuurkromme_kW]]></Name>
-		<X>37</X>
+		<X>47</X>
 		<Y>1110</Y>
 		<Label>
 			<X>10</X>
@@ -811,7 +811,7 @@ geupdate vanuit
 	<Variable Class="PlainVariable">
 		<Id>1718111623655</Id>
 		<Name><![CDATA[data_weekdayNetbelastingDuurkromme_kW]]></Name>
-		<X>37</X>
+		<X>47</X>
 		<Y>1130</Y>
 		<Label>
 			<X>10</X>
@@ -830,7 +830,7 @@ geupdate vanuit
 	<Variable Class="PlainVariable">
 		<Id>1718111623657</Id>
 		<Name><![CDATA[data_weekendNetbelastingDuurkromme_kW]]></Name>
-		<X>37</X>
+		<X>47</X>
 		<Y>1150</Y>
 		<Label>
 			<X>10</X>
@@ -872,7 +872,7 @@ geupdate vanuit
 		<Id>1718895936296</Id>
 		<Name><![CDATA[v_currentLocalNodalPrice_eurpkWh]]></Name>
 		<X>50</X>
-		<Y>780</Y>
+		<Y>770</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -891,7 +891,7 @@ geupdate vanuit
 		<Id>1718895937973</Id>
 		<Name><![CDATA[v_currentTotalNodalPrice_eurpkWh]]></Name>
 		<X>50</X>
-		<Y>800</Y>
+		<Y>790</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -911,7 +911,7 @@ geupdate vanuit
 		<Name><![CDATA[v_currentParentNodalPrice_eurpkWh]]></Name>
 		<Description><![CDATA[Given a default value for 'top' agents, this can be seen as average market price of electricity.]]></Description>
 		<X>50</X>
-		<Y>760</Y>
+		<Y>750</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1022,7 +1022,7 @@ geupdate vanuit
 		<Id>1722498291003</Id>
 		<Name><![CDATA[v_currentDLRCapacity_kW]]></Name>
 		<X>50</X>
-		<Y>620</Y>
+		<Y>610</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1044,7 +1044,7 @@ geupdate vanuit
 		<Id>1730975924463</Id>
 		<Name><![CDATA[v_currentLoad_kW]]></Name>
 		<X>50</X>
-		<Y>520</Y>
+		<Y>530</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1911,6 +1911,34 @@ geupdate vanuit
 			</ParameterEditor>
 		</Properties>
 	</Variable>
+	<Variable Class="Parameter">
+		<Id>1749630347422</Id>
+		<Name><![CDATA[p_hasProfileData]]></Name>
+		<X>50</X>
+		<Y>470</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[boolean]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<DefaultValue Class="CodeValue">
+				<Code><![CDATA[false]]></Code>
+			</DefaultValue>
+			<ParameterEditor>
+				<Id>1749630347420</Id>
+				<EditorContolType>CHECK_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
 	<Variable Class="CollectionVariable">
 		<Id>1664536960213</Id>
 		<Name><![CDATA[c_connectedEnergyAssets]]></Name>
diff --git a/_alp/Classes/Class.J_AVGC_data.java b/_alp/Classes/Class.J_AVGC_data.java
index 1d6a6d90..3cf2a4c5 100644
--- a/_alp/Classes/Class.J_AVGC_data.java
+++ b/_alp/Classes/Class.J_AVGC_data.java
@@ -59,6 +59,9 @@ public class J_AVGC_data implements Serializable {
 	public double p_avgOutputTemperatureCHP_degC;
 	public double p_avgEfficiencyDistrictHeatingDeliverySet_fr;
 	public double p_avgOutputTemperatureDistrictHeatingDeliverySet_degC;
+	public double p_v1gProbability;
+	public double p_v2gProbability;
+	public int p_avgEVsPerPublicCharger;
 	/**
      * Default constructor
      */
diff --git a/_alp/Classes/Class.J_AssetsMetaData.java b/_alp/Classes/Class.J_AssetsMetaData.java
index 3cd4c67b..2401cdf9 100644
--- a/_alp/Classes/Class.J_AssetsMetaData.java
+++ b/_alp/Classes/Class.J_AssetsMetaData.java
@@ -23,6 +23,7 @@ public class J_AssetsMetaData {
 	public Double totalInstalledWindPower_kW = 0.0;
 	public Double totalInstalledBatteryStorageCapacity_MWh = 0.0;
 	
+	public Double initialPV_kW = 0.0;
 	public Double PVPotential_kW = 0.0;
 	public Double windPotential_kW = 0.0;
 	
@@ -143,6 +144,7 @@ public String toString() {
 		return "totalInstalledPVPower_kW: " + totalInstalledPVPower_kW + 
 				", totalInstalledWindPower_kW: " + totalInstalledWindPower_kW + 
 	            ", totalInstalledBatteryStorageCapacity_MWh: " + totalInstalledBatteryStorageCapacity_MWh + 
+	            ", hasPV: " + hasPV +
 	            ", hasElectricHeating: " + hasElectricHeating + 
 	            ", hasElectricTransport: " + hasElectricTransport + 
 	            ", hasWindturbine: " + hasWindturbine +
diff --git a/_alp/Classes/Class.J_ChargingSession.java b/_alp/Classes/Class.J_ChargingSession.java
new file mode 100644
index 00000000..e5f26698
--- /dev/null
+++ b/_alp/Classes/Class.J_ChargingSession.java
@@ -0,0 +1,140 @@
+/**
+ * J_ChargingSession
+ */	
+public class J_ChargingSession implements Serializable {
+
+	int startTime;
+	int endTime;
+	double chargingDemand_kWh;
+	double batterySize_kWh;
+	double stateOfCharge_kWh;
+	double chargingPower_kW;
+	int socket;
+	double timeStep_hr;
+	
+	boolean V1GCapable;
+	boolean V2GCapable;
+	int availableStepsForV2G;
+	int availableStepsForV1G;
+	int timeStepsToDisconnect;
+	int openTimeSlots;
+	int V2GRemainingTimesteps = 0;
+	int V1GRemainingTimesteps = 0;
+	double currentPower;
+	
+	double shiftedLoadV1GThisTimestep;
+	double shiftedLoadV2GThisTimestep;
+
+	
+    /**
+     * Default constructor
+     */
+    public J_ChargingSession(int startTime_quaterhours, int endTime_quaterhours, double chargingDemand_kWh, double batterySize_kWh, double chargingPower_kW, int socket, double timeStep_hr) {
+    
+    	this.startTime = startTime_quaterhours;
+    	this.endTime = endTime_quaterhours;
+    	this.chargingDemand_kWh = chargingDemand_kWh;
+    	this.batterySize_kWh = batterySize_kWh;
+    	stateOfCharge_kWh = batterySize_kWh - chargingDemand_kWh;
+    	this.chargingPower_kW = chargingPower_kW; 
+    	this.socket = socket;
+    	timeStepsToDisconnect = endTime - startTime;
+    	openTimeSlots = timeStepsToDisconnect - ((int)Math.ceil(4 * chargingDemand_kWh / chargingPower_kW)) ; 
+    	this.timeStep_hr = timeStep_hr;
+    }
+    
+    public double operate(boolean doV1G, boolean doV2G) {
+    	this.V1GCapable = doV1G;
+    	this.V2GCapable = doV2G;
+    	timeStepsToDisconnect --;
+    	openTimeSlots --;
+    	double power = determineChargingPower();
+    	setSmartChargingAvailabilities();
+    	currentPower = power;
+    	stateOfCharge_kWh += power * timeStep_hr;
+    	return currentPower;
+    }
+    
+    public double determineChargingPower(){
+    	double power;
+    	if (V2GRemainingTimesteps > 0) {
+    		power = - chargingPower_kW;
+    		shiftedLoadV2GThisTimestep = 2 * power;
+    		V2GRemainingTimesteps--;
+    		//if you are doing V2G this timestep you reduce your opentimeslots by 2
+    		openTimeSlots --;
+    		openTimeSlots --;
+    	}
+    	else if( V1GRemainingTimesteps > 0){
+    		power = 0;
+    		shiftedLoadV1GThisTimestep = power;
+    		V1GRemainingTimesteps--;
+    		//if you are doing V1G this timestep you reduce your opentimeslots by 1
+    		openTimeSlots --;
+    	}
+    	else if (batterySize_kWh > stateOfCharge_kWh) {
+    		power = chargingPower_kW;
+    		shiftedLoadV1GThisTimestep = 0;
+    		shiftedLoadV2GThisTimestep = 0;
+    	}
+    	else {
+    		power = 0;
+    		shiftedLoadV1GThisTimestep = 0;
+    		shiftedLoadV2GThisTimestep =0;
+    	}
+    	return power;
+    }
+    
+    public void setSmartChargingAvailabilities() {
+    	//determine if the vehicle if this session is available for V2G and V1G next timestep
+    	if( openTimeSlots > 3 && V2GCapable && (stateOfCharge_kWh > (0.2 * batterySize_kWh + 0.5 * chargingPower_kW )) ) { //you need at least 4 timesteps for V2G (a minimum for 2 timestep V2G sessions were defined)
+    		availableStepsForV2G = (int) Math.floor(openTimeSlots / 2);
+    	}
+    	else {
+    		availableStepsForV2G = 0;
+    	}
+    	
+    	if (openTimeSlots > 1 && (stateOfCharge_kWh < batterySize_kWh)) {
+    		availableStepsForV1G = openTimeSlots;
+    	}
+    	else {
+    		availableStepsForV1G = 0;
+    	}
+    }
+    
+    public void requestV2G(int timeStepsV2G) {
+    	if( V2GRemainingTimesteps != 0 || V1GRemainingTimesteps != 0) {
+    		traceln( "ERROR TRYING TO SET CHARGING SESSION TO V2G, BUT IS ALREADY IN A V1G or V2G SESSION");
+    	}
+    	V2GRemainingTimesteps = timeStepsV2G;
+    	
+    }
+    
+    public void requestV1G(int timeStepsV1G) {
+    	if( V2GRemainingTimesteps != 0 || V1GRemainingTimesteps != 0) {
+    		traceln( "ERROR TRYING TO SET CHARGING SESSION TO V1G, BUT IS ALREADY IN A V1G or V2G SESSION");
+    	}
+    	V1GRemainingTimesteps = timeStepsV1G;
+    }
+    
+    public double getShiftedLoadV1GCurrentTimestep() {
+    	return shiftedLoadV1GThisTimestep;
+    }
+    
+    public double getShiftedLoadV2GCurrentTimestep() {
+    	return shiftedLoadV2GThisTimestep;
+    }
+
+    
+	@Override
+	public String toString() {
+		return "Power: " + currentPower + "kW, start: " + startTime + ", end: " + endTime + ", Pmax: " + chargingPower_kW +"kW, demand: " + chargingDemand_kWh + "kWh";
+	}
+
+	/**
+	 * This number is here for model snapshot storing purpose<br>
+	 * It needs to be changed when this class gets changed
+	 */ 
+	private static final long serialVersionUID = 1L;
+
+}
\ No newline at end of file
diff --git a/_alp/Classes/Class.J_EA.java b/_alp/Classes/Class.J_EA.java
index 13eed8a7..fd64a68f 100644
--- a/_alp/Classes/Class.J_EA.java
+++ b/_alp/Classes/Class.J_EA.java
@@ -21,6 +21,8 @@ abstract public class J_EA implements Cloneable {
 	 protected double energyUsedStored_kWh = 0.0;
   	 protected double timestep_h;
  
+  	 protected boolean isRemoved = false;
+  	 
   	 // Are these needed?
 	 protected double heatProduced_kWh = 0.0;
 	 protected double heatConsumed_kWh = 0.0;
@@ -59,7 +61,18 @@ else if (parentAgent instanceof GridNode) {
     	}
     }
     
+    public void reRegisterEnergyAsset() {
+    	if (!this.isRemoved) {
+    		throw new RuntimeException("Can not register energy asset that was not removed.");
+    	}
+    	else {
+    		this.isRemoved = false;
+    		this.registerEnergyAsset();
+    	}
+    }
+    
     public void removeEnergyAsset() {
+    	this.isRemoved = true;
     	if ( parentAgent instanceof GridConnection) {
     		((GridConnection)parentAgent).f_removeTheJ_EA(this);
     	} else {    		
diff --git a/_alp/Classes/Class.J_EAAirco.java b/_alp/Classes/Class.J_EAAirco.java
new file mode 100644
index 00000000..68df251d
--- /dev/null
+++ b/_alp/Classes/Class.J_EAAirco.java
@@ -0,0 +1,46 @@
+/**
+ * Airco
+ */	
+public class J_EAAirco extends zero_engine.J_EA implements Serializable {
+	
+	double capacityElectric_kW;
+	int remainingONtimesteps = 0;
+    /**
+     * Default constructor
+     */
+    public J_EAAirco(Agent parentAgent, double capacityElectric_kW, double timestep_h) {
+    	this.parentAgent = parentAgent;
+    	this.capacityElectric_kW = capacityElectric_kW;
+    	this.timestep_h = timestep_h;	
+		this.activeConsumptionEnergyCarriers.add(OL_EnergyCarriers.ELECTRICITY);
+		this.registerEnergyAsset();
+    }
+    
+    
+	@Override
+    public void operate(double ratioOfCapacity) {
+		if( remainingONtimesteps > 0) {
+			this.remainingONtimesteps--;
+			double electricityConsumption_kW = ratioOfCapacity * this.capacityElectric_kW;
+			this.energyUse_kW = electricityConsumption_kW;
+			this.energyUsed_kWh += this.energyUse_kW * this.timestep_h;
+			this.flowsMap.put(OL_EnergyCarriers.ELECTRICITY, electricityConsumption_kW);
+		}
+	}
+
+	public void turnOnAirco(int nbTimesteps) {
+		this.remainingONtimesteps = nbTimesteps;
+	}
+
+	@Override
+	public String toString() {
+		return super.toString();
+	}
+
+	/**
+	 * This number is here for model snapshot storing purpose<br>
+	 * It needs to be changed when this class gets changed
+	 */ 
+	private static final long serialVersionUID = 1L;
+
+}
\ No newline at end of file
diff --git a/_alp/Classes/Class.J_EABuilding.java b/_alp/Classes/Class.J_EABuilding.java
index d5cfe766..c4c8009a 100644
--- a/_alp/Classes/Class.J_EABuilding.java
+++ b/_alp/Classes/Class.J_EABuilding.java
@@ -343,6 +343,14 @@ public double getRemainingHeatBufferHeat_kWh() {
     	return remainingHeatBufferHeat_kWh;
     }
     
+    public boolean hasHeatBuffer() {
+    	if (this.exteriorDelayTime_h != 0 || this.interiorDelayTime_h != 0) {
+    		return true;
+    	}
+    	else {
+    		return false;
+    	}
+    }
 	/**
 	 * This number is here for model snapshot storing purpose<br>
 	 * It needs to be changed when this class gets changed
diff --git a/_alp/Classes/Class.J_EACharger.java b/_alp/Classes/Class.J_EACharger.java
new file mode 100644
index 00000000..c23a9d89
--- /dev/null
+++ b/_alp/Classes/Class.J_EACharger.java
@@ -0,0 +1,185 @@
+/**
+ * J_EACharger
+ */	
+public class J_EACharger extends zero_engine.J_EA implements Serializable {
+		public double discharged_kWh;
+		public double charged_kWh;
+		public double capacityElectric_kW;
+		public List<J_ChargingSession> chargerProfile;
+		public boolean V1GCapable;
+		public boolean V2GCapable;
+		
+		private int currentChargingSessionIndexSocket1;
+		private J_ChargingSession currentChargingSessionSocket1;
+		private int currentChargingSessionIndexSocket2;
+		private J_ChargingSession currentChargingSessionSocket2;
+		
+		private double totalShiftedLoadV1G_kWh;
+		private double totalShiftedLoadV2G_kWh;
+		
+		
+		private double dischargedStored_kWh;
+		private double chargedStored_kWh;
+		private int currentChargingSessionIndexSocket1Stored;
+		private int currentChargingSessionIndexSocket2Stored;
+		private double totalShiftedLoadV1GStored_kWh;
+		private double totalShiftedLoadV2GStored_kWh;
+		
+	    /**
+	     * Default constructor
+	     */
+	    public J_EACharger(Agent parentAgent, double electricCapacity_kW, double timestep_h, List<J_ChargingSession> chargerProfile, boolean V1GCapable, boolean V2GCapable) {
+	    	this.parentAgent = parentAgent;
+	    	this.capacityElectric_kW = electricCapacity_kW;
+	    	this.timestep_h = timestep_h;
+	    	this.chargerProfile = chargerProfile;
+		    this.V1GCapable = V1GCapable;
+		    this.V2GCapable = V2GCapable;
+	    	this.activeProductionEnergyCarriers.add(OL_EnergyCarriers.ELECTRICITY);		
+			this.activeConsumptionEnergyCarriers.add(OL_EnergyCarriers.ELECTRICITY);
+			this.registerEnergyAsset();
+	    }
+	    
+	    
+	    public void f_updateAllFlows( double t_h, boolean doV1G, boolean doV2G) {
+	    	// Powerfraction is calculated below, argument is the current time (energyModel.t_h)
+	    	
+	    	// Check if the charger is capable of smart charging
+	    	doV1G = doV1G && this.V1GCapable;
+	    	doV2G = doV2G && this.V2GCapable;
+	    	
+	    	// Update the J_ChargingSessions of the sockets
+			this.manageSocket1();
+			this.manageSocket2();
+	    	
+			// Calculate the power output of the sockets
+			double power_kW = 0.0;
+			int currentTimeInQuarterHours = roundToInt(t_h * 4);
+			if ( currentTimeInQuarterHours >= this.currentChargingSessionSocket1.startTime && currentTimeInQuarterHours < this.currentChargingSessionSocket1.endTime ) {
+				power_kW += this.operateChargerSocket1(doV1G, doV2G);
+			}
+			if ( currentTimeInQuarterHours >= this.currentChargingSessionSocket2.startTime && currentTimeInQuarterHours < this.currentChargingSessionSocket2.endTime ) {
+				power_kW += this.operateChargerSocket2(doV1G, doV2G);
+			}
+			
+			double powerFraction_fr = power_kW / this.capacityElectric_kW;
+			
+			// Call the regular J_EA updateAllFlows and operate
+			super.f_updateAllFlows( powerFraction_fr );
+	    	return;
+	    }
+	    
+	    
+		@Override
+	    public void operate(double ratioOfCapacity) {			
+			double charge_kW = ratioOfCapacity * capacityElectric_kW;
+	    	
+			double electricityProduction_kW = max(-charge_kW, 0);
+			double electricityConsumption_kW = max(charge_kW, 0);
+			
+			discharged_kWh += electricityProduction_kW * timestep_h;
+			charged_kWh += electricityConsumption_kW * timestep_h;
+			
+	    	energyUse_kW = electricityConsumption_kW - electricityProduction_kW;
+	    	energyUsed_kWh += energyUse_kW * timestep_h;
+	    	
+			flowsMap.put(OL_EnergyCarriers.ELECTRICITY, electricityConsumption_kW - electricityProduction_kW);	
+	   	}
+		
+		private void manageSocket1() {
+			if ( this.currentChargingSessionSocket1 == null ) { // || energyModel.t_h >= v_currentChargingSessionSocket1.endTime / 4.0) {
+				 // check if we are not already past the last charging session
+				if (this.currentChargingSessionIndexSocket1 >= this.chargerProfile.size()) {
+					//v_currentChargingSessionSocket1 = null;
+					return;
+				}
+				while (this.chargerProfile.get(this.currentChargingSessionIndexSocket1).socket != 1) {
+					this.currentChargingSessionIndexSocket1++;
+					if (this.currentChargingSessionIndexSocket1 >= this.chargerProfile.size()) {
+						return;
+					}
+				}
+				this.currentChargingSessionSocket1 = this.chargerProfile.get(this.currentChargingSessionIndexSocket1);
+				this.currentChargingSessionIndexSocket1++;
+			}
+		}
+		
+		private void manageSocket2() {		
+			if ( this.currentChargingSessionSocket2 == null ) {
+				 // check if we are not already past the last charging session
+				if (this.currentChargingSessionIndexSocket2 >= this.chargerProfile.size()) {
+					return;
+				}
+				while (this.chargerProfile.get(this.currentChargingSessionIndexSocket2).socket != 2) {
+					this.currentChargingSessionIndexSocket2++;
+					if (this.currentChargingSessionIndexSocket2 >= this.chargerProfile.size()) {
+						return;
+					}
+				}
+				this.currentChargingSessionSocket2 = this.chargerProfile.get(this.currentChargingSessionIndexSocket2);
+				this.currentChargingSessionIndexSocket2++;
+			}
+		}
+
+		private double operateChargerSocket1(boolean doV1G, boolean doV2G) {
+			double chargingPower_kW = this.currentChargingSessionSocket1.operate( doV1G, doV2G );
+			this.totalShiftedLoadV1G_kWh += this.currentChargingSessionSocket1.getShiftedLoadV1GCurrentTimestep();
+			this.totalShiftedLoadV2G_kWh += this.currentChargingSessionSocket1.getShiftedLoadV2GCurrentTimestep();
+			if ( this.currentChargingSessionSocket1.timeStepsToDisconnect == 0 ){
+				this.currentChargingSessionSocket1 = null;
+			}
+			return chargingPower_kW;
+		}
+		
+		private double operateChargerSocket2(boolean doV1G, boolean doV2G) {
+			double chargingPower_kW = this.currentChargingSessionSocket2.operate( doV1G, doV2G );
+			this.totalShiftedLoadV1G_kWh += this.currentChargingSessionSocket2.getShiftedLoadV1GCurrentTimestep();
+			this.totalShiftedLoadV2G_kWh += this.currentChargingSessionSocket2.getShiftedLoadV2GCurrentTimestep();
+			if ( this.currentChargingSessionSocket2.timeStepsToDisconnect == 0 ){
+				this.currentChargingSessionSocket2 = null;
+			}
+			return chargingPower_kW;
+		}
+		
+		@Override
+		public void storeStatesAndReset() {
+	    	energyUsedStored_kWh = energyUsed_kWh;
+	    	energyUsed_kWh = 0.0;
+			dischargedStored_kWh = discharged_kWh;
+			discharged_kWh = 0.0;
+			chargedStored_kWh = charged_kWh;
+			charged_kWh = 0.0;
+			currentChargingSessionIndexSocket1Stored = currentChargingSessionIndexSocket1;
+			currentChargingSessionIndexSocket1 = 0;
+			currentChargingSessionIndexSocket2Stored = currentChargingSessionIndexSocket2;
+			currentChargingSessionIndexSocket2 = 0;
+			totalShiftedLoadV1GStored_kWh = totalShiftedLoadV1G_kWh;
+			totalShiftedLoadV1G_kWh = 0.0;
+			totalShiftedLoadV2GStored_kWh = totalShiftedLoadV2G_kWh;
+			totalShiftedLoadV2G_kWh = 0.0;
+	    	clear();
+		}
+		
+		@Override
+		public void restoreStates() {
+	    	energyUsed_kWh = energyUsedStored_kWh;
+			discharged_kWh = dischargedStored_kWh;
+			charged_kWh = chargedStored_kWh;
+			currentChargingSessionIndexSocket1 = currentChargingSessionIndexSocket1Stored;
+			currentChargingSessionIndexSocket2 = currentChargingSessionIndexSocket2Stored;
+			totalShiftedLoadV1G_kWh = totalShiftedLoadV1GStored_kWh;
+			totalShiftedLoadV2G_kWh = totalShiftedLoadV2GStored_kWh;
+		}
+		
+		@Override
+		public String toString() {
+			return "Power: " + getLastFlows().get(OL_EnergyCarriers.ELECTRICITY) + " kW, capacity: " + capacityElectric_kW + " kW" ;
+		}
+
+		/**
+		 * This number is here for model snapshot storing purpose<br>
+		 * It needs to be changed when this class gets changed
+		 */ 
+		private static final long serialVersionUID = 1L;
+
+}
diff --git a/_alp/Classes/Class.J_EAConsumption.java b/_alp/Classes/Class.J_EAConsumption.java
index 985ca830..0720dfb5 100644
--- a/_alp/Classes/Class.J_EAConsumption.java
+++ b/_alp/Classes/Class.J_EAConsumption.java
@@ -104,6 +104,10 @@ public Pair<J_FlowsMap, Double> curtailElectricityConsumption(double curtailment
     	return new Pair(flowsMap, this.energyUse_kW);
     }
 
+    public J_ProfilePointer getProfilePointer() {
+    	return this.profilePointer;
+    }
+    
 	@Override
 	public String toString() {
 		return
diff --git a/_alp/Classes/Class.J_EAEV.java b/_alp/Classes/Class.J_EAEV.java
index 47b4a5cc..57d46709 100644
--- a/_alp/Classes/Class.J_EAEV.java
+++ b/_alp/Classes/Class.J_EAEV.java
@@ -162,10 +162,6 @@ public double getTotalChargeAmount_kWh() {
 	public double getTotalDischargeAmount_kWh() {
 		return discharged_kWh;
 	}
- 
-	public double getEnergyConsumption_kWhpkm() {
-		return energyConsumption_kWhpkm * vehicleScaling;
-	}
 	
 	public double getEnergyNeedForNextTrip_kWh() {
 		return energyNeedForNextTrip_kWh * vehicleScaling;
diff --git a/_alp/Classes/Class.J_EAVehicle.java b/_alp/Classes/Class.J_EAVehicle.java
index 30c78675..5e56c272 100644
--- a/_alp/Classes/Class.J_EAVehicle.java
+++ b/_alp/Classes/Class.J_EAVehicle.java
@@ -48,6 +48,10 @@ public double getVehicleScaling() {
 		return vehicleScaling;
 	}
 	
+	public double getEnergyConsumption_kWhpkm() {
+		return energyConsumption_kWhpkm * vehicleScaling;
+	}
+	
 	@Override
 	public String toString() {
 		return super.toString();
diff --git a/_alp/Classes/Class.J_RapidRunData.java b/_alp/Classes/Class.J_RapidRunData.java
index f8d8995a..e4e31d88 100644
--- a/_alp/Classes/Class.J_RapidRunData.java
+++ b/_alp/Classes/Class.J_RapidRunData.java
@@ -525,14 +525,14 @@ public Pair<Double, Double> getFlexPotential() {
     		for (int i = 0; i < dailyAvgs_kW.length; i++) {
     			maxDay = dailyAvgs_kW[i] > dailyAvgs_kW[maxDay] ? i : maxDay;
     		}
-    		traceln("Max day: %s, average power %s kW", maxDay, dailyAvgs_kW[maxDay]);
+    		//traceln("Max day: %s, average power %s kW", maxDay, dailyAvgs_kW[maxDay]);
     		// Maximum growth is when dailyAvg delivery would be equal to contracted delivery capacity.
     		possibleGrowthFactor_fr = connectionMetaData.contractedDeliveryCapacity_kW / dailyAvgs_kW[maxDay];
     		if ( possibleGrowthFactor_fr < 1.0) {
-    			traceln("Already overutilising contracted delivery capacity over one day!! Probably an infeasible results...Growth factor: %s", possibleGrowthFactor_fr);
+    			//traceln("Already overutilising contracted delivery capacity over one day!! Probably an infeasible results...Growth factor: %s", possibleGrowthFactor_fr);
     			requiredBatteryCapacity_kWh = 0.0;
     		} else {
-	    		traceln("possibleGrowth: %s ", possibleGrowthFactor_fr);
+	    		//traceln("possibleGrowth: %s ", possibleGrowthFactor_fr);
 	    		double[] dayProfile_kW = Arrays.copyOfRange(am_totalBalanceAccumulators_kW.get(OL_EnergyCarriers.ELECTRICITY).getTimeSeries_kW(),roundToInt(24.0/timeStep_h * maxDay), roundToInt(24.0/timeStep_h * (maxDay+1)));
 	    		double[] dayProfileScaled_kW = ZeroMath.arrayMultiply(dayProfile_kW, possibleGrowthFactor_fr);
 	    		double[] SoC_kWh = new double[roundToInt(24/timeStep_h)+1];