diff --git a/Zero_engine.alpx b/Zero_engine.alpx
index 225734ef..036111aa 100644
--- a/Zero_engine.alpx
+++ b/Zero_engine.alpx
@@ -253,14 +253,6 @@
 					<Id>1673867715990</Id>
 					<Name><![CDATA[ELECTRIC_HOB]]></Name>
 				</Option>
-				<Option>
-					<Id>1676965109301</Id>
-					<Name><![CDATA[CURTAILER]]></Name>
-				</Option>
-				<Option>
-					<Id>1678469475524</Id>
-					<Name><![CDATA[CURTAILER_HEAT]]></Name>
-				</Option>
 				<Option>
 					<Id>1676383232204</Id>
 					<Name><![CDATA[RESIDUALHEATHT]]></Name>
@@ -361,6 +353,7 @@
 			<OptionList>
 				<Id>1659525715752</Id>
 				<Name><![CDATA[OL_EAConversionTypes]]></Name>
+				<ExcludeFromBuild>true</ExcludeFromBuild>
 				<Option>
 					<Id>1659535854305</Id>
 					<Name><![CDATA[HEATPUMP]]></Name>
@@ -403,63 +396,6 @@
 					<Name><![CDATA[WINDMILL]]></Name>
 				</Option>
 			</OptionList>
-			<OptionList>
-				<Id>1659525736586</Id>
-				<Name><![CDATA[OL_EAConsumptionTypes]]></Name>
-				<Option>
-					<Id>1659535824593</Id>
-					<Name><![CDATA[ELECTRICITY]]></Name>
-				</Option>
-				<Option>
-					<Id>1659535830792</Id>
-					<Name><![CDATA[HEAT]]></Name>
-				</Option>
-			</OptionList>
-			<OptionList>
-				<Id>1659525748543</Id>
-				<Name><![CDATA[OL_EAStorageTypes]]></Name>
-				<ExcludeFromBuild>true</ExcludeFromBuild>
-				<Option>
-					<Id>1659535943908</Id>
-					<Name><![CDATA[ELECTRIC_BATTERY]]></Name>
-				</Option>
-				<Option>
-					<Id>1659535950717</Id>
-					<Name><![CDATA[ELECTRIC_VEHICLE]]></Name>
-				</Option>
-				<Option>
-					<Id>1659535949187</Id>
-					<Name><![CDATA[HEATMODEL_BUILDING]]></Name>
-				</Option>
-				<Option>
-					<Id>1674311988696</Id>
-					<Name><![CDATA[HEATBUFFER]]></Name>
-				</Option>
-				<Option>
-					<Id>1684917094693</Id>
-					<Name><![CDATA[GAS]]></Name>
-				</Option>
-			</OptionList>
-			<OptionList>
-				<Id>1659535485693</Id>
-				<Name><![CDATA[OL_EACategories]]></Name>
-				<Option>
-					<Id>1659535486263</Id>
-					<Name><![CDATA[CONSUMPTION]]></Name>
-				</Option>
-				<Option>
-					<Id>1659535492572</Id>
-					<Name><![CDATA[CONVERSION]]></Name>
-				</Option>
-				<Option>
-					<Id>1659535495564</Id>
-					<Name><![CDATA[PRODUCTION]]></Name>
-				</Option>
-				<Option>
-					<Id>1659535498309</Id>
-					<Name><![CDATA[STORAGE]]></Name>
-				</Option>
-			</OptionList>
 			<OptionList>
 				<Id>1659701773383</Id>
 				<Name><![CDATA[OL_AreaType]]></Name>
@@ -517,175 +453,10 @@
 					<Name><![CDATA[Other]]></Name>
 				</Option>
 			</OptionList>
-			<OptionList>
-				<Id>1659950471000</Id>
-				<Name><![CDATA[OL_EAPresetProductionAssets]]></Name>
-				<ExcludeFromBuild>true</ExcludeFromBuild>
-				<Option>
-					<Id>1659950531538</Id>
-					<Name><![CDATA[House_solarpanels_S]]></Name>
-				</Option>
-				<Option>
-					<Id>1659950534060</Id>
-					<Name><![CDATA[House_solarpanels_M]]></Name>
-				</Option>
-				<Option>
-					<Id>1659950555546</Id>
-					<Name><![CDATA[House_solarpanels_L]]></Name>
-				</Option>
-				<Option>
-					<Id>1659950562453</Id>
-					<Name><![CDATA[Windmill_3MW]]></Name>
-				</Option>
-				<Option>
-					<Id>1659950566729</Id>
-					<Name><![CDATA[Windmill_5MW]]></Name>
-				</Option>
-				<Option>
-					<Id>1659950570261</Id>
-					<Name><![CDATA[Windmill_7MW]]></Name>
-				</Option>
-				<Option>
-					<Id>1659970013275</Id>
-					<Name><![CDATA[Solarpanels_0MW]]></Name>
-				</Option>
-				<Option>
-					<Id>1667995960684</Id>
-					<Name><![CDATA[Solarpanels_1MW]]></Name>
-				</Option>
-				<Option>
-					<Id>1667995977424</Id>
-					<Name><![CDATA[Solarpanels_2MW]]></Name>
-				</Option>
-				<Option>
-					<Id>1667995970571</Id>
-					<Name><![CDATA[Solarpanels_3MW]]></Name>
-				</Option>
-				<Option>
-					<Id>1667995986536</Id>
-					<Name><![CDATA[Solarpanels_4MW]]></Name>
-				</Option>
-				<Option>
-					<Id>1667996880047</Id>
-					<Name><![CDATA[Solarpanels_5MW]]></Name>
-				</Option>
-				<Option>
-					<Id>1667995988427</Id>
-					<Name><![CDATA[Solarpanels_10MW]]></Name>
-				</Option>
-				<Option>
-					<Id>1667995990541</Id>
-					<Name><![CDATA[Building_solarpanels_0kWp]]></Name>
-				</Option>
-				<Option>
-					<Id>1667996008098</Id>
-					<Name><![CDATA[Building_solarpanels_1kWp]]></Name>
-				</Option>
-				<Option>
-					<Id>1667996006832</Id>
-					<Name><![CDATA[Building_solarpanels_2kWp]]></Name>
-				</Option>
-				<Option>
-					<Id>1667996013583</Id>
-					<Name><![CDATA[Building_solarpanels_3kWp]]></Name>
-				</Option>
-				<Option>
-					<Id>1667996015832</Id>
-					<Name><![CDATA[Building_solarpanels_4kWp]]></Name>
-				</Option>
-				<Option>
-					<Id>1667996018938</Id>
-					<Name><![CDATA[Building_solarpanels_5kWp]]></Name>
-				</Option>
-				<Option>
-					<Id>1667996020759</Id>
-					<Name><![CDATA[Building_solarpanels_10kWp]]></Name>
-				</Option>
-			</OptionList>
-			<OptionList>
-				<Id>1660055228680</Id>
-				<Name><![CDATA[OL_EAPresetStorageAssets]]></Name>
-				<ExcludeFromBuild>true</ExcludeFromBuild>
-				<Option>
-					<Id>1660055281773</Id>
-					<Name><![CDATA[House_battery]]></Name>
-				</Option>
-				<Option>
-					<Id>1660055281774</Id>
-					<Name><![CDATA[House_heatmodel_A]]></Name>
-				</Option>
-				<Option>
-					<Id>1660055281775</Id>
-					<Name><![CDATA[House_heatmodel_B]]></Name>
-				</Option>
-				<Option>
-					<Id>1660055281776</Id>
-					<Name><![CDATA[House_heatmodel_C]]></Name>
-				</Option>
-				<Option>
-					<Id>1660055281777</Id>
-					<Name><![CDATA[House_heatmodel_D]]></Name>
-				</Option>
-				<Option>
-					<Id>1660055281778</Id>
-					<Name><![CDATA[House_heatmodel_E]]></Name>
-				</Option>
-				<Option>
-					<Id>1660055281779</Id>
-					<Name><![CDATA[House_heatmodel_F]]></Name>
-				</Option>
-				<Option>
-					<Id>1660055281780</Id>
-					<Name><![CDATA[House_heatmodel_G]]></Name>
-				</Option>
-				<Option>
-					<Id>1660055281781</Id>
-					<Name><![CDATA[EV]]></Name>
-				</Option>
-				<Option>
-					<Id>1660055439251</Id>
-					<Name><![CDATA[District_Heating_heat_buffer_HT_S]]></Name>
-				</Option>
-				<Option>
-					<Id>1664536366729</Id>
-					<Name><![CDATA[District_Heating_network_HT_S]]></Name>
-				</Option>
-				<Option>
-					<Id>1664541052353</Id>
-					<Name><![CDATA[District_Heating_network_MT_S]]></Name>
-				</Option>
-				<Option>
-					<Id>1666959280721</Id>
-					<Name><![CDATA[Grid_battery_1MWh]]></Name>
-				</Option>
-				<Option>
-					<Id>1667757454119</Id>
-					<Name><![CDATA[EHGV]]></Name>
-				</Option>
-				<Option>
-					<Id>1667464089952</Id>
-					<Name><![CDATA[Grid_battery_10MWh]]></Name>
-				</Option>
-				<Option>
-					<Id>1667995942136</Id>
-					<Name><![CDATA[Grid_battery_0MWh]]></Name>
-				</Option>
-				<Option>
-					<Id>1667996898857</Id>
-					<Name><![CDATA[Grid_battery_5MWh]]></Name>
-				</Option>
-				<Option>
-					<Id>1668594477547</Id>
-					<Name><![CDATA[EHGV_x50]]></Name>
-				</Option>
-				<Option>
-					<Id>1676893732560</Id>
-					<Name><![CDATA[Store_heatmodel_A]]></Name>
-				</Option>
-			</OptionList>
 			<OptionList>
 				<Id>1660226249511</Id>
 				<Name><![CDATA[OL_ActorType]]></Name>
+				<ExcludeFromBuild>true</ExcludeFromBuild>
 				<Option>
 					<Id>1660226249512</Id>
 					<Name><![CDATA[CONNECTIONOWNER]]></Name>
@@ -1066,6 +837,7 @@
 			<OptionList>
 				<Id>1718560423698</Id>
 				<Name><![CDATA[OL_ProfileAssetType]]></Name>
+				<ExcludeFromBuild>true</ExcludeFromBuild>
 				<Option>
 					<Id>1718560423699</Id>
 					<Name><![CDATA[ELECTRICITYBASELOAD]]></Name>
diff --git a/_alp/Agents/Actor/Variables.xml b/_alp/Agents/Actor/Variables.xml
index 182f8ec4..66cf1f8e 100644
--- a/_alp/Agents/Actor/Variables.xml
+++ b/_alp/Agents/Actor/Variables.xml
@@ -36,6 +36,7 @@
 
 @since: Sprint 6
 @author: Gillis]]></Description>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>60</X>
 		<Y>90</Y>
 		<Label>
diff --git a/_alp/Agents/ConnectionOwner/Variables.xml b/_alp/Agents/ConnectionOwner/Variables.xml
index 31721350..be37c87a 100644
--- a/_alp/Agents/ConnectionOwner/Variables.xml
+++ b/_alp/Agents/ConnectionOwner/Variables.xml
@@ -1426,8 +1426,8 @@
 	<Variable Class="Parameter">
 		<Id>1702915036278</Id>
 		<Name><![CDATA[p_connectionOwnerType]]></Name>
-		<X>180</X>
-		<Y>90</Y>
+		<X>60</X>
+		<Y>140</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
diff --git a/_alp/Agents/EnergyCoop/AOC.EnergyCoop.xml b/_alp/Agents/EnergyCoop/AOC.EnergyCoop.xml
index 53232444..e537e3e7 100644
--- a/_alp/Agents/EnergyCoop/AOC.EnergyCoop.xml
+++ b/_alp/Agents/EnergyCoop/AOC.EnergyCoop.xml
@@ -46,7 +46,12 @@ v_liveConnectionMetaData = new J_ConnectionMetaData(this);
 v_liveAssetsMetaData = new J_AssetsMetaData(this);
 v_liveData.connectionMetaData = v_liveConnectionMetaData;
 v_liveData.assetsMetaData = v_liveAssetsMetaData;
-energyModel.c_actors.add(this);]]></StartupCode>
+energyModel.c_actors.add(this);
+
+fm_currentProductionFlows_kW = new J_FlowsMap();
+fm_currentConsumptionFlows_kW = new J_FlowsMap();
+fm_currentBalanceFlows_kW = new J_FlowsMap();
+fm_currentAssetFlows_kW = new J_ValueMap(OL_AssetFlowCategories.class);]]></StartupCode>
 	<Generic>false</Generic>
 	<GenericParameter>
 		<Id>1660731375014</Id>
diff --git a/_alp/Agents/EnergyCoop/Code/Functions.java b/_alp/Agents/EnergyCoop/Code/Functions.java
index 131a2c25..d546be3f 100644
--- a/_alp/Agents/EnergyCoop/Code/Functions.java
+++ b/_alp/Agents/EnergyCoop/Code/Functions.java
@@ -1468,6 +1468,11 @@ HashSet<GridConnection> f_getAllChildCustomerGridConnections_recursion(HashSet<G
 //v_liveAssetsMetaData = new J_AssetsMetaData(this);
 v_liveData.connectionMetaData = v_liveConnectionMetaData;
 v_liveData.assetsMetaData = v_liveAssetsMetaData;
+
+fm_currentProductionFlows_kW = new J_FlowsMap();
+fm_currentConsumptionFlows_kW = new J_FlowsMap();
+fm_currentBalanceFlows_kW = new J_FlowsMap();
+fm_currentAssetFlows_kW = new J_ValueMap(OL_AssetFlowCategories.class);
 /*ALCODEEND*/}
 
 EnergyCoop f_addConsumptionEnergyCarrier(OL_EnergyCarriers EC)
diff --git a/_alp/Agents/EnergyCoop/Variables.xml b/_alp/Agents/EnergyCoop/Variables.xml
index 788bed8e..57c71f79 100644
--- a/_alp/Agents/EnergyCoop/Variables.xml
+++ b/_alp/Agents/EnergyCoop/Variables.xml
@@ -1018,9 +1018,6 @@
               AccessType="public"
               StaticVariable="false">
 			<Type><![CDATA[J_FlowsMap]]></Type>
-			<InitialValue Class="CodeValue">
-				<Code><![CDATA[new J_FlowsMap()]]></Code>
-			</InitialValue>
 		</Properties>
 	</Variable>
 	<Variable Class="PlainVariable">
@@ -1040,9 +1037,6 @@
               AccessType="public"
               StaticVariable="false">
 			<Type><![CDATA[J_FlowsMap]]></Type>
-			<InitialValue Class="CodeValue">
-				<Code><![CDATA[new J_FlowsMap()]]></Code>
-			</InitialValue>
 		</Properties>
 	</Variable>
 	<Variable Class="PlainVariable">
@@ -1062,9 +1056,6 @@
               AccessType="public"
               StaticVariable="false">
 			<Type><![CDATA[J_FlowsMap]]></Type>
-			<InitialValue Class="CodeValue">
-				<Code><![CDATA[new J_FlowsMap()]]></Code>
-			</InitialValue>
 		</Properties>
 	</Variable>
 	<Variable Class="PlainVariable">
@@ -1572,9 +1563,6 @@
               AccessType="public"
               StaticVariable="false">
 			<Type><![CDATA[J_ValueMap]]></Type>
-			<InitialValue Class="CodeValue">
-				<Code><![CDATA[new J_ValueMap(OL_AssetFlowCategories.class)]]></Code>
-			</InitialValue>
 		</Properties>
 	</Variable>
 	<Variable Class="PlainVariable">
diff --git a/_alp/Agents/EnergyModel/AOC.EnergyModel.xml b/_alp/Agents/EnergyModel/AOC.EnergyModel.xml
index 303c5504..67a9e533 100644
--- a/_alp/Agents/EnergyModel/AOC.EnergyModel.xml
+++ b/_alp/Agents/EnergyModel/AOC.EnergyModel.xml
@@ -61,7 +61,12 @@ v_liveData = new J_LiveData(this);
 v_liveConnectionMetaData = new J_ConnectionMetaData(this);
 v_liveAssetsMetaData = new J_AssetsMetaData(this);
 v_liveData.connectionMetaData = v_liveConnectionMetaData;
-v_liveData.assetsMetaData = v_liveAssetsMetaData;]]></StartupCode>
+v_liveData.assetsMetaData = v_liveAssetsMetaData;
+
+fm_currentProductionFlows_kW = new J_FlowsMap();
+fm_currentConsumptionFlows_kW = new J_FlowsMap();
+fm_currentBalanceFlows_kW = new J_FlowsMap();
+fm_currentAssetFlows_kW = new J_ValueMap(OL_AssetFlowCategories.class);]]></StartupCode>
 	<Generic>false</Generic>
 	<GenericParameter>
 		<Id>1658477103138</Id>
diff --git a/_alp/Agents/EnergyModel/Variables.xml b/_alp/Agents/EnergyModel/Variables.xml
index 15c33388..6da707b5 100644
--- a/_alp/Agents/EnergyModel/Variables.xml
+++ b/_alp/Agents/EnergyModel/Variables.xml
@@ -1048,9 +1048,6 @@
               AccessType="public"
               StaticVariable="false">
 			<Type><![CDATA[J_FlowsMap]]></Type>
-			<InitialValue Class="CodeValue">
-				<Code><![CDATA[new J_FlowsMap()]]></Code>
-			</InitialValue>
 		</Properties>
 	</Variable>
 	<Variable Class="PlainVariable">
@@ -1133,9 +1130,6 @@
               AccessType="public"
               StaticVariable="false">
 			<Type><![CDATA[J_FlowsMap]]></Type>
-			<InitialValue Class="CodeValue">
-				<Code><![CDATA[new J_FlowsMap()]]></Code>
-			</InitialValue>
 		</Properties>
 	</Variable>
 	<Variable Class="PlainVariable">
@@ -1155,9 +1149,6 @@
               AccessType="public"
               StaticVariable="false">
 			<Type><![CDATA[J_FlowsMap]]></Type>
-			<InitialValue Class="CodeValue">
-				<Code><![CDATA[new J_FlowsMap()]]></Code>
-			</InitialValue>
 		</Properties>
 	</Variable>
 	<Variable Class="PlainVariable">
@@ -1603,9 +1594,6 @@
               AccessType="public"
               StaticVariable="false">
 			<Type><![CDATA[J_ValueMap<OL_AssetFlowCategories>]]></Type>
-			<InitialValue Class="CodeValue">
-				<Code><![CDATA[new J_ValueMap(OL_AssetFlowCategories.class)]]></Code>
-			</InitialValue>
 		</Properties>
 	</Variable>
 	<Variable Class="PlainVariable">
diff --git a/_alp/Agents/GridConnection/AOC.GridConnection.xml b/_alp/Agents/GridConnection/AOC.GridConnection.xml
index 40f623c3..96472d6c 100644
--- a/_alp/Agents/GridConnection/AOC.GridConnection.xml
+++ b/_alp/Agents/GridConnection/AOC.GridConnection.xml
@@ -63,7 +63,11 @@ v_liveConnectionMetaData = new J_ConnectionMetaData(this);
 v_liveAssetsMetaData = new J_AssetsMetaData(this);
 v_liveData.connectionMetaData = v_liveConnectionMetaData;
 v_liveData.assetsMetaData = v_liveAssetsMetaData;
-]]></StartupCode>
+
+fm_currentProductionFlows_kW = new J_FlowsMap();
+fm_currentConsumptionFlows_kW = new J_FlowsMap();
+fm_currentBalanceFlows_kW = new J_FlowsMap();
+fm_currentAssetFlows_kW = new J_ValueMap(OL_AssetFlowCategories.class);]]></StartupCode>
 	<Generic>false</Generic>
 	<GenericParameter>
 		<Id>1658499438201</Id>
diff --git a/_alp/Agents/GridConnection/Code/Functions.java b/_alp/Agents/GridConnection/Code/Functions.java
index da38e9d5..d6f0b163 100644
--- a/_alp/Agents/GridConnection/Code/Functions.java
+++ b/_alp/Agents/GridConnection/Code/Functions.java
@@ -482,16 +482,15 @@
 	}
 }
 
-if (j_ea instanceof J_EAVehicle) {
-	J_EAVehicle vehicle = (J_EAVehicle)j_ea;
-	if (vehicle instanceof J_EADieselVehicle) {
-		c_dieselVehicles.add( (J_EADieselVehicle)vehicle );		
-	} else if (vehicle instanceof J_EAHydrogenVehicle) {
-		c_hydrogenVehicles.add((J_EAHydrogenVehicle)vehicle);		
-	} else if (vehicle instanceof J_EAEV) {
-		c_electricVehicles.add((J_EAEV)vehicle);
-		c_vehiclesAvailableForCharging.add((J_EAEV)vehicle);
-		energyModel.c_EVs.add((J_EAEV)vehicle);	
+if (j_ea instanceof J_EAVehicle vehicle) {
+	if (vehicle instanceof J_EADieselVehicle dieselVehicle) {
+		c_dieselVehicles.add( dieselVehicle );		
+	} else if (vehicle instanceof J_EAHydrogenVehicle hydrogenVehicle) {
+		c_hydrogenVehicles.add(hydrogenVehicle);		
+	} else if (vehicle instanceof J_EAEV ev) {
+		c_electricVehicles.add(ev);
+		c_vehiclesAvailableForCharging.add(ev);
+		energyModel.c_EVs.add(ev);	
 	}
 	c_vehicleAssets.add(vehicle);		
 	J_ActivityTrackerTrips tripTracker = vehicle.getTripTracker();
@@ -516,16 +515,17 @@
 	}
 	c_tripTrackers.add( tripTracker );
 	v_vehicleIndex ++;
-} else if (j_ea instanceof J_EAConsumption) {
-	c_consumptionAssets.add((J_EAConsumption)j_ea);	
+} else if (j_ea instanceof J_EAConsumption consumptionAsset) {
+	c_consumptionAssets.add(consumptionAsset);	
 	if (j_ea.energyAssetType == OL_EnergyAssetType.HOT_WATER_CONSUMPTION) {
-		p_DHWAsset = (J_EAConsumption)j_ea;	
+		p_DHWAsset = consumptionAsset;	
 	}
-} else if (j_ea instanceof J_EAProduction) {
-	c_productionAssets.add((J_EAProduction)j_ea);
+} else if (j_ea instanceof J_EAProduction productionAsset) {
+	//c_productionAssets.add((J_EAProduction)j_ea);
+	c_productionAssets.add(productionAsset);
 
 	if (j_ea.energyAssetType == OL_EnergyAssetType.PHOTOVOLTAIC) {
-		double capacity_kW = ((J_EAProduction)j_ea).getCapacityElectric_kW();
+		double capacity_kW = productionAsset.getCapacityElectric_kW();
 		v_liveAssetsMetaData.totalInstalledPVPower_kW += capacity_kW;
 		if ( p_parentNodeElectric != null ) {
 			p_parentNodeElectric.f_updateTotalInstalledProductionAssets(OL_EnergyAssetType.PHOTOVOLTAIC, capacity_kW, true);
@@ -533,8 +533,8 @@
 		c_parentCoops.forEach( coop -> coop.v_liveAssetsMetaData.totalInstalledPVPower_kW += capacity_kW);
 		energyModel.v_liveAssetsMetaData.totalInstalledPVPower_kW += capacity_kW;
 	}
-	else if (j_ea.energyAssetType == OL_EnergyAssetType.WINDMILL) {
-		double capacity_kW = ((J_EAProduction)j_ea).getCapacityElectric_kW();
+	else if (productionAsset.energyAssetType == OL_EnergyAssetType.WINDMILL) {
+		double capacity_kW = productionAsset.getCapacityElectric_kW();
 		v_liveAssetsMetaData.totalInstalledWindPower_kW += capacity_kW;
 		if ( p_parentNodeElectric != null ) {
 			p_parentNodeElectric.f_updateTotalInstalledProductionAssets(OL_EnergyAssetType.WINDMILL, capacity_kW, true);
@@ -542,14 +542,14 @@ else if (j_ea.energyAssetType == OL_EnergyAssetType.WINDMILL) {
 		c_parentCoops.forEach( coop -> coop.v_liveAssetsMetaData.totalInstalledWindPower_kW += capacity_kW);
 		energyModel.v_liveAssetsMetaData.totalInstalledWindPower_kW += capacity_kW;
 	}
-	else if (j_ea.energyAssetType == OL_EnergyAssetType.PHOTOTHERMAL){
+	else if (productionAsset.energyAssetType == OL_EnergyAssetType.PHOTOTHERMAL){
 		if (p_heatingManagement != null) {
 			p_heatingManagement.notInitialized();
 		}
 	}
-} else if (j_ea instanceof J_EAConversion) {
-	c_conversionAssets.add((J_EAConversion)j_ea);
-	if ( j_ea.energyAssetType == OL_EnergyAssetType.GAS_PIT || j_ea.energyAssetType == OL_EnergyAssetType.ELECTRIC_HOB){
+} else if (j_ea instanceof J_EAConversion conversionAsset) {
+	c_conversionAssets.add(conversionAsset);
+	if ( conversionAsset.energyAssetType == OL_EnergyAssetType.GAS_PIT || j_ea.energyAssetType == OL_EnergyAssetType.ELECTRIC_HOB){
 		if (p_cookingTracker == null) {
 			int rowIndex = uniform_discr(2, 300); 
 			p_cookingTracker = new J_ActivityTrackerCooking(energyModel.p_cookingPatternCsv, rowIndex, (energyModel.t_h-energyModel.p_runStartTime_h)*60, (J_EAConversion)j_ea );			
@@ -559,13 +559,13 @@ else if (j_ea.energyAssetType == OL_EnergyAssetType.PHOTOTHERMAL){
 	} else if (j_ea instanceof J_EAConversionHeatPump) {
 		energyModel.c_ambientDependentAssets.add(j_ea);
 	}
-} else if  (j_ea instanceof J_EAStorage) {
-	c_storageAssets.add((J_EAStorage)j_ea);
-	energyModel.c_storageAssets.add((J_EAStorage)j_ea);
+} else if  (j_ea instanceof J_EAStorage storageAsset) {
+	c_storageAssets.add(storageAsset);
+	energyModel.c_storageAssets.add(storageAsset);
 	if (j_ea instanceof J_EAStorageHeat) {
 		energyModel.c_ambientDependentAssets.add(j_ea);
-		if (j_ea.energyAssetType == OL_EnergyAssetType.BUILDINGTHERMALS) {
-			p_BuildingThermalAsset = (J_EABuilding)j_ea;
+		if (j_ea instanceof J_EABuilding buildingAsset) {
+			p_BuildingThermalAsset = buildingAsset;
 			if (p_heatingManagement != null) {
 				p_heatingManagement.notInitialized();
 			}
@@ -576,22 +576,22 @@ else if (j_ea.energyAssetType == OL_EnergyAssetType.PHOTOTHERMAL){
 				p_heatingManagement.notInitialized();
 			}
 		}
-	} else if (j_ea instanceof J_EAStorageGas) {
-		p_gasBuffer = (J_EAStorageGas)j_ea;
-	} else if (j_ea instanceof J_EAStorageElectric) {
-		p_batteryAsset = (J_EAStorageElectric)j_ea;
-		double capacity_MWh = ((J_EAStorageElectric)j_ea).getStorageCapacity_kWh()/1000;
+	} else if (j_ea instanceof J_EAStorageGas gasStorage) {
+		p_gasBuffer = gasStorage;
+	} else if (j_ea instanceof J_EAStorageElectric battery) {
+		p_batteryAsset = battery;
+		double capacity_MWh = battery.getStorageCapacity_kWh()/1000;
 		v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh += capacity_MWh;
 		c_parentCoops.forEach( coop -> coop.v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh += capacity_MWh);
 		energyModel.v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh += capacity_MWh;
 		
 	}
-} else if  (j_ea instanceof J_EAProfile) {
-	c_profileAssets.add((J_EAProfile)j_ea);
-} 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);
+} else if  (j_ea instanceof J_EAProfile profileAsset) {
+	c_profileAssets.add(profileAsset);
+} else if (j_ea instanceof J_EADieselTractor tractor) {
+	c_profileAssets.add(tractor);
+} else if (j_ea instanceof J_EACharger charger) {
+	c_chargers.add(charger);
 } else {
 	if (!(this instanceof GCHouse && j_ea instanceof J_EAAirco)) {
 		traceln("Unrecognized energy asset %s in gridconnection %s", j_ea, this);
@@ -930,9 +930,9 @@ else if (j_ea.energyAssetType == OL_EnergyAssetType.PHOTOTHERMAL){
 } else if  (j_ea instanceof J_EAProfile) {
 	//p_energyProfile = null;
 	c_profileAssets.remove((J_EAProfile)j_ea);
-	if( ((J_EAProfile)j_ea).profileType == OL_ProfileAssetType.HEATPUMP_ELECTRICITY_CONSUMPTION){
+	/*if( ((J_EAProfile)j_ea).profileType == OL_ProfileAssetType.HEATPUMP_ELECTRICITY_CONSUMPTION){
 		//c_electricHeatpumpAssets.add(j_ea);
-	}
+	}*/
 } else if (j_ea instanceof J_EACharger) {
 	c_chargers.remove(j_ea);
 	//c_EvAssets.remove(j_ea);	
@@ -972,7 +972,7 @@ else if (j_ea.energyAssetType == OL_EnergyAssetType.PHOTOTHERMAL){
 		// Keep feedin power within connection capacity
 		if (fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY) < - v_liveConnectionMetaData.contractedFeedinCapacity_kW) { // overproduction!
 			for (J_EAProduction j_ea : c_productionAssets) {
-				j_ea.curtailElectricityProduction( - fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY) - v_liveConnectionMetaData.contractedFeedinCapacity_kW);
+				j_ea.curtailEnergyCarrierProduction(OL_EnergyCarriers.ELECTRICITY, - fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY) - v_liveConnectionMetaData.contractedFeedinCapacity_kW);
 				if (!(fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY) < - v_liveConnectionMetaData.contractedFeedinCapacity_kW)) {
 					break;
 				}
@@ -983,7 +983,7 @@ else if (j_ea.energyAssetType == OL_EnergyAssetType.PHOTOTHERMAL){
 		if(energyModel.pp_dayAheadElectricityPricing_eurpMWh.getCurrentValue() < 0.0) {
 			if (fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY) < 0.0) { // Feedin, bring to zero!
 				for (J_EAProduction j_ea : c_productionAssets) {
-					j_ea.curtailElectricityProduction( - fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY));
+					j_ea.curtailEnergyCarrierProduction(OL_EnergyCarriers.ELECTRICITY, - fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY));
 					if (!(fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY) < 0.0)) {
 						break;
 					}
@@ -998,7 +998,7 @@ else if (j_ea.energyAssetType == OL_EnergyAssetType.PHOTOTHERMAL){
 		
 			double v_currentPowerElectricitySetpoint_kW = fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY) * max(0,1+(p_parentNodeElectric.v_currentTotalNodalPrice_eurpkWh-priceTreshold_eur)*5);
 			for (J_EAProduction j_ea : c_productionAssets) {
-				j_ea.curtailElectricityProduction(v_currentPowerElectricitySetpoint_kW - fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY));
+				j_ea.curtailEnergyCarrierProduction(OL_EnergyCarriers.ELECTRICITY, v_currentPowerElectricitySetpoint_kW - fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY));
 				if (!(fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY) < v_currentPowerElectricitySetpoint_kW)) {
 					break;
 				}
@@ -1286,6 +1286,11 @@ else if (flowsMap.get(EC) > 0){
 //v_liveAssetsMetaData = new J_AssetsMetaData(this);
 v_liveData.connectionMetaData = v_liveConnectionMetaData;
 v_liveData.assetsMetaData = v_liveAssetsMetaData;
+
+fm_currentProductionFlows_kW = new J_FlowsMap();
+fm_currentConsumptionFlows_kW = new J_FlowsMap();
+fm_currentBalanceFlows_kW = new J_FlowsMap();
+fm_currentAssetFlows_kW = new J_ValueMap(OL_AssetFlowCategories.class);
 /*ALCODEEND*/}
 
 double f_removeAllHeatingAssets()
diff --git a/_alp/Agents/GridConnection/Variables.xml b/_alp/Agents/GridConnection/Variables.xml
index 9359f3d9..62b58730 100644
--- a/_alp/Agents/GridConnection/Variables.xml
+++ b/_alp/Agents/GridConnection/Variables.xml
@@ -708,9 +708,6 @@
               AccessType="public"
               StaticVariable="false">
 			<Type><![CDATA[J_FlowsMap]]></Type>
-			<InitialValue Class="CodeValue">
-				<Code><![CDATA[new J_FlowsMap()]]></Code>
-			</InitialValue>
 		</Properties>
 	</Variable>
 	<Variable Class="PlainVariable">
@@ -730,9 +727,6 @@
               AccessType="public"
               StaticVariable="false">
 			<Type><![CDATA[J_FlowsMap]]></Type>
-			<InitialValue Class="CodeValue">
-				<Code><![CDATA[new J_FlowsMap()]]></Code>
-			</InitialValue>
 		</Properties>
 	</Variable>
 	<Variable Class="PlainVariable">
@@ -790,9 +784,6 @@
               AccessType="public"
               StaticVariable="false">
 			<Type><![CDATA[J_FlowsMap]]></Type>
-			<InitialValue Class="CodeValue">
-				<Code><![CDATA[new J_FlowsMap()]]></Code>
-			</InitialValue>
 		</Properties>
 	</Variable>
 	<Variable Class="PlainVariable">
@@ -1026,9 +1017,6 @@
               AccessType="public"
               StaticVariable="false">
 			<Type><![CDATA[J_ValueMap]]></Type>
-			<InitialValue Class="CodeValue">
-				<Code><![CDATA[new J_ValueMap(OL_AssetFlowCategories.class)]]></Code>
-			</InitialValue>
 		</Properties>
 	</Variable>
 	<Variable Class="Parameter">
diff --git a/_alp/Classes/Class.J_BatteryManagementPeakShavingForecast.java b/_alp/Classes/Class.J_BatteryManagementPeakShavingForecast.java
index c6f888bd..654c8eb7 100644
--- a/_alp/Classes/Class.J_BatteryManagementPeakShavingForecast.java
+++ b/_alp/Classes/Class.J_BatteryManagementPeakShavingForecast.java
@@ -70,7 +70,7 @@ private double[] getNettoBalanceForecast_kW() {
 		List<J_EAProduction> productionAssets = new ArrayList<J_EAProduction>();
 		
 		for (GridConnection GC : c_targetGridConnections){
-			profileAssets.addAll(findAll(GC.c_profileAssets, profile -> profile.profileType == OL_ProfileAssetType.ELECTRICITYBASELOAD));
+			profileAssets.addAll(findAll(GC.c_profileAssets, profile -> profile.assetFlowCategory == OL_AssetFlowCategories.fixedConsumptionElectric_kW));
 			consumptionAssets.addAll(findAll(GC.c_consumptionAssets, cons -> cons.energyAssetType == OL_EnergyAssetType.ELECTRICITY_DEMAND));
 			productionAssets.addAll(findAll(GC.c_productionAssets, prod -> prod.energyAssetType == OL_EnergyAssetType.PHOTOVOLTAIC || prod.energyAssetType == OL_EnergyAssetType.WINDMILL));
 		}
diff --git a/_alp/Classes/Class.J_ConnectionContract.java b/_alp/Classes/Class.J_ConnectionContract.java
index bb05d20e..ea3a36e4 100644
--- a/_alp/Classes/Class.J_ConnectionContract.java
+++ b/_alp/Classes/Class.J_ConnectionContract.java
@@ -22,7 +22,7 @@ public J_ConnectionContract(String contractScope, OL_ConnectionContractType cont
 	    this.nfATOstart_h = nfATOstart_h;
 	    this.nfATOend_h = nfATOend_h;
 	    this.nfATOpower_kW = nfATOpower_kW;
-	    this.contractType = OL_ContractType.CONNECTION;
+	    //this.contractType = OL_ContractType.CONNECTION;
 	    this.annualFee_eur = annualFee_eur;
 	}
 }
\ No newline at end of file
diff --git a/_alp/Classes/Class.J_Contract.java b/_alp/Classes/Class.J_Contract.java
index cb4b7135..06107d0a 100644
--- a/_alp/Classes/Class.J_Contract.java
+++ b/_alp/Classes/Class.J_Contract.java
@@ -17,7 +17,7 @@ public class J_Contract implements Serializable {
 
 	public String contractScope; // Kan energySupplier of Coop zijn  (dus kan niet specifieker zijn dan 'String' hier, tenzij we Interfaces gaan gebruiken. ('Implements energy supplier')
 	public OL_EnergyCarriers energyCarrier;
-	public OL_ContractType contractType;
+	//public OL_ContractType contractType;
 	public double EnergyTransactionVolume_kWh=0;
 	public double FinancialTransactionVolume_eur=0;
 	public String contractHolder;
diff --git a/_alp/Classes/Class.J_DeliveryContract.java b/_alp/Classes/Class.J_DeliveryContract.java
index 3df46881..e2d9ca0b 100644
--- a/_alp/Classes/Class.J_DeliveryContract.java
+++ b/_alp/Classes/Class.J_DeliveryContract.java
@@ -35,7 +35,7 @@ public J_DeliveryContract(String contractScope, OL_DeliveryContractType contract
 	    this.energyCarrier = energyCarrier;
 	    this.deliveryPrice_eurpkWh = deliveryPrice_eurpkWh;
 	    this.feedinPrice_eurpkWh = feedinPrice_eurpkWh;
-	    this.contractType = OL_ContractType.DELIVERY;
+	    //this.contractType = OL_ContractType.DELIVERY;
 	    this.annualFee_eur = annualFee_eur;
 	}
     
diff --git a/_alp/Classes/Class.J_EAProduction.java b/_alp/Classes/Class.J_EAProduction.java
index eaef0bd4..d7bb5f65 100644
--- a/_alp/Classes/Class.J_EAProduction.java
+++ b/_alp/Classes/Class.J_EAProduction.java
@@ -128,32 +128,8 @@ public void f_updateAllFlows(double powerFraction_fr) {
     	this.lastEnergyUse_kW = this.energyUse_kW;
     	this.clear();
     }
-	
-    // This function could be removed, now that we have the more generic: curtailEnergyCarrierProduction
-    public void curtailElectricityProduction(double curtailmentSetpoint_kW) {  // This variable is called curtailmentSetpoint, but maybe its better to call it curtailment amount? it represents the amount of production we need to curtail, not the amount we want to produce.
-    	double currentProduction_kW = -this.lastFlowsMap.get(OL_EnergyCarriers.ELECTRICITY);
-    	//traceln("currentProduction_kW: " + currentProduction_kW);
-    	//traceln("curtailmentSetpoint_kW: " + curtailmentSetpoint_kW);
-    	double curtailmentPower_kW = max(0,min(currentProduction_kW, curtailmentSetpoint_kW));
-    	energyUsed_kWh += curtailmentPower_kW * timestep_h;
-    	this.totalEnergyCurtailed_kWh += curtailmentPower_kW * timestep_h;
-    	this.flowsMap.put(OL_EnergyCarriers.ELECTRICITY, -curtailmentPower_kW);
-    	J_ValueMap<OL_AssetFlowCategories> assetFlows_kW = new J_ValueMap(OL_AssetFlowCategories.class);
-    	assetFlows_kW.put(this.assetFlowCategory, curtailmentPower_kW);
-    	
-    	this.energyUse_kW = -curtailmentPower_kW;
-    	this.lastFlowsMap.addFlow(OL_EnergyCarriers.ELECTRICITY, curtailmentPower_kW);
-    	this.lastEnergyUse_kW += curtailmentPower_kW;
-    	
-    	//traceln("Electricity production of asset %s curtailed by %s kW!", this, curtailmentPower_kW);
-    	if (parentAgent instanceof GridConnection) {    		
-    		((GridConnection)parentAgent).f_removeFlows(this.flowsMap, this.energyUse_kW, assetFlows_kW, this);
-    	}
-    	clear();
-    	
-    }
     
-    public double curtailEnergyCarrierProduction(OL_EnergyCarriers curtailedEnergyCarrier, double curtailmentAmount_kW) {  // This variable is called curtailmentSetpoint, but maybe its better to call it curtailment amount? it represents the amount of production we need to curtail, not the amount we want to produce.
+    public double curtailEnergyCarrierProduction(OL_EnergyCarriers curtailedEnergyCarrier, double curtailmentAmount_kW) {  // The curtailment setpoint is the requested amount of curtailment; requested reduction of production. (which may or may not be provided, depending on what the current production is)
     	
     	if(this.energyCarrier != curtailedEnergyCarrier) {
     		//new RuntimeException("Trying to curtail the wrong a production asset with the wrong energyCarrier");
@@ -161,19 +137,20 @@ public double curtailEnergyCarrierProduction(OL_EnergyCarriers curtailedEnergyCa
     	}
     	
     	double currentProduction_kW = -this.lastFlowsMap.get(curtailedEnergyCarrier);
-    	double curtailmentPower_kW = max(0,min(currentProduction_kW, curtailmentAmount_kW));
-    	energyUsed_kWh += curtailmentPower_kW * timestep_h;
+    	double curtailmentPower_kW = max(0,min(currentProduction_kW, curtailmentAmount_kW)); // Can only curtail what was produced in the first place.
+    	energyUsed_kWh += curtailmentPower_kW * timestep_h; // energyUsed_kWh is negative for production assets. Curtailment makes it 'less negative', so a positive number is added to energyUsed_kWh.
     	this.totalEnergyCurtailed_kWh += curtailmentPower_kW * timestep_h;
-    	this.flowsMap.put(curtailedEnergyCarrier, -curtailmentPower_kW);
+    	J_FlowsMap curtailmentFlow = new J_FlowsMap();
+    	curtailmentFlow.put(curtailedEnergyCarrier, -curtailmentPower_kW); // To remove production, a negative flow must be removed. Thus this flowmap with a negative flow will be sent to GC.f_removeFlows()
     	J_ValueMap<OL_AssetFlowCategories> assetFlows_kW = new J_ValueMap(OL_AssetFlowCategories.class);
-    	assetFlows_kW.put(this.assetFlowCategory, curtailmentPower_kW);
-    	this.energyUse_kW = -curtailmentPower_kW;
-    	this.lastFlowsMap.addFlow(curtailedEnergyCarrier, curtailmentPower_kW);
-    	this.lastEnergyUse_kW += curtailmentPower_kW;
+    	assetFlows_kW.put(this.assetFlowCategory, curtailmentPower_kW); // The assetFlows for production assets contain positive values for production. This assetFlows_kW will be handle bij GC.f_removeFlows(), so it should contain a positive number to remove production.
+    	double curtailedEnergyUse_kW = -curtailmentPower_kW; // production is a negative flow, so to remove production, a negative value must be sent to GC.f_removeFlows().
+    	this.lastFlowsMap.addFlow(curtailedEnergyCarrier, curtailmentPower_kW); // production is a negative flow, so to remove production, a positive value must be added to lastFlows.
+    	this.lastEnergyUse_kW += curtailmentPower_kW; // production is a negative flow, so to remove production, a positive value must be added to lastEnergyUse_kW.
     	
     	//traceln("Electricity production of asset %s curtailed by %s kW!", this, curtailmentPower_kW);
     	if (parentAgent instanceof GridConnection) {    		
-    		((GridConnection)parentAgent).f_removeFlows(this.flowsMap, this.energyUse_kW, assetFlows_kW, this);
+    		((GridConnection)parentAgent).f_removeFlows(curtailmentFlow, curtailedEnergyUse_kW, assetFlows_kW, this);
     	}
     	clear();
     	
@@ -218,4 +195,3 @@ public String getOwnerAgent() {
 	 */
 	private static final long serialVersionUID = 1L;
 }
-
diff --git a/_alp/Classes/Class.J_EAProfile.java b/_alp/Classes/Class.J_EAProfile.java
index b3652086..141a8543 100644
--- a/_alp/Classes/Class.J_EAProfile.java
+++ b/_alp/Classes/Class.J_EAProfile.java
@@ -7,7 +7,7 @@ public class J_EAProfile extends zero_engine.J_EA implements Serializable {
 	public OL_EnergyCarriers energyCarrier = OL_EnergyCarriers.ELECTRICITY;
 	//public double capacityMethane_kW;
 	public double[] a_energyProfile_kWh;
-	public OL_ProfileAssetType profileType;
+	//public OL_ProfileAssetType profileType;
 	private double profileTimestep_h;
     private double profileStarTime_h = 0;
 	//protected double outputTemperature_degC;
@@ -24,12 +24,13 @@ public J_EAProfile() {
     /**
      * Constructor initializing the fields
      */
-    public J_EAProfile(Agent parentAgent, OL_EnergyCarriers energyCarrier, double[] profile_kWh, OL_ProfileAssetType profileType, double profileTimestep_h) {
+    public J_EAProfile(Agent parentAgent, OL_EnergyCarriers energyCarrier, double[] profile_kWh, OL_AssetFlowCategories assetCategory, double profileTimestep_h) {
 	    this.parentAgent= parentAgent;
 	    this.energyCarrier = energyCarrier;
 	    this.a_energyProfile_kWh = profile_kWh;
-	    this.profileType = profileType;
+	    //this.profileType = profileType;
 	    this.profileTimestep_h = profileTimestep_h;
+	    this.assetFlowCategory = assetCategory;
 
 	    if (parentAgent instanceof GridConnection) {
 	    	this.timestep_h = ((GridConnection)parentAgent).energyModel.p_timeStep_h;
@@ -37,6 +38,7 @@ public J_EAProfile(Agent parentAgent, OL_EnergyCarriers energyCarrier, double[]
 	    	this.timestep_h = profileTimestep_h;
 	    }
 	    
+	    /*
 	    if (profileType == OL_ProfileAssetType.ELECTRICITYBASELOAD) {
 	    	this.assetFlowCategory = OL_AssetFlowCategories.fixedConsumptionElectric_kW;
 	    } else if (profileType == OL_ProfileAssetType.CHARGING) {
@@ -48,7 +50,7 @@ public J_EAProfile(Agent parentAgent, OL_EnergyCarriers energyCarrier, double[]
 	    } else if (profileType == OL_ProfileAssetType.HEATPUMP_ELECTRICITY_CONSUMPTION) {
 	    	this.assetFlowCategory = OL_AssetFlowCategories.heatPumpElectricityConsumption_kW;
 	    } 
-	    
+	    */
 	    //this.activeProductionEnergyCarriers.add(this.energyCarrier);
 	    this.activeConsumptionEnergyCarriers.add(this.energyCarrier);
 	    
diff --git a/_alp/Classes/Class.J_TaxContract.java b/_alp/Classes/Class.J_TaxContract.java
index c95c3bb4..39c160af 100644
--- a/_alp/Classes/Class.J_TaxContract.java
+++ b/_alp/Classes/Class.J_TaxContract.java
@@ -23,7 +23,7 @@ public J_TaxContract(String contractScope, OL_EnergyCarriers energyCarrier, doub
 	    this.deliveryTax_eurpkWh = deliveryTax_eurpkWh;
 	    this.feedinTax_eurpkWh = feedinTax_eurpkWh;
 	    this.proportionalTax_pct = proportionalTax_pct;
-	    this.contractType = OL_ContractType.TAX;
+	    //this.contractType = OL_ContractType.TAX;
 	    this.annualFee_eur = annualFee_eur;
 	}
 }
\ No newline at end of file
diff --git a/_alp/Classes/Class.J_TransportContract.java b/_alp/Classes/Class.J_TransportContract.java
index 6e3473b5..fed50d22 100644
--- a/_alp/Classes/Class.J_TransportContract.java
+++ b/_alp/Classes/Class.J_TransportContract.java
@@ -25,7 +25,7 @@ public J_TransportContract(String contractScope, OL_TransportContractType transp
 	    this.transportContractType = transportContractType;
 	    this.bandwidthTreshold_kW = bandwidthTreshold_kW;
 	    this.bandwidthTariff_eurpkWh = bandwidthTariff_eurpkWh;
-	    this.contractType = OL_ContractType.TRANSPORT;
+	    //this.contractType = OL_ContractType.TRANSPORT;
 	    this.annualFee_eur = annualFee_eur;
 	}