diff --git a/Zero_engine.alpx b/Zero_engine.alpx
index f0ee1273..1b452e7b 100644
--- a/Zero_engine.alpx
+++ b/Zero_engine.alpx
@@ -1252,6 +1252,62 @@
 					<Name><![CDATA[HEAT_STORAGE]]></Name>
 				</Option>
 			</OptionList>
+			<OptionList>
+				<Id>1753968826411</Id>
+				<Name><![CDATA[OL_AssetFlowCategories]]></Name>
+				<Option>
+					<Id>1753968826412</Id>
+					<Name><![CDATA[fixedConsumptionElectric_kW]]></Name>
+				</Option>
+				<Option>
+					<Id>1753968826413</Id>
+					<Name><![CDATA[heatPumpElectricityConsumption_kW]]></Name>
+				</Option>
+				<Option>
+					<Id>1753968826414</Id>
+					<Name><![CDATA[evChargingPower_kW]]></Name>
+				</Option>
+				<Option>
+					<Id>1754291180994</Id>
+					<Name><![CDATA[V2GPower_kW]]></Name>
+				</Option>
+				<Option>
+					<Id>1753968826415</Id>
+					<Name><![CDATA[batteriesChargingPower_kW]]></Name>
+				</Option>
+				<Option>
+					<Id>1754291194949</Id>
+					<Name><![CDATA[batteriesDischargingPower_kW]]></Name>
+				</Option>
+				<Option>
+					<Id>1753968826416</Id>
+					<Name><![CDATA[electrolyserElectricityConsumption_kW]]></Name>
+				</Option>
+				<Option>
+					<Id>1753968826417</Id>
+					<Name><![CDATA[electricHobConsumption_kW]]></Name>
+				</Option>
+				<Option>
+					<Id>1753968826418</Id>
+					<Name><![CDATA[districtHeatDelivery_kW]]></Name>
+				</Option>
+				<Option>
+					<Id>1753968826419</Id>
+					<Name><![CDATA[pvProductionElectric_kW]]></Name>
+				</Option>
+				<Option>
+					<Id>1753968826420</Id>
+					<Name><![CDATA[windProductionElectric_kW]]></Name>
+				</Option>
+				<Option>
+					<Id>1753968826421</Id>
+					<Name><![CDATA[ptProductionHeat_kW]]></Name>
+				</Option>
+				<Option>
+					<Id>1753968826422</Id>
+					<Name><![CDATA[CHPProductionElectric_kW]]></Name>
+				</Option>
+			</OptionList>
 		</OptionLists>
 		<Folders>
 			<Folder>
@@ -1505,6 +1561,7 @@
 			<JavaClass>
 				<Id>1671107396262</Id>
 				<Name><![CDATA[J_EAConversionElektrolyser]]></Name>
+				<ExcludeFromBuild>true</ExcludeFromBuild>
 				<Folder>1752677832758</Folder>
 			</JavaClass>
 			<JavaClass>
@@ -1611,7 +1668,8 @@
 			</JavaClass>
 			<JavaClass>
 				<Id>1729510354900</Id>
-				<Name><![CDATA[J_AccumulatorMap]]></Name>
+				<Name><![CDATA[J_AssetFlowsAccumulatorMap]]></Name>
+				<ExcludeFromBuild>true</ExcludeFromBuild>
 				<Folder>1752679379816</Folder>
 			</JavaClass>
 			<JavaClass>
@@ -1755,6 +1813,8 @@
 			<JavaClass>
 				<Id>1753106536266</Id>
 				<Name><![CDATA[J_AssetFlows]]></Name>
+				<ExcludeFromBuild>true</ExcludeFromBuild>
+				<Folder>1752679379816</Folder>
 			</JavaClass>
 			<JavaClass>
 				<Id>1753199813037</Id>
@@ -1796,6 +1856,16 @@
 				<Name><![CDATA[ActorMixin]]></Name>
 				<Folder>1753342021373</Folder>
 			</JavaClass>
+			<JavaClass>
+				<Id>1753968339982</Id>
+				<Name><![CDATA[J_ValueMap]]></Name>
+				<Folder>1752679379816</Folder>
+			</JavaClass>
+			<JavaClass>
+				<Id>1754038055004</Id>
+				<Name><![CDATA[J_AccumulatorMap]]></Name>
+				<Folder>1752679379816</Folder>
+			</JavaClass>
 			<JavaClass>
 				<Id>1754405220949</Id>
 				<Name><![CDATA[J_HeatingManagementBuildingWithPTBufferSimple]]></Name>
diff --git a/_alp/Agents/EnergyCoop/Code/Functions.java b/_alp/Agents/EnergyCoop/Code/Functions.java
index 60448c50..70f005c4 100644
--- a/_alp/Agents/EnergyCoop/Code/Functions.java
+++ b/_alp/Agents/EnergyCoop/Code/Functions.java
@@ -176,26 +176,28 @@
 fm_currentProductionFlows_kW.clear();
 fm_currentConsumptionFlows_kW.clear();
 fm_currentBalanceFlows_kW.clear();
+fm_currentAssetFlows_kW.clear();
 v_currentPrimaryEnergyProduction_kW = 0;
 v_currentFinalEnergyConsumption_kW = 0;
 v_currentEnergyCurtailed_kW = 0;
+v_batteryStoredEnergy_kWh = 0;
 v_currentPrimaryEnergyProductionHeatpumps_kW = 0;
 
-v_assetFlows.reset();
 
 for(GridConnection gc : c_memberGridConnections) { // Can't do this in parallel due to different threads writing to the same values!
 	
 	fm_currentBalanceFlows_kW.addFlows(gc.fm_currentBalanceFlows_kW);
 	fm_currentProductionFlows_kW.addFlows(gc.fm_currentProductionFlows_kW);
 	fm_currentConsumptionFlows_kW.addFlows(gc.fm_currentConsumptionFlows_kW);
-
+	fm_currentAssetFlows_kW.addFlows(gc.fm_currentAssetFlows_kW);
 	v_currentFinalEnergyConsumption_kW += gc.v_currentFinalEnergyConsumption_kW;
 	v_currentPrimaryEnergyProduction_kW += gc.v_currentPrimaryEnergyProduction_kW;
 	v_currentEnergyCurtailed_kW += gc.v_currentEnergyCurtailed_kW;
+	v_batteryStoredEnergy_kWh += gc.v_batteryStoredEnergy_kWh;
 	v_currentPrimaryEnergyProductionHeatpumps_kW += gc.v_currentPrimaryEnergyProductionHeatpumps_kW;
 	v_currentOwnElectricityProduction_kW += gc.fm_currentProductionFlows_kW.get(OL_EnergyCarriers.ELECTRICITY);
 	 	
-	v_assetFlows.addFlows(gc.v_assetFlows);
+
 }
 
 // gather electricity flows
@@ -206,15 +208,16 @@
 		fm_currentBalanceFlows_kW.addFlows(EC.fm_currentBalanceFlows_kW);
 		fm_currentProductionFlows_kW.addFlows(EC.fm_currentProductionFlows_kW);
 		fm_currentConsumptionFlows_kW.addFlows(EC.fm_currentConsumptionFlows_kW);
-
+		fm_currentAssetFlows_kW.addFlows(EC.fm_currentAssetFlows_kW);
 		v_currentPrimaryEnergyProduction_kW += EC.v_currentPrimaryEnergyProduction_kW;
 		v_currentFinalEnergyConsumption_kW += EC.v_currentFinalEnergyConsumption_kW;
 		v_currentEnergyCurtailed_kW += EC.v_currentEnergyCurtailed_kW;
+		v_batteryStoredEnergy_kWh += EC.v_batteryStoredEnergy_kWh;
 		v_currentPrimaryEnergyProductionHeatpumps_kW += EC.v_currentPrimaryEnergyProductionHeatpumps_kW;
 		v_currentOwnElectricityProduction_kW += EC.fm_currentProductionFlows_kW.get(OL_EnergyCarriers.ELECTRICITY); 
 		
 		// Asset flows
-		v_assetFlows.addFlows(EC.v_assetFlows);
+		//v_assetFlows.addFlows(EC.v_assetFlows);
 	}
 }
 
@@ -224,6 +227,7 @@
 		fm_currentProductionFlows_kW.addFlow( energyCarrier, max(0, -nettConsumption_kW));
 		fm_currentConsumptionFlows_kW.addFlow( energyCarrier, max(0, nettConsumption_kW));
 		fm_currentBalanceFlows_kW.addFlow( energyCarrier, nettConsumption_kW);
+		
 		if (energyCarrier == OL_EnergyCarriers.ELECTRICITY) {
 			v_currentCustomerFeedIn_kW += max(0,-nettConsumption_kW);
 			v_currentCustomerDelivery_kW += max(0,nettConsumption_kW);
@@ -238,7 +242,7 @@
 		fm_currentBalanceFlows_kW.addFlows(EC.fm_currentBalanceFlows_kW);
 		fm_currentProductionFlows_kW.addFlows(EC.fm_currentProductionFlows_kW);
 		fm_currentConsumptionFlows_kW.addFlows(EC.fm_currentConsumptionFlows_kW);
-		
+		fm_currentAssetFlows_kW.addFlows(EC.fm_currentAssetFlows_kW);
 		v_currentCustomerFeedIn_kW += EC.v_currentCustomerFeedIn_kW;
 		v_currentCustomerDelivery_kW += EC.v_currentCustomerDelivery_kW;
 	}
@@ -589,6 +593,7 @@
 //========== LIVE WEEK DATASETS ==========//
 v_liveData.dsm_liveDemand_kW.createEmptyDataSets(v_activeConsumptionEnergyCarriers, roundToInt(168/energyModel.p_timeStep_h));
 v_liveData.dsm_liveSupply_kW.createEmptyDataSets(v_activeProductionEnergyCarriers, roundToInt(168/energyModel.p_timeStep_h));
+v_liveData.dsm_liveAssetFlows_kW.createEmptyDataSets(v_liveData.assetsMetaData.activeAssetFlows, (int)(168 / energyModel.p_timeStep_h));
 
 // Initializing Live Data Class
 v_liveAssetsMetaData.updateActiveAssetData(new ArrayList<>(f_getAllChildMemberGridConnections()));
@@ -768,11 +773,12 @@
 	fm_currentBalanceFlows_kW,
 	fm_currentConsumptionFlows_kW,
 	fm_currentProductionFlows_kW,
+	fm_currentAssetFlows_kW,
 	v_currentPrimaryEnergyProduction_kW, 
 	v_currentFinalEnergyConsumption_kW, 
 	v_currentPrimaryEnergyProductionHeatpumps_kW, 
 	v_currentEnergyCurtailed_kW, 
-	v_assetFlows 
+	v_batteryStoredEnergy_kWh/1000 
 );
 /*
 	//Current timestep
@@ -1121,7 +1127,7 @@
 f_getTotalInstalledCapacityOfAssets_rapidRun();
 
 //Recalculate SOC ts for energycoop
-f_recalculateSOC_rapidrun();
+//f_recalculateSOC_rapidrun();
 
 /*ALCODEEND*/}
 
@@ -1309,6 +1315,11 @@ HashSet<GridConnection> f_getAllChildCustomerGridConnections_recursion(HashSet<G
 double f_collectAssetSpecificEnergyFlows_rapidRun()
 {/*ALCODESTART::1740502128178*/
 for (GridConnection gc : c_memberGridConnections) {
+	v_rapidRunData.am_assetFlowsAccumulators_kW.add(gc.v_rapidRunData.am_assetFlowsAccumulators_kW);
+	v_rapidRunData.am_assetFlowsSummerWeek_kW.add(gc.v_rapidRunData.am_assetFlowsSummerWeek_kW);
+	v_rapidRunData.am_assetFlowsWinterWeek_kW.add(gc.v_rapidRunData.am_assetFlowsWinterWeek_kW);
+	
+	/*
 	v_rapidRunData.acc_dailyAverageBaseloadElectricityConsumption_kW.add(gc.v_rapidRunData.acc_dailyAverageBaseloadElectricityConsumption_kW);
 	v_rapidRunData.acc_dailyAverageHeatPumpElectricityConsumption_kW.add(gc.v_rapidRunData.acc_dailyAverageHeatPumpElectricityConsumption_kW);
 	v_rapidRunData.acc_dailyAverageElectricVehicleConsumption_kW.add(gc.v_rapidRunData.acc_dailyAverageElectricVehicleConsumption_kW);
@@ -1353,6 +1364,7 @@ HashSet<GridConnection> f_getAllChildCustomerGridConnections_recursion(HashSet<G
 	v_rapidRunData.acc_winterWeekBatteriesProduction_kW.add(gc.v_rapidRunData.acc_winterWeekBatteriesProduction_kW);
 	v_rapidRunData.acc_winterWeekCHPElectricityProduction_kW.add(gc.v_rapidRunData.acc_winterWeekCHPElectricityProduction_kW);
 	v_rapidRunData.ts_winterWeekBatteriesStoredEnergy_MWh.add(gc.v_rapidRunData.ts_winterWeekBatteriesStoredEnergy_MWh);
+	*/
 }
 
 /*ALCODEEND*/}
@@ -1369,64 +1381,35 @@ HashSet<GridConnection> f_getAllChildCustomerGridConnections_recursion(HashSet<G
 	
 	// Demand
 	J_FlowsMap fm_demand_kW = new J_FlowsMap();
+	J_ValueMap<OL_AssetFlowCategories> fm_currentAssetFlows_kW = new J_ValueMap(OL_AssetFlowCategories.class);
 	
 	double electricityDemandCapacityLiveWeek_kW = 0;
 	double electricitySupplyCapacityLiveWeek_kW = 0;
 	double netLoadLiveWeek_kW = 0;
-	
-	double baseloadElectricityDemandLiveWeek_kW = 0;
-	double electricityForHeatDemandLiveWeek_kW = 0;
-	double electricityForTransportDemandLiveWeek_kW = 0;
-	double petroleumProductsDemandLiveWeek_kW = 0;
-	double naturalGasDemandLiveWeek_kW = 0;
-	double electricityForStorageDemandLiveWeek_kW = 0;
-	double electricityForHydrogenDemandLiveWeek_kW = 0;
-	double electricityForCookingConsumptionLiveWeek_kW = 0;
-	
+
 	double districtHeatingDemandLiveWeek_kW = 0;
 	
 	// Supply
 	J_FlowsMap fm_supply_kW = new J_FlowsMap();
 
-	double PVElectricitySupplyLiveWeek_kW = 0;
-	double windElectricitySupplyLiveWeek_kW = 0;
-	double PTHeatSupplyLiveWeek_kW = 0;
-	double storageElectricitySupplyLiveWeek_kW = 0;
-	double V2GElectricitySupplyLiveWeek_kW = 0;
-	double hydrogenSupplyLiveWeek_kW = 0;
-	double CHPElectricitySupplyLiveWeek_kW = 0;
-	
 	//Other
 	double batteryStoredEnergyLiveWeek_MWh = 0;
 	
 	for (GridConnection gc : gcList){
 		for (OL_EnergyCarriers EC_consumption : gc.v_activeConsumptionEnergyCarriers) {
-			fm_demand_kW.addFlow( EC_consumption, gc.v_liveData.dsm_liveDemand_kW.get(EC_consumption).getY(i));
+			fm_demand_kW.addFlow( EC_consumption, gc.v_liveData.dsm_liveDemand_kW.get(EC_consumption).getY(i));			
 		}
 		for (OL_EnergyCarriers EC_production : gc.v_activeProductionEnergyCarriers) {
 			fm_supply_kW.addFlow( EC_production, gc.v_liveData.dsm_liveSupply_kW.get(EC_production).getY(i));
 		}
+		for (OL_AssetFlowCategories AC : gc.v_liveAssetsMetaData.activeAssetFlows) {
+			fm_currentAssetFlows_kW.addFlow(AC, gc.v_liveData.dsm_liveAssetFlows_kW.get(AC).getY(i));
+		}
 		
 		electricityDemandCapacityLiveWeek_kW += gc.v_liveData.data_gridCapacityDemand_kW.getY(i);
 		electricitySupplyCapacityLiveWeek_kW += gc.v_liveData.data_gridCapacitySupply_kW.getY(i);
 		netLoadLiveWeek_kW  += gc.v_liveData.data_liveElectricityBalance_kW.getY(i);
-	
-		baseloadElectricityDemandLiveWeek_kW  += gc.v_liveData.data_baseloadElectricityDemand_kW.getY(i);
-		electricityForHeatDemandLiveWeek_kW  += gc.v_liveData.data_heatPumpElectricityDemand_kW.getY(i);
-		electricityForTransportDemandLiveWeek_kW += gc.v_liveData.data_electricVehicleDemand_kW.getY(i);
-		electricityForStorageDemandLiveWeek_kW  += gc.v_liveData.data_batteryCharging_kW.getY(i);
-		electricityForHydrogenDemandLiveWeek_kW  += gc.v_liveData.data_hydrogenElectricityDemand_kW.getY(i);
-		electricityForCookingConsumptionLiveWeek_kW += gc.v_liveData.data_cookingElectricityDemand_kW.getY(i);
-		districtHeatingDemandLiveWeek_kW += gc.v_liveData.data_districtHeatDelivery_kW.getY(i);
-		
-		// Supply
-		windElectricitySupplyLiveWeek_kW  += gc.v_liveData.data_windGeneration_kW.getY(i);
-		PVElectricitySupplyLiveWeek_kW  += gc.v_liveData.data_PVGeneration_kW.getY(i);
-		PTHeatSupplyLiveWeek_kW += gc.v_liveData.data_PTGeneration_kW.getY(i);
-		storageElectricitySupplyLiveWeek_kW  += gc.v_liveData.data_batteryDischarging_kW.getY(i);
-		V2GElectricitySupplyLiveWeek_kW  += gc.v_liveData.data_V2GSupply_kW.getY(i);
-		CHPElectricitySupplyLiveWeek_kW  += gc.v_liveData.data_CHPElectricityProductionLiveWeek_kW.getY(i);
-		
+
 		//Other 
 		batteryStoredEnergyLiveWeek_MWh += 	gc.v_liveData.data_batteryStoredEnergyLiveWeek_MWh.getY(i);
 	}
@@ -1438,27 +1421,14 @@ HashSet<GridConnection> f_getAllChildCustomerGridConnections_recursion(HashSet<G
 		v_liveData.dsm_liveSupply_kW.get(EC_production).add(timeAxisValue, roundToDecimal(fm_supply_kW.get(EC_production), 3));
 	}
 	
-		
+	for (OL_AssetFlowCategories AC : fm_currentAssetFlows_kW.keySet()) {
+		v_liveData.dsm_liveAssetFlows_kW.get(AC).add(timeAxisValue, fm_currentAssetFlows_kW.get(AC));
+	}
+	
 	v_liveData.data_gridCapacityDemand_kW.add(timeAxisValue, electricityDemandCapacityLiveWeek_kW);
 	v_liveData.data_gridCapacitySupply_kW.add(timeAxisValue, electricitySupplyCapacityLiveWeek_kW);
 	v_liveData.data_liveElectricityBalance_kW.add(timeAxisValue, netLoadLiveWeek_kW);
-	
-	v_liveData.data_baseloadElectricityDemand_kW.add(timeAxisValue, roundToDecimal(baseloadElectricityDemandLiveWeek_kW, 3));
-	v_liveData.data_heatPumpElectricityDemand_kW.add(timeAxisValue, roundToDecimal(electricityForHeatDemandLiveWeek_kW, 3));
-	v_liveData.data_electricVehicleDemand_kW.add(timeAxisValue, roundToDecimal(electricityForTransportDemandLiveWeek_kW, 3));
-	v_liveData.data_batteryCharging_kW.add(timeAxisValue, roundToDecimal(electricityForStorageDemandLiveWeek_kW, 3));
-	v_liveData.data_hydrogenElectricityDemand_kW.add(timeAxisValue, roundToDecimal(electricityForHydrogenDemandLiveWeek_kW, 3));
-	v_liveData.data_cookingElectricityDemand_kW.add(timeAxisValue, roundToDecimal(electricityForCookingConsumptionLiveWeek_kW, 3));
-	v_liveData.data_districtHeatDelivery_kW.add(timeAxisValue, roundToDecimal(districtHeatingDemandLiveWeek_kW, 3));
-	
-	// Supply
-	v_liveData.data_PVGeneration_kW.add(timeAxisValue, roundToDecimal(PVElectricitySupplyLiveWeek_kW, 3));
-	v_liveData.data_windGeneration_kW.add(timeAxisValue, roundToDecimal(windElectricitySupplyLiveWeek_kW, 3));
-	v_liveData.data_PTGeneration_kW.add(timeAxisValue, roundToDecimal(PTHeatSupplyLiveWeek_kW, 3));
-	v_liveData.data_batteryDischarging_kW.add(timeAxisValue, roundToDecimal(storageElectricitySupplyLiveWeek_kW, 3));
-	v_liveData.data_V2GSupply_kW.add(timeAxisValue, roundToDecimal(V2GElectricitySupplyLiveWeek_kW, 3));
-	v_liveData.data_CHPElectricityProductionLiveWeek_kW.add(timeAxisValue, roundToDecimal(CHPElectricitySupplyLiveWeek_kW, 3));
-	
+
 	//Stored
 	v_liveData.data_batteryStoredEnergyLiveWeek_MWh.add(timeAxisValue, batteryStoredEnergyLiveWeek_MWh);
 }
@@ -1483,11 +1453,12 @@ HashSet<GridConnection> f_getAllChildCustomerGridConnections_recursion(HashSet<G
 v_rapidRunData.addTimeStep(fm_currentBalanceFlows_kW, 
 							fm_currentConsumptionFlows_kW, 
 							fm_currentProductionFlows_kW, 
+							fm_currentAssetFlows_kW,
 							v_currentPrimaryEnergyProduction_kW, 
 							v_currentFinalEnergyConsumption_kW, 
 							v_currentPrimaryEnergyProductionHeatpumps_kW, 
 							v_currentEnergyCurtailed_kW, 
-							v_assetFlows, 
+							v_batteryStoredEnergy_kWh/1000, 
 							energyModel);
 /*ALCODEEND*/}
 
@@ -1502,15 +1473,15 @@ HashSet<GridConnection> f_getAllChildCustomerGridConnections_recursion(HashSet<G
 	//Connect to coop
 	coopBattery.c_parentCoops.add(this);
 	c_memberGridConnections.add(coopBattery);
-	v_liveAssetsMetaData.hasBattery = true;
+	//v_liveAssetsMetaData.hasBattery = true;
 }
 /*ALCODEEND*/}
 
 double f_recalculateSOC_rapidrun()
 {/*ALCODESTART::1744211126429*/
-double[] dailyAverageBatteriesSOC_fr = new double[v_rapidRunData.ts_dailyAverageBatteriesSOC_fr.getLength()];
-double[] summerWeekBatteriesSOC_fr = new double[v_rapidRunData.ts_summerWeekBatteriesSOC_fr.getLength()];
-double[] winterWeekBatteriesSOC_fr = new double[v_rapidRunData.ts_winterWeekBatteriesSOC_fr.getLength()];
+double[] dailyAverageBatteriesSOC_fr = new double[v_rapidRunData.ts_dailyAverageBatteriesStoredEnergy_MWh.getLength()];
+double[] summerWeekBatteriesSOC_fr = new double[v_rapidRunData.ts_dailyAverageBatteriesStoredEnergy_MWh.getLength()];
+double[] winterWeekBatteriesSOC_fr = new double[v_rapidRunData.ts_dailyAverageBatteriesStoredEnergy_MWh.getLength()];
 
 double totalInstalledBatteryStorageCapacity_MWh = v_rapidRunData.assetsMetaData.totalInstalledBatteryStorageCapacity_MWh;
 
@@ -1603,3 +1574,69 @@ HashSet<GridConnection> f_getAllChildCustomerGridConnections_recursion(HashSet<G
 v_liveData.assetsMetaData = v_liveAssetsMetaData;
 /*ALCODEEND*/}
 
+EnergyCoop f_addConsumptionEnergyCarrier(OL_EnergyCarriers EC)
+{/*ALCODESTART::1754380102233*/
+if (!v_activeConsumptionEnergyCarriers.contains(EC)) {
+	v_activeEnergyCarriers.add(EC);
+	v_activeConsumptionEnergyCarriers.add(EC);
+	
+	DataSet dsDemand = new DataSet( (int)(168 / energyModel.p_timeStep_h) );
+	
+	double startTime = v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMin();
+	double endTime = v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMax();
+	for (double t = startTime; t <= endTime; t += energyModel.p_timeStep_h) {
+		dsDemand.add( t, 0);
+	}
+	v_liveData.dsm_liveDemand_kW.put( EC, dsDemand);
+}
+/*ALCODEEND*/}
+
+EnergyCoop f_addProductionEnergyCarrier(OL_EnergyCarriers EC)
+{/*ALCODESTART::1754380102235*/
+if (!v_activeProductionEnergyCarriers.contains(EC)) {
+	v_activeEnergyCarriers.add(EC);
+	v_activeProductionEnergyCarriers.add(EC);
+	
+	DataSet dsSupply = new DataSet( (int)(168 / energyModel.p_timeStep_h) );
+	double startTime = v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMin();
+	double endTime = v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMax();
+	for (double t = startTime; t <= endTime; t += energyModel.p_timeStep_h) {
+		dsSupply.add( t, 0);
+	}
+	v_liveData.dsm_liveSupply_kW.put( EC, dsSupply);
+}
+/*ALCODEEND*/}
+
+EnergyCoop f_addAssetFlow(OL_AssetFlowCategories AC)
+{/*ALCODESTART::1754380102237*/
+if (!v_liveAssetsMetaData.activeAssetFlows.contains(AC)) {
+	v_liveAssetsMetaData.activeAssetFlows.add(AC);
+	
+	DataSet dsAsset = new DataSet( (int)(168 / energyModel.p_timeStep_h) );
+	
+	double startTime = v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMin();
+	double endTime = v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMax();
+	for (double t = startTime; t <= endTime; t += energyModel.p_timeStep_h) {
+		dsAsset.add( t, 0);
+	}
+	v_liveData.dsm_liveAssetFlows_kW.put( AC, dsAsset);
+	
+	if (AC == OL_AssetFlowCategories.batteriesChargingPower_kW) { // also add batteriesDischarging!
+		dsAsset = new DataSet( (int)(168 / energyModel.p_timeStep_h) );
+		
+		for (double t = startTime; t <= endTime; t += energyModel.p_timeStep_h) {
+			dsAsset.add( t, 0);
+		}
+		v_liveData.dsm_liveAssetFlows_kW.put( OL_AssetFlowCategories.batteriesDischargingPower_kW, dsAsset);
+	}
+	if (AC == OL_AssetFlowCategories.V2GPower_kW && !v_liveAssetsMetaData.activeAssetFlows.contains(OL_AssetFlowCategories.evChargingPower_kW)) { // also add evCharging!
+		dsAsset = new DataSet( (int)(168 / energyModel.p_timeStep_h) );
+		
+		for (double t = startTime; t <= endTime; t += energyModel.p_timeStep_h) {
+			dsAsset.add( t, 0);
+		}
+		v_liveData.dsm_liveAssetFlows_kW.put( OL_AssetFlowCategories.evChargingPower_kW, dsAsset);
+	}			
+}
+/*ALCODEEND*/}
+
diff --git a/_alp/Agents/EnergyCoop/Code/Functions.xml b/_alp/Agents/EnergyCoop/Code/Functions.xml
index 63fe254b..0749cce1 100644
--- a/_alp/Agents/EnergyCoop/Code/Functions.xml
+++ b/_alp/Agents/EnergyCoop/Code/Functions.xml
@@ -586,6 +586,7 @@
 		<ReturnType>double</ReturnType>
 		<Id>1744211126429</Id>
 		<Name><![CDATA[f_recalculateSOC_rapidrun]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>1010</X>
 		<Y>270</Y>
 		<Label>
@@ -645,4 +646,64 @@
 		<ShowLabel>true</ShowLabel>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
+	<Function AccessType="public" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>EnergyCoop</ReturnType>
+		<Id>1754380102233</Id>
+		<Name><![CDATA[f_addConsumptionEnergyCarrier]]></Name>
+		<X>1438</X>
+		<Y>536</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[EC]]></Name>
+			<Type><![CDATA[OL_EnergyCarriers]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="public" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>EnergyCoop</ReturnType>
+		<Id>1754380102235</Id>
+		<Name><![CDATA[f_addProductionEnergyCarrier]]></Name>
+		<X>1438</X>
+		<Y>556</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[EC]]></Name>
+			<Type><![CDATA[OL_EnergyCarriers]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="public" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>EnergyCoop</ReturnType>
+		<Id>1754380102237</Id>
+		<Name><![CDATA[f_addAssetFlow]]></Name>
+		<X>1438</X>
+		<Y>576</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[AC]]></Name>
+			<Type><![CDATA[OL_AssetFlowCategories]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
 </Functions>
diff --git a/_alp/Agents/EnergyCoop/Variables.xml b/_alp/Agents/EnergyCoop/Variables.xml
index b5bc3dc7..788bed8e 100644
--- a/_alp/Agents/EnergyCoop/Variables.xml
+++ b/_alp/Agents/EnergyCoop/Variables.xml
@@ -923,7 +923,7 @@
 		<Id>1709644748300</Id>
 		<Name><![CDATA[v_currentOwnElectricityProduction_kW]]></Name>
 		<X>60</X>
-		<Y>1300</Y>
+		<Y>1320</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -964,7 +964,7 @@
 		<Id>1730133371154</Id>
 		<Name><![CDATA[v_currentCustomerFeedIn_kW]]></Name>
 		<X>60</X>
-		<Y>1340</Y>
+		<Y>1360</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1150,7 +1150,7 @@
 		<Id>1731400607488</Id>
 		<Name><![CDATA[v_currentCustomerDelivery_kW]]></Name>
 		<X>60</X>
-		<Y>1320</Y>
+		<Y>1340</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1535,6 +1535,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1753111072241</Id>
 		<Name><![CDATA[v_assetFlows]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>60</X>
 		<Y>1160</Y>
 		<Label>
@@ -1554,6 +1555,47 @@
 			</InitialValue>
 		</Properties>
 	</Variable>
+	<Variable Class="PlainVariable">
+		<Id>1753970982500</Id>
+		<Name><![CDATA[fm_currentAssetFlows_kW]]></Name>
+		<X>202</X>
+		<Y>1161</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[J_ValueMap]]></Type>
+			<InitialValue Class="CodeValue">
+				<Code><![CDATA[new J_ValueMap(OL_AssetFlowCategories.class)]]></Code>
+			</InitialValue>
+		</Properties>
+	</Variable>
+	<Variable Class="PlainVariable">
+		<Id>1754320819135</Id>
+		<Name><![CDATA[v_batteryStoredEnergy_kWh]]></Name>
+		<X>60</X>
+		<Y>1290</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="Parameter">
 		<Id>1669037234222</Id>
 		<Name><![CDATA[p_actorContractList]]></Name>
diff --git a/_alp/Agents/EnergyDataViewer/Code/Functions.java b/_alp/Agents/EnergyDataViewer/Code/Functions.java
index a8d21707..57e68191 100644
--- a/_alp/Agents/EnergyDataViewer/Code/Functions.java
+++ b/_alp/Agents/EnergyDataViewer/Code/Functions.java
@@ -17,14 +17,14 @@
 fm_weekendExports_MWh = new J_FlowsMap();
 
 // DataSetMaps
-dsm_liveConsumption_kW = new J_DataSetMap();
-dsm_liveProduction_kW = new J_DataSetMap();
-dsm_dailyAverageConsumptionDataSets_kW = new J_DataSetMap();
-dsm_dailyAverageProductionDataSets_kW = new J_DataSetMap();
-dsm_summerWeekConsumptionDataSets_kW = new J_DataSetMap();
-dsm_summerWeekProductionDataSets_kW = new J_DataSetMap();
-dsm_winterWeekConsumptionDataSets_kW = new J_DataSetMap();
-dsm_winterWeekProductionDataSets_kW = new J_DataSetMap();
+dsm_liveConsumption_kW = new J_DataSetMap(OL_EnergyCarriers.class);
+dsm_liveProduction_kW = new J_DataSetMap(OL_EnergyCarriers.class);
+dsm_dailyAverageConsumptionDataSets_kW = new J_DataSetMap(OL_EnergyCarriers.class);
+dsm_dailyAverageProductionDataSets_kW = new J_DataSetMap(OL_EnergyCarriers.class);
+dsm_summerWeekConsumptionDataSets_kW = new J_DataSetMap(OL_EnergyCarriers.class);
+dsm_summerWeekProductionDataSets_kW = new J_DataSetMap(OL_EnergyCarriers.class);
+dsm_winterWeekConsumptionDataSets_kW = new J_DataSetMap(OL_EnergyCarriers.class);
+dsm_winterWeekProductionDataSets_kW = new J_DataSetMap(OL_EnergyCarriers.class);
 
 /*ALCODEEND*/}
 
@@ -62,7 +62,8 @@
 v_activeProductionEnergyCarriers = data.getLiveData().activeProductionEnergyCarriers;
 
 //Update active asset booleans
-f_updateLiveActiveAssetBooleans(data);
+//f_updateLiveActiveAssetBooleans(data);
+v_activeAssetFlows = data.getLiveData().assetsMetaData.activeAssetFlows;
 
 //Update variables
 f_updateVariables(data);
@@ -265,6 +266,8 @@
 //Datasets for live charts
 //========== CONSUMPTION ==========//
 dsm_liveConsumption_kW = data.getLiveData().dsm_liveDemand_kW;
+dsm_liveAssetFlowsAccumulators_kW = data.getLiveData().dsm_liveAssetFlows_kW;
+/*
 v_dataElectricityBaseloadConsumptionLiveWeek_kW = data.getLiveData().data_baseloadElectricityDemand_kW;
 v_dataElectricityForHeatConsumptionLiveWeek_kW = data.getLiveData().data_heatPumpElectricityDemand_kW;
 v_dataElectricityForTransportConsumptionLiveWeek_kW = data.getLiveData().data_electricVehicleDemand_kW;
@@ -272,15 +275,16 @@
 v_dataElectricityForHydrogenConsumptionLiveWeek_kW = data.getLiveData().data_hydrogenElectricityDemand_kW;
 v_dataElectricityForCookingConsumptionLiveWeek_kW = data.getLiveData().data_cookingElectricityDemand_kW;
 v_dataDistrictHeatConsumptionLiveWeek_kW = data.getLiveData().data_districtHeatDelivery_kW;
-
+*/
 //========== PRODUCTION ==========//
 dsm_liveProduction_kW = data.getLiveData().dsm_liveSupply_kW;
+/*
 v_dataWindElectricityProductionLiveWeek_kW = data.getLiveData().data_windGeneration_kW;
 v_dataPVElectricityProductionLiveWeek_kW = data.getLiveData().data_PVGeneration_kW;
 v_dataStorageElectricityProductionLiveWeek_kW = data.getLiveData().data_batteryDischarging_kW;
 v_dataV2GElectricityProductionLiveWeek_kW = data.getLiveData().data_V2GSupply_kW;
 v_dataCHPElectricityProductionLiveWeek_kW = data.getLiveData().data_CHPElectricityProductionLiveWeek_kW;
-
+*/
 //SOC
 v_dataBatterySOCLiveWeek_fr.reset();
 for (int i = 0; i < data.getLiveData().data_batteryStoredEnergyLiveWeek_MWh.size(); i++) {
@@ -310,6 +314,10 @@
 // Consumption
 double summerWeekStartTime_h = energyModel.p_startOfSummerWeek_h - energyModel.p_runStartTime_h;
 dsm_summerWeekConsumptionDataSets_kW = data.getRapidRunData().am_summerWeekConsumptionAccumulators_kW.getDataSetMap(summerWeekStartTime_h);
+for (OL_AssetFlowCategories AC : data.getRapidRunData().am_assetFlowsSummerWeek_kW.keySet()) {
+	dsm_assetFlowsSummerWeek_kW.put(AC, data.getRapidRunData().am_assetFlowsSummerWeek_kW.get(AC).getDataSet(summerWeekStartTime_h));
+}
+/*
 v_dataElectricityBaseloadConsumptionSummerWeek_kW = data.getRapidRunData().acc_summerWeekBaseloadElectricityConsumption_kW.getDataSet(summerWeekStartTime_h);
 v_dataElectricityForHeatConsumptionSummerWeek_kW = data.getRapidRunData().acc_summerWeekHeatPumpElectricityConsumption_kW.getDataSet(summerWeekStartTime_h);
 v_dataElectricityForTransportConsumptionSummerWeek_kW = data.getRapidRunData().acc_summerWeekElectricVehicleConsumption_kW.getDataSet(summerWeekStartTime_h);
@@ -317,15 +325,16 @@
 v_dataElectricityForCookingConsumptionSummerWeek_kW = data.getRapidRunData().acc_summerWeekElectricCookingConsumption_kW.getDataSet(summerWeekStartTime_h);
 v_dataElectricityForHydrogenConsumptionSummerWeek_kW = data.getRapidRunData().acc_summerWeekElectrolyserElectricityConsumption_kW.getDataSet(summerWeekStartTime_h);
 v_dataDistrictHeatConsumptionSummerWeek_kW = data.getRapidRunData().acc_summerWeekDistrictHeatingConsumption_kW.getDataSet(summerWeekStartTime_h);
-
+*/
 // Production
 dsm_summerWeekProductionDataSets_kW = data.getRapidRunData().am_summerWeekProductionAccumulators_kW.getDataSetMap(summerWeekStartTime_h);
+/*
 v_dataElectricityWindProductionSummerWeek_kW = data.getRapidRunData().acc_summerWeekWindProduction_kW.getDataSet(summerWeekStartTime_h);
 v_dataElectricityPVProductionSummerWeek_kW = data.getRapidRunData().acc_summerWeekPVProduction_kW.getDataSet(summerWeekStartTime_h);
 v_dataElectricityStorageProductionSummerWeek_kW = data.getRapidRunData().acc_summerWeekBatteriesProduction_kW.getDataSet(summerWeekStartTime_h);
 v_dataElectricityV2GProductionSummerWeek_kW = data.getRapidRunData().acc_summerWeekV2GProduction_kW.getDataSet(summerWeekStartTime_h);
 v_dataElectricityCHPProductionSummerWeek_kW = data.getRapidRunData().acc_summerWeekCHPElectricityProduction_kW.getDataSet(summerWeekStartTime_h);
-
+*/
 // Other
 v_dataNetLoadSummerWeek_kW = data.getRapidRunData().am_summerWeekBalanceAccumulators_kW.get(OL_EnergyCarriers.ELECTRICITY).getDataSet(summerWeekStartTime_h);
 
@@ -347,22 +356,27 @@
 // Consumption
 double winterWeekStartTime_h = energyModel.p_startOfWinterWeek_h - energyModel.p_runStartTime_h;
 dsm_winterWeekConsumptionDataSets_kW = data.getRapidRunData().am_winterWeekConsumptionAccumulators_kW.getDataSetMap(winterWeekStartTime_h);
-v_dataElectricityBaseloadConsumptionWinterWeek_kW = data.getRapidRunData().acc_winterWeekBaseloadElectricityConsumption_kW.getDataSet(winterWeekStartTime_h);
+for (OL_AssetFlowCategories AC : data.getRapidRunData().am_assetFlowsWinterWeek_kW.keySet()) {
+	dsm_assetFlowsWinterWeek_kW.put(AC, data.getRapidRunData().am_assetFlowsWinterWeek_kW.get(AC).getDataSet(winterWeekStartTime_h));
+}
+
+/*v_dataElectricityBaseloadConsumptionWinterWeek_kW = data.getRapidRunData().acc_winterWeekBaseloadElectricityConsumption_kW.getDataSet(winterWeekStartTime_h);
 v_dataElectricityForHeatConsumptionWinterWeek_kW = data.getRapidRunData().acc_winterWeekHeatPumpElectricityConsumption_kW.getDataSet(winterWeekStartTime_h);
 v_dataElectricityForTransportConsumptionWinterWeek_kW = data.getRapidRunData().acc_winterWeekElectricVehicleConsumption_kW.getDataSet(winterWeekStartTime_h);
 v_dataElectricityForStorageConsumptionWinterWeek_kW = data.getRapidRunData().acc_winterWeekBatteriesConsumption_kW.getDataSet(winterWeekStartTime_h);
 v_dataElectricityForCookingConsumptionWinterWeek_kW = data.getRapidRunData().acc_winterWeekElectricCookingConsumption_kW.getDataSet(winterWeekStartTime_h);
 v_dataElectricityForHydrogenConsumptionWinterWeek_kW = data.getRapidRunData().acc_winterWeekElectrolyserElectricityConsumption_kW.getDataSet(winterWeekStartTime_h);
 v_dataDistrictHeatConsumptionWinterWeek_kW = data.getRapidRunData().acc_winterWeekDistrictHeatingConsumption_kW.getDataSet(winterWeekStartTime_h);
-
+*/
 // Production
 dsm_winterWeekProductionDataSets_kW = data.getRapidRunData().am_winterWeekProductionAccumulators_kW.getDataSetMap(winterWeekStartTime_h);
+/*
 v_dataElectricityWindProductionWinterWeek_kW = data.getRapidRunData().acc_winterWeekWindProduction_kW.getDataSet(winterWeekStartTime_h);
 v_dataElectricityPVProductionWinterWeek_kW = data.getRapidRunData().acc_winterWeekPVProduction_kW.getDataSet(winterWeekStartTime_h);
 v_dataElectricityStorageProductionWinterWeek_kW = data.getRapidRunData().acc_winterWeekBatteriesProduction_kW.getDataSet(winterWeekStartTime_h);
 v_dataElectricityV2GProductionWinterWeek_kW = data.getRapidRunData().acc_winterWeekV2GProduction_kW.getDataSet(winterWeekStartTime_h);
 v_dataElectricityCHPProductionWinterWeek_kW = data.getRapidRunData().acc_winterWeekCHPElectricityProduction_kW.getDataSet(winterWeekStartTime_h);
-
+*/
 // Other
 v_dataNetLoadWinterWeek_kW = data.getRapidRunData().am_winterWeekBalanceAccumulators_kW.get(OL_EnergyCarriers.ELECTRICITY).getDataSet(winterWeekStartTime_h);
 
@@ -388,6 +402,8 @@
 double startTime_h = energyModel.p_runStartTime_h;
 dsm_dailyAverageConsumptionDataSets_kW = data.getRapidRunData().am_dailyAverageConsumptionAccumulators_kW.getDataSetMap(startTime_h);
 dsm_dailyAverageProductionDataSets_kW = data.getRapidRunData().am_dailyAverageProductionAccumulators_kW.getDataSetMap(startTime_h);
+dsm_assetFlowsAccumulators_kW = data.getRapidRunData().am_assetFlowsAccumulators_kW.getDataSetMap(startTime_h);
+/*
 v_dataElectricityBaseloadConsumptionYear_kW = data.getRapidRunData().acc_dailyAverageBaseloadElectricityConsumption_kW.getDataSet(startTime_h);
 v_dataElectricityForHeatConsumptionYear_kW = data.getRapidRunData().acc_dailyAverageHeatPumpElectricityConsumption_kW.getDataSet(startTime_h);
 v_dataElectricityForTransportConsumptionYear_kW = data.getRapidRunData().acc_dailyAverageElectricVehicleConsumption_kW.getDataSet(startTime_h);
@@ -395,15 +411,17 @@
 v_dataElectricityForHydrogenConsumptionYear_kW = data.getRapidRunData().acc_dailyAverageElectrolyserElectricityConsumption_kW.getDataSet(startTime_h);
 v_dataElectricityForCookingConsumptionYear_kW = data.getRapidRunData().acc_dailyAverageElectricCookingConsumption_kW.getDataSet(startTime_h);
 v_dataDistrictHeatConsumptionYear_kW = data.getRapidRunData().acc_dailyAverageDistrictHeatingConsumption_kW.getDataSet(startTime_h);
+*/
 data_dailyAverageFinalEnergyConsumption_kW = data.getRapidRunData().acc_dailyAverageFinalEnergyConsumption_kW.getDataSet(startTime_h);
 
 //Supply
+/*
 v_dataElectricityWindProductionYear_kW = data.getRapidRunData().acc_dailyAverageWindProduction_kW.getDataSet(startTime_h);
 v_dataElectricityPVProductionYear_kW = data.getRapidRunData().acc_dailyAveragePVProduction_kW.getDataSet(startTime_h);
 v_dataElectricityStorageProductionYear_kW = data.getRapidRunData().acc_dailyAverageBatteriesProduction_kW.getDataSet(startTime_h);
 v_dataElectricityV2GProductionYear_kW = data.getRapidRunData().acc_dailyAverageV2GProduction_kW.getDataSet(startTime_h);
 v_dataElectricityCHPProductionYear_kW = data.getRapidRunData().acc_dailyAverageCHPElectricityProduction_kW.getDataSet(startTime_h);
-
+*/
 DataSet totalBatteryStorage = data.getRapidRunData().ts_dailyAverageBatteriesStoredEnergy_MWh.getDataSet(startTime_h);
 v_dataBatterySOCYear_fr.reset();
 for (int i = 0; i < totalBatteryStorage.size(); i++) {
diff --git a/_alp/Agents/EnergyDataViewer/Code/Functions.xml b/_alp/Agents/EnergyDataViewer/Code/Functions.xml
index fb959ed8..bb6324ed 100644
--- a/_alp/Agents/EnergyDataViewer/Code/Functions.xml
+++ b/_alp/Agents/EnergyDataViewer/Code/Functions.xml
@@ -179,6 +179,7 @@
 		<ReturnType>double</ReturnType>
 		<Id>1741858724892</Id>
 		<Name><![CDATA[f_updateLiveActiveAssetBooleans]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>1246</X>
 		<Y>-130</Y>
 		<Label>
diff --git a/_alp/Agents/EnergyDataViewer/Levels/Level.level.xml b/_alp/Agents/EnergyDataViewer/Levels/Level.level.xml
index 42c66217..cbdcd433 100644
--- a/_alp/Agents/EnergyDataViewer/Levels/Level.level.xml
+++ b/_alp/Agents/EnergyDataViewer/Levels/Level.level.xml
@@ -453,31 +453,6 @@
 		</Font>
 		<Alignment>LEFT</Alignment>
 	</Text>
-	<Text>
-		<Id>1741792546483</Id>
-		<Name><![CDATA[txt_yearProductionElectricity]]></Name>
-		<X>176</X>
-		<Y>955</Y>
-		<Label>
-			<X>0</X>
-			<Y>-10</Y>
-		</Label>
-		<PublicFlag>true</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>false</ShowLabel>
-		<DrawMode>SHAPE_DRAW_2D</DrawMode>
-		<EmbeddedIcon>false</EmbeddedIcon>
-		<Z>0</Z>
-		<Rotation>0.0</Rotation>
-		<Color>-16777216</Color>
-		<Text><![CDATA[Electricity]]></Text>
-		<Font>
-			<Name><![CDATA[SansSerif]]></Name>
-			<Size>16</Size>
-			<Style>2</Style>
-		</Font>
-		<Alignment>LEFT</Alignment>
-	</Text>
 	<Text>
 		<Id>1741792546485</Id>
 		<Name><![CDATA[txt_yearConsumption]]></Name>
@@ -503,81 +478,6 @@
 		</Font>
 		<Alignment>LEFT</Alignment>
 	</Text>
-	<Text>
-		<Id>1741792546487</Id>
-		<Name><![CDATA[txt_yearConsumptionElectricity]]></Name>
-		<X>181</X>
-		<Y>690</Y>
-		<Label>
-			<X>0</X>
-			<Y>-10</Y>
-		</Label>
-		<PublicFlag>true</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>false</ShowLabel>
-		<DrawMode>SHAPE_DRAW_2D</DrawMode>
-		<EmbeddedIcon>false</EmbeddedIcon>
-		<Z>0</Z>
-		<Rotation>0.0</Rotation>
-		<Color>-16777216</Color>
-		<Text><![CDATA[Electricity]]></Text>
-		<Font>
-			<Name><![CDATA[SansSerif]]></Name>
-			<Size>16</Size>
-			<Style>2</Style>
-		</Font>
-		<Alignment>LEFT</Alignment>
-	</Text>
-	<Text>
-		<Id>1741792546489</Id>
-		<Name><![CDATA[txt_yearConsumptionOther]]></Name>
-		<X>181</X>
-		<Y>850</Y>
-		<Label>
-			<X>0</X>
-			<Y>-10</Y>
-		</Label>
-		<PublicFlag>true</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>false</ShowLabel>
-		<DrawMode>SHAPE_DRAW_2D</DrawMode>
-		<EmbeddedIcon>false</EmbeddedIcon>
-		<Z>0</Z>
-		<Rotation>0.0</Rotation>
-		<Color>-16777216</Color>
-		<Text><![CDATA[Other]]></Text>
-		<Font>
-			<Name><![CDATA[SansSerif]]></Name>
-			<Size>16</Size>
-			<Style>2</Style>
-		</Font>
-		<Alignment>LEFT</Alignment>
-	</Text>
-	<Text>
-		<Id>1741792546491</Id>
-		<Name><![CDATA[txt_yearProductionOther]]></Name>
-		<X>186</X>
-		<Y>1075</Y>
-		<Label>
-			<X>0</X>
-			<Y>-10</Y>
-		</Label>
-		<PublicFlag>true</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>false</ShowLabel>
-		<DrawMode>SHAPE_DRAW_2D</DrawMode>
-		<EmbeddedIcon>false</EmbeddedIcon>
-		<Z>0</Z>
-		<Rotation>0.0</Rotation>
-		<Color>-16777216</Color>
-		<Text><![CDATA[Other]]></Text>
-		<Font>
-			<Name><![CDATA[SansSerif]]></Name>
-			<Size>16</Size>
-			<Style>2</Style>
-		</Font>
-		<Alignment>LEFT</Alignment>
-	</Text>
 	<Text>
 		<Id>1741792546493</Id>
 		<Name><![CDATA[txt_liveWeekNet]]></Name>
@@ -603,156 +503,6 @@
 		</Font>
 		<Alignment>LEFT</Alignment>
 	</Text>
-	<Text>
-		<Id>1741792546495</Id>
-		<Name><![CDATA[txt_summerWeekConsumption]]></Name>
-		<X>166</X>
-		<Y>1220</Y>
-		<Label>
-			<X>0</X>
-			<Y>-10</Y>
-		</Label>
-		<PublicFlag>true</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>false</ShowLabel>
-		<DrawMode>SHAPE_DRAW_2D</DrawMode>
-		<EmbeddedIcon>false</EmbeddedIcon>
-		<Z>0</Z>
-		<Rotation>0.0</Rotation>
-		<Color>-16777216</Color>
-		<Text><![CDATA[Consumption]]></Text>
-		<Font>
-			<Name><![CDATA[SansSerif]]></Name>
-			<Size>16</Size>
-			<Style>0</Style>
-		</Font>
-		<Alignment>LEFT</Alignment>
-	</Text>
-	<Text>
-		<Id>1741792546497</Id>
-		<Name><![CDATA[txt_summerWeekConsumptionElectricity]]></Name>
-		<X>186</X>
-		<Y>1240</Y>
-		<Label>
-			<X>0</X>
-			<Y>-10</Y>
-		</Label>
-		<PublicFlag>true</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>false</ShowLabel>
-		<DrawMode>SHAPE_DRAW_2D</DrawMode>
-		<EmbeddedIcon>false</EmbeddedIcon>
-		<Z>0</Z>
-		<Rotation>0.0</Rotation>
-		<Color>-16777216</Color>
-		<Text><![CDATA[Electricity]]></Text>
-		<Font>
-			<Name><![CDATA[SansSerif]]></Name>
-			<Size>16</Size>
-			<Style>0</Style>
-		</Font>
-		<Alignment>LEFT</Alignment>
-	</Text>
-	<Text>
-		<Id>1741792546499</Id>
-		<Name><![CDATA[txt_summerWeekConsumptionOther]]></Name>
-		<X>186</X>
-		<Y>1400</Y>
-		<Label>
-			<X>0</X>
-			<Y>-10</Y>
-		</Label>
-		<PublicFlag>true</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>false</ShowLabel>
-		<DrawMode>SHAPE_DRAW_2D</DrawMode>
-		<EmbeddedIcon>false</EmbeddedIcon>
-		<Z>0</Z>
-		<Rotation>0.0</Rotation>
-		<Color>-16777216</Color>
-		<Text><![CDATA[Other]]></Text>
-		<Font>
-			<Name><![CDATA[SansSerif]]></Name>
-			<Size>16</Size>
-			<Style>0</Style>
-		</Font>
-		<Alignment>LEFT</Alignment>
-	</Text>
-	<Text>
-		<Id>1741792546501</Id>
-		<Name><![CDATA[txt_summerWeekProduction]]></Name>
-		<X>166</X>
-		<Y>1480</Y>
-		<Label>
-			<X>0</X>
-			<Y>-10</Y>
-		</Label>
-		<PublicFlag>true</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>false</ShowLabel>
-		<DrawMode>SHAPE_DRAW_2D</DrawMode>
-		<EmbeddedIcon>false</EmbeddedIcon>
-		<Z>0</Z>
-		<Rotation>0.0</Rotation>
-		<Color>-16777216</Color>
-		<Text><![CDATA[Production]]></Text>
-		<Font>
-			<Name><![CDATA[SansSerif]]></Name>
-			<Size>16</Size>
-			<Style>0</Style>
-		</Font>
-		<Alignment>LEFT</Alignment>
-	</Text>
-	<Text>
-		<Id>1741792546503</Id>
-		<Name><![CDATA[txt_summerWeekProductionOther]]></Name>
-		<X>186</X>
-		<Y>1640</Y>
-		<Label>
-			<X>0</X>
-			<Y>-10</Y>
-		</Label>
-		<PublicFlag>true</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>false</ShowLabel>
-		<DrawMode>SHAPE_DRAW_2D</DrawMode>
-		<EmbeddedIcon>false</EmbeddedIcon>
-		<Z>0</Z>
-		<Rotation>0.0</Rotation>
-		<Color>-16777216</Color>
-		<Text><![CDATA[Other]]></Text>
-		<Font>
-			<Name><![CDATA[SansSerif]]></Name>
-			<Size>16</Size>
-			<Style>0</Style>
-		</Font>
-		<Alignment>LEFT</Alignment>
-	</Text>
-	<Text>
-		<Id>1741792546505</Id>
-		<Name><![CDATA[txt_summerWeekProductionElectricity]]></Name>
-		<X>186</X>
-		<Y>1500</Y>
-		<Label>
-			<X>0</X>
-			<Y>-10</Y>
-		</Label>
-		<PublicFlag>true</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>false</ShowLabel>
-		<DrawMode>SHAPE_DRAW_2D</DrawMode>
-		<EmbeddedIcon>false</EmbeddedIcon>
-		<Z>0</Z>
-		<Rotation>0.0</Rotation>
-		<Color>-16777216</Color>
-		<Text><![CDATA[Electricity]]></Text>
-		<Font>
-			<Name><![CDATA[SansSerif]]></Name>
-			<Size>16</Size>
-			<Style>0</Style>
-		</Font>
-		<Alignment>LEFT</Alignment>
-	</Text>
 	<Text>
 		<Id>1741792546507</Id>
 		<Name><![CDATA[txt_summerWeekNet]]></Name>
@@ -803,56 +553,6 @@
 		</Font>
 		<Alignment>LEFT</Alignment>
 	</Text>
-	<Text>
-		<Id>1741792546511</Id>
-		<Name><![CDATA[txt_winterWeekConsumptionElectricity]]></Name>
-		<X>186</X>
-		<Y>1890</Y>
-		<Label>
-			<X>0</X>
-			<Y>-10</Y>
-		</Label>
-		<PublicFlag>true</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>false</ShowLabel>
-		<DrawMode>SHAPE_DRAW_2D</DrawMode>
-		<EmbeddedIcon>false</EmbeddedIcon>
-		<Z>0</Z>
-		<Rotation>0.0</Rotation>
-		<Color>-16777216</Color>
-		<Text><![CDATA[Electricity]]></Text>
-		<Font>
-			<Name><![CDATA[SansSerif]]></Name>
-			<Size>16</Size>
-			<Style>0</Style>
-		</Font>
-		<Alignment>LEFT</Alignment>
-	</Text>
-	<Text>
-		<Id>1741792546513</Id>
-		<Name><![CDATA[txt_winterWeekConsumptionOther]]></Name>
-		<X>186</X>
-		<Y>2050</Y>
-		<Label>
-			<X>0</X>
-			<Y>-10</Y>
-		</Label>
-		<PublicFlag>true</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>false</ShowLabel>
-		<DrawMode>SHAPE_DRAW_2D</DrawMode>
-		<EmbeddedIcon>false</EmbeddedIcon>
-		<Z>0</Z>
-		<Rotation>0.0</Rotation>
-		<Color>-16777216</Color>
-		<Text><![CDATA[Other]]></Text>
-		<Font>
-			<Name><![CDATA[SansSerif]]></Name>
-			<Size>16</Size>
-			<Style>0</Style>
-		</Font>
-		<Alignment>LEFT</Alignment>
-	</Text>
 	<Text>
 		<Id>1741792546515</Id>
 		<Name><![CDATA[txt_winterWeekProduction]]></Name>
@@ -878,56 +578,6 @@
 		</Font>
 		<Alignment>LEFT</Alignment>
 	</Text>
-	<Text>
-		<Id>1741792546517</Id>
-		<Name><![CDATA[txt_winterWeekProductionOther]]></Name>
-		<X>186</X>
-		<Y>2290</Y>
-		<Label>
-			<X>0</X>
-			<Y>-10</Y>
-		</Label>
-		<PublicFlag>true</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>false</ShowLabel>
-		<DrawMode>SHAPE_DRAW_2D</DrawMode>
-		<EmbeddedIcon>false</EmbeddedIcon>
-		<Z>0</Z>
-		<Rotation>0.0</Rotation>
-		<Color>-16777216</Color>
-		<Text><![CDATA[Other]]></Text>
-		<Font>
-			<Name><![CDATA[SansSerif]]></Name>
-			<Size>16</Size>
-			<Style>0</Style>
-		</Font>
-		<Alignment>LEFT</Alignment>
-	</Text>
-	<Text>
-		<Id>1741792546519</Id>
-		<Name><![CDATA[txt_winterWeekProductionElectricity]]></Name>
-		<X>186</X>
-		<Y>2150</Y>
-		<Label>
-			<X>0</X>
-			<Y>-10</Y>
-		</Label>
-		<PublicFlag>true</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>false</ShowLabel>
-		<DrawMode>SHAPE_DRAW_2D</DrawMode>
-		<EmbeddedIcon>false</EmbeddedIcon>
-		<Z>0</Z>
-		<Rotation>0.0</Rotation>
-		<Color>-16777216</Color>
-		<Text><![CDATA[Electricity]]></Text>
-		<Font>
-			<Name><![CDATA[SansSerif]]></Name>
-			<Size>16</Size>
-			<Style>0</Style>
-		</Font>
-		<Alignment>LEFT</Alignment>
-	</Text>
 	<Text>
 		<Id>1741792546521</Id>
 		<Name><![CDATA[txt_summerWeekNet1]]></Name>
diff --git a/_alp/Agents/EnergyDataViewer/Variables.xml b/_alp/Agents/EnergyDataViewer/Variables.xml
index 80c37529..9ef654c5 100644
--- a/_alp/Agents/EnergyDataViewer/Variables.xml
+++ b/_alp/Agents/EnergyDataViewer/Variables.xml
@@ -118,8 +118,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546559</Id>
 		<Name><![CDATA[v_dataElectricityBaseloadConsumptionLiveWeek_kW]]></Name>
-		<X>206</X>
-		<Y>110</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-330</X>
+		<Y>100</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -137,8 +138,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546561</Id>
 		<Name><![CDATA[v_dataElectricityForHeatConsumptionLiveWeek_kW]]></Name>
-		<X>206</X>
-		<Y>130</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-330</X>
+		<Y>120</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -156,8 +158,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546563</Id>
 		<Name><![CDATA[v_dataElectricityForTransportConsumptionLiveWeek_kW]]></Name>
-		<X>206</X>
-		<Y>150</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-330</X>
+		<Y>140</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -175,8 +178,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546565</Id>
 		<Name><![CDATA[v_dataElectricityForStorageConsumptionLiveWeek_kW]]></Name>
-		<X>206</X>
-		<Y>170</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-330</X>
+		<Y>160</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -213,8 +217,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546569</Id>
 		<Name><![CDATA[v_dataWindElectricityProductionLiveWeek_kW]]></Name>
-		<X>206</X>
-		<Y>385</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-330</X>
+		<Y>280</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -232,8 +237,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546571</Id>
 		<Name><![CDATA[v_dataPVElectricityProductionLiveWeek_kW]]></Name>
-		<X>206</X>
-		<Y>365</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-330</X>
+		<Y>260</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -251,8 +257,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546573</Id>
 		<Name><![CDATA[v_dataStorageElectricityProductionLiveWeek_kW]]></Name>
-		<X>206</X>
-		<Y>405</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-330</X>
+		<Y>300</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -270,8 +277,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546575</Id>
 		<Name><![CDATA[v_dataV2GElectricityProductionLiveWeek_kW]]></Name>
-		<X>206</X>
-		<Y>425</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-330</X>
+		<Y>320</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -309,8 +317,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546579</Id>
 		<Name><![CDATA[v_dataElectricityForHydrogenConsumptionLiveWeek_kW]]></Name>
-		<X>206</X>
-		<Y>190</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-330</X>
+		<Y>180</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -519,8 +528,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546601</Id>
 		<Name><![CDATA[v_dataElectricityBaseloadConsumptionYear_kW]]></Name>
-		<X>206</X>
-		<Y>720</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-400</X>
+		<Y>710</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -538,8 +548,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546603</Id>
 		<Name><![CDATA[v_dataElectricityForHeatConsumptionYear_kW]]></Name>
-		<X>206</X>
-		<Y>740</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-400</X>
+		<Y>730</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -557,8 +568,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546605</Id>
 		<Name><![CDATA[v_dataElectricityForTransportConsumptionYear_kW]]></Name>
-		<X>206</X>
-		<Y>760</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-400</X>
+		<Y>750</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -576,8 +588,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546607</Id>
 		<Name><![CDATA[v_dataElectricityForStorageConsumptionYear_kW]]></Name>
-		<X>206</X>
-		<Y>800</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-400</X>
+		<Y>790</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -595,8 +608,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546609</Id>
 		<Name><![CDATA[v_dataElectricityWindProductionYear_kW]]></Name>
-		<X>206</X>
-		<Y>1005</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-400</X>
+		<Y>890</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -614,8 +628,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546611</Id>
 		<Name><![CDATA[v_dataElectricityPVProductionYear_kW]]></Name>
-		<X>206</X>
-		<Y>985</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-400</X>
+		<Y>870</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -633,8 +648,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546613</Id>
 		<Name><![CDATA[v_dataElectricityStorageProductionYear_kW]]></Name>
-		<X>206</X>
-		<Y>1025</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-400</X>
+		<Y>910</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -652,8 +668,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546615</Id>
 		<Name><![CDATA[v_dataElectricityV2GProductionYear_kW]]></Name>
-		<X>206</X>
-		<Y>1045</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-400</X>
+		<Y>930</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -710,8 +727,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546621</Id>
 		<Name><![CDATA[v_dataElectricityForHydrogenConsumptionYear_kW]]></Name>
-		<X>206</X>
-		<Y>780</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-400</X>
+		<Y>770</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -748,8 +766,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546625</Id>
 		<Name><![CDATA[v_dataElectricityBaseloadConsumptionSummerWeek_kW]]></Name>
-		<X>206</X>
-		<Y>1270</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-410</X>
+		<Y>1280</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -767,8 +786,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546627</Id>
 		<Name><![CDATA[v_dataElectricityForHeatConsumptionSummerWeek_kW]]></Name>
-		<X>206</X>
-		<Y>1290</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-410</X>
+		<Y>1300</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -786,8 +806,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546629</Id>
 		<Name><![CDATA[v_dataElectricityForTransportConsumptionSummerWeek_kW]]></Name>
-		<X>206</X>
-		<Y>1310</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-410</X>
+		<Y>1320</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -805,27 +826,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546631</Id>
 		<Name><![CDATA[v_dataElectricityForStorageConsumptionSummerWeek_kW]]></Name>
-		<X>206</X>
-		<Y>1330</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[DataSet]]></Type>
-		</Properties>
-	</Variable>
-	<Variable Class="PlainVariable">
-		<Id>1741792546633</Id>
-		<Name><![CDATA[v_dataDistrictHeatConsumptionSummerWeek_kW]]></Name>
-		<X>206</X>
-		<Y>1450</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-410</X>
+		<Y>1340</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -843,8 +846,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546635</Id>
 		<Name><![CDATA[v_dataElectricityForHydrogenConsumptionSummerWeek_kW]]></Name>
-		<X>206</X>
-		<Y>1350</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-410</X>
+		<Y>1360</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -862,8 +866,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546637</Id>
 		<Name><![CDATA[v_dataElectricityBaseloadConsumptionWinterWeek_kW]]></Name>
-		<X>206</X>
-		<Y>1920</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-360</X>
+		<Y>1930</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -881,8 +886,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546639</Id>
 		<Name><![CDATA[v_dataElectricityForHeatConsumptionWinterWeek_kW]]></Name>
-		<X>206</X>
-		<Y>1940</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-360</X>
+		<Y>1950</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -900,8 +906,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546641</Id>
 		<Name><![CDATA[v_dataElectricityForTransportConsumptionWinterWeek_kW]]></Name>
-		<X>206</X>
-		<Y>1960</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-360</X>
+		<Y>1970</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -919,8 +926,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546643</Id>
 		<Name><![CDATA[v_dataElectricityForStorageConsumptionWinterWeek_kW]]></Name>
-		<X>206</X>
-		<Y>1980</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-360</X>
+		<Y>1990</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -957,8 +965,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546647</Id>
 		<Name><![CDATA[v_dataElectricityForHydrogenConsumptionWinterWeek_kW]]></Name>
-		<X>206</X>
-		<Y>2000</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-360</X>
+		<Y>2010</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -976,8 +985,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546649</Id>
 		<Name><![CDATA[v_dataElectricityWindProductionSummerWeek_kW]]></Name>
-		<X>206</X>
-		<Y>1550</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-410</X>
+		<Y>1450</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -995,8 +1005,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546651</Id>
 		<Name><![CDATA[v_dataElectricityPVProductionSummerWeek_kW]]></Name>
-		<X>206</X>
-		<Y>1530</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-410</X>
+		<Y>1430</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1014,8 +1025,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546653</Id>
 		<Name><![CDATA[v_dataElectricityStorageProductionSummerWeek_kW]]></Name>
-		<X>206</X>
-		<Y>1570</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-410</X>
+		<Y>1470</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1033,8 +1045,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546655</Id>
 		<Name><![CDATA[v_dataElectricityV2GProductionSummerWeek_kW]]></Name>
-		<X>206</X>
-		<Y>1590</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-410</X>
+		<Y>1490</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1072,8 +1085,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546659</Id>
 		<Name><![CDATA[v_dataElectricityWindProductionWinterWeek_kW]]></Name>
-		<X>206</X>
-		<Y>2200</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-360</X>
+		<Y>2110</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1091,8 +1105,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546661</Id>
 		<Name><![CDATA[v_dataElectricityPVProductionWinterWeek_kW]]></Name>
-		<X>206</X>
-		<Y>2180</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-360</X>
+		<Y>2090</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1110,8 +1125,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546663</Id>
 		<Name><![CDATA[v_dataElectricityStorageProductionWinterWeek_kW]]></Name>
-		<X>206</X>
-		<Y>2220</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-360</X>
+		<Y>2130</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1129,8 +1145,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546665</Id>
 		<Name><![CDATA[v_dataElectricityV2GProductionWinterWeek_kW]]></Name>
-		<X>206</X>
-		<Y>2240</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-360</X>
+		<Y>2150</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2762,7 +2779,7 @@
               StaticVariable="false">
 			<Type><![CDATA[J_DataSetMap]]></Type>
 			<InitialValue Class="CodeValue">
-				<Code><![CDATA[new J_DataSetMap()]]></Code>
+				<Code><![CDATA[new J_DataSetMap(OL_EnergyCarriers.class)]]></Code>
 			</InitialValue>
 		</Properties>
 	</Variable>
@@ -2784,7 +2801,7 @@
               StaticVariable="false">
 			<Type><![CDATA[J_DataSetMap]]></Type>
 			<InitialValue Class="CodeValue">
-				<Code><![CDATA[new J_DataSetMap()]]></Code>
+				<Code><![CDATA[new J_DataSetMap(OL_EnergyCarriers.class)]]></Code>
 			</InitialValue>
 		</Properties>
 	</Variable>
@@ -2806,7 +2823,7 @@
               StaticVariable="false">
 			<Type><![CDATA[J_DataSetMap]]></Type>
 			<InitialValue Class="CodeValue">
-				<Code><![CDATA[new J_DataSetMap()]]></Code>
+				<Code><![CDATA[new J_DataSetMap(OL_EnergyCarriers.class)]]></Code>
 			</InitialValue>
 		</Properties>
 	</Variable>
@@ -2814,7 +2831,7 @@
 		<Id>1741792546863</Id>
 		<Name><![CDATA[dsm_summerWeekProductionDataSets_kW]]></Name>
 		<X>206</X>
-		<Y>1670</Y>
+		<Y>1453</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2828,7 +2845,7 @@
               StaticVariable="false">
 			<Type><![CDATA[J_DataSetMap]]></Type>
 			<InitialValue Class="CodeValue">
-				<Code><![CDATA[new J_DataSetMap()]]></Code>
+				<Code><![CDATA[new J_DataSetMap(OL_EnergyCarriers.class)]]></Code>
 			</InitialValue>
 		</Properties>
 	</Variable>
@@ -2850,7 +2867,7 @@
               StaticVariable="false">
 			<Type><![CDATA[J_DataSetMap]]></Type>
 			<InitialValue Class="CodeValue">
-				<Code><![CDATA[new J_DataSetMap()]]></Code>
+				<Code><![CDATA[new J_DataSetMap(OL_EnergyCarriers.class)]]></Code>
 			</InitialValue>
 		</Properties>
 	</Variable>
@@ -2872,7 +2889,7 @@
               StaticVariable="false">
 			<Type><![CDATA[J_DataSetMap]]></Type>
 			<InitialValue Class="CodeValue">
-				<Code><![CDATA[new J_DataSetMap()]]></Code>
+				<Code><![CDATA[new J_DataSetMap(OL_EnergyCarriers.class)]]></Code>
 			</InitialValue>
 		</Properties>
 	</Variable>
@@ -2894,7 +2911,7 @@
               StaticVariable="false">
 			<Type><![CDATA[J_DataSetMap]]></Type>
 			<InitialValue Class="CodeValue">
-				<Code><![CDATA[new J_DataSetMap()]]></Code>
+				<Code><![CDATA[new J_DataSetMap(OL_EnergyCarriers.class)]]></Code>
 			</InitialValue>
 		</Properties>
 	</Variable>
@@ -2916,7 +2933,7 @@
               StaticVariable="false">
 			<Type><![CDATA[J_DataSetMap]]></Type>
 			<InitialValue Class="CodeValue">
-				<Code><![CDATA[new J_DataSetMap()]]></Code>
+				<Code><![CDATA[new J_DataSetMap(OL_EnergyCarriers.class)]]></Code>
 			</InitialValue>
 		</Properties>
 	</Variable>
@@ -2980,8 +2997,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546879</Id>
 		<Name><![CDATA[v_dataElectricityForCookingConsumptionYear_kW]]></Name>
-		<X>206</X>
-		<Y>820</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-400</X>
+		<Y>810</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2999,8 +3017,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546881</Id>
 		<Name><![CDATA[v_dataElectricityForCookingConsumptionSummerWeek_kW]]></Name>
-		<X>206</X>
-		<Y>1370</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-410</X>
+		<Y>1380</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -3018,8 +3037,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546883</Id>
 		<Name><![CDATA[v_dataElectricityForCookingConsumptionWinterWeek_kW]]></Name>
-		<X>206</X>
-		<Y>2020</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-360</X>
+		<Y>2030</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -3037,8 +3057,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546885</Id>
 		<Name><![CDATA[v_dataElectricityForCookingConsumptionLiveWeek_kW]]></Name>
-		<X>206</X>
-		<Y>210</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-330</X>
+		<Y>200</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -3144,6 +3165,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546895</Id>
 		<Name><![CDATA[b_hasHeatGridConnection]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>1726</X>
 		<Y>650</Y>
 		<Label>
@@ -3166,8 +3188,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546897</Id>
 		<Name><![CDATA[v_dataCHPElectricityProductionLiveWeek_kW]]></Name>
-		<X>206</X>
-		<Y>445</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-330</X>
+		<Y>340</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -3185,8 +3208,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546899</Id>
 		<Name><![CDATA[v_dataElectricityCHPProductionYear_kW]]></Name>
-		<X>206</X>
-		<Y>1065</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-400</X>
+		<Y>950</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -3204,8 +3228,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546901</Id>
 		<Name><![CDATA[v_dataElectricityCHPProductionSummerWeek_kW]]></Name>
-		<X>206</X>
-		<Y>1610</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-410</X>
+		<Y>1510</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -3223,8 +3248,9 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546903</Id>
 		<Name><![CDATA[v_dataElectricityCHPProductionWinterWeek_kW]]></Name>
-		<X>206</X>
-		<Y>2260</Y>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>-360</X>
+		<Y>2170</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -3242,6 +3268,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546905</Id>
 		<Name><![CDATA[b_hasElectrolyser]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>1726</X>
 		<Y>670</Y>
 		<Label>
@@ -3264,6 +3291,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546907</Id>
 		<Name><![CDATA[b_hasCHP]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>1726</X>
 		<Y>690</Y>
 		<Label>
@@ -3286,6 +3314,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546909</Id>
 		<Name><![CDATA[b_hasPV]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>1726</X>
 		<Y>590</Y>
 		<Label>
@@ -3308,6 +3337,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546911</Id>
 		<Name><![CDATA[b_hasWindturbine]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>1726</X>
 		<Y>610</Y>
 		<Label>
@@ -3330,6 +3360,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546913</Id>
 		<Name><![CDATA[b_hasV2G]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>1726</X>
 		<Y>710</Y>
 		<Label>
@@ -3352,6 +3383,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546915</Id>
 		<Name><![CDATA[b_hasBattery]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>1726</X>
 		<Y>630</Y>
 		<Label>
@@ -3374,6 +3406,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546917</Id>
 		<Name><![CDATA[b_hasElectricHeating]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>1726</X>
 		<Y>550</Y>
 		<Label>
@@ -3396,6 +3429,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546919</Id>
 		<Name><![CDATA[b_hasElectricTransport]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>1726</X>
 		<Y>570</Y>
 		<Label>
@@ -3418,6 +3452,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1741792546921</Id>
 		<Name><![CDATA[b_hasElectricCooking]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>1726</X>
 		<Y>730</Y>
 		<Label>
@@ -3924,6 +3959,113 @@
 			<Type><![CDATA[double]]></Type>
 		</Properties>
 	</Variable>
+	<Variable Class="PlainVariable">
+		<Id>1754307361345</Id>
+		<Name><![CDATA[dsm_assetFlowsSummerWeek_kW]]></Name>
+		<X>206</X>
+		<Y>1403</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[J_DataSetMap]]></Type>
+			<InitialValue Class="CodeValue">
+				<Code><![CDATA[new J_DataSetMap(OL_AssetFlowCategories.class)]]></Code>
+			</InitialValue>
+		</Properties>
+	</Variable>
+	<Variable Class="PlainVariable">
+		<Id>1754307559209</Id>
+		<Name><![CDATA[dsm_assetFlowsWinterWeek_kW]]></Name>
+		<X>206</X>
+		<Y>2059</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[J_DataSetMap]]></Type>
+			<InitialValue Class="CodeValue">
+				<Code><![CDATA[new J_DataSetMap(OL_AssetFlowCategories.class)]]></Code>
+			</InitialValue>
+		</Properties>
+	</Variable>
+	<Variable Class="PlainVariable">
+		<Id>1754307918052</Id>
+		<Name><![CDATA[dsm_assetFlowsAccumulators_kW]]></Name>
+		<X>207</X>
+		<Y>790</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[J_DataSetMap]]></Type>
+			<InitialValue Class="CodeValue">
+				<Code><![CDATA[new J_DataSetMap(OL_AssetFlowCategories.class)]]></Code>
+			</InitialValue>
+		</Properties>
+	</Variable>
+	<Variable Class="PlainVariable">
+		<Id>1754308111992</Id>
+		<Name><![CDATA[dsm_liveAssetFlowsAccumulators_kW]]></Name>
+		<X>200</X>
+		<Y>220</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[J_DataSetMap]]></Type>
+			<InitialValue Class="CodeValue">
+				<Code><![CDATA[new J_DataSetMap(OL_AssetFlowCategories.class)]]></Code>
+			</InitialValue>
+		</Properties>
+	</Variable>
+	<Variable Class="PlainVariable">
+		<Id>1754312472355</Id>
+		<Name><![CDATA[v_activeAssetFlows]]></Name>
+		<X>1726</X>
+		<Y>750</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[EnumSet<OL_AssetFlowCategories>]]></Type>
+		</Properties>
+	</Variable>
 	<Variable Class="Parameter">
 		<Id>1741792546958</Id>
 		<Name><![CDATA[p_areaType]]></Name>
diff --git a/_alp/Agents/EnergyModel/Code/Functions.java b/_alp/Agents/EnergyModel/Code/Functions.java
index 2c34b0ba..b3bdad0a 100644
--- a/_alp/Agents/EnergyModel/Code/Functions.java
+++ b/_alp/Agents/EnergyModel/Code/Functions.java
@@ -159,12 +159,13 @@
 fm_currentProductionFlows_kW.clear();
 fm_currentConsumptionFlows_kW.clear();
 fm_currentBalanceFlows_kW.clear();
-
+fm_currentAssetFlows_kW.clear();
 
 v_currentFinalEnergyConsumption_kW = 0;
 v_currentPrimaryEnergyProduction_kW = 0;
 v_currentEnergyCurtailed_kW = 0;
 v_currentPrimaryEnergyProductionHeatpumps_kW = 0;
+v_batteryStoredEnergy_kWh = 0;
 
 if (b_parallelizeGridConnections) {
 	c_gridConnections.parallelStream().forEach(gc -> gc.f_calculateEnergyBalance());
@@ -175,21 +176,18 @@
 	}
 }
 
-v_assetFlows.reset();
-
 for(GridConnection gc : c_gridConnections) { // Can't do this in parallel due to different threads writing to the same values!
 	
 	fm_currentBalanceFlows_kW.addFlows(gc.fm_currentBalanceFlows_kW);
 	fm_currentProductionFlows_kW.addFlows(gc.fm_currentProductionFlows_kW);
 	fm_currentConsumptionFlows_kW.addFlows(gc.fm_currentConsumptionFlows_kW);
-
+	fm_currentAssetFlows_kW.addFlows(gc.fm_currentAssetFlows_kW);
 	v_currentFinalEnergyConsumption_kW += gc.v_currentFinalEnergyConsumption_kW;
 	v_currentPrimaryEnergyProduction_kW += gc.v_currentPrimaryEnergyProduction_kW;
 	v_currentEnergyCurtailed_kW += gc.v_currentEnergyCurtailed_kW;
+	v_batteryStoredEnergy_kWh += gc.v_batteryStoredEnergy_kWh;
 	v_currentPrimaryEnergyProductionHeatpumps_kW += gc.v_currentPrimaryEnergyProductionHeatpumps_kW;
-	
-	v_assetFlows.addFlows(gc.v_assetFlows);
-	
+		
 }
 
 for (GridConnection gc : c_subGridConnections) {
@@ -242,21 +240,22 @@
 }
 
 for (GridConnection GC : c_gridConnections) {
+	
 	if (GC.v_rapidRunData != null) {
 		if (b_storePreviousRapidRunData) {
 			GC.v_previousRunData = GC.v_rapidRunData.getClone();
 		}
+		GC.v_rapidRunData.assetsMetaData = GC.v_liveAssetsMetaData.getClone();
+		GC.v_rapidRunData.connectionMetaData = GC.v_liveConnectionMetaData.getClone();
 	} else {
 		GC.v_rapidRunData = new J_RapidRunData(GC);
+		GC.v_rapidRunData.assetsMetaData = GC.v_liveAssetsMetaData.getClone();
+		GC.v_rapidRunData.connectionMetaData = GC.v_liveConnectionMetaData.getClone();
 		GC.v_rapidRunData.initializeAccumulators(p_runEndTime_h - p_runStartTime_h, p_timeStep_h, GC.v_activeEnergyCarriers, GC.v_activeConsumptionEnergyCarriers, GC.v_activeProductionEnergyCarriers); //f_initializeAccumulators();
+		
 	}
+	
 	GC.f_resetStates();
-	GC.v_rapidRunData.assetsMetaData = GC.v_liveAssetsMetaData.getClone();
-	GC.v_rapidRunData.connectionMetaData = GC.v_liveConnectionMetaData.getClone();
-
-	//GC.c_tripTrackers.forEach(tt->tt.storeAndResetState());
-	//GC.c_tripTrackers.forEach(tt->tt.setStartIndex(p_runStartTime_h));
-	//GC.c_tripTrackers.forEach(tt->tt.prepareNextActivity(p_runStartTime_h*60));
 	
 	GC.c_tripTrackers.forEach(tt->{
 		tt.storeAndResetState();
@@ -286,14 +285,17 @@
 		if (b_storePreviousRapidRunData) {
 			EC.v_previousRunData = EC.v_rapidRunData.getClone();
 		}
+		EC.v_rapidRunData.assetsMetaData = EC.v_liveAssetsMetaData.getClone();
+		EC.v_rapidRunData.connectionMetaData = EC.v_liveConnectionMetaData.getClone();
 	} else {
 		EC.v_rapidRunData = new J_RapidRunData(EC);
+		EC.v_rapidRunData.assetsMetaData = EC.v_liveAssetsMetaData.getClone();
+		EC.v_rapidRunData.connectionMetaData = EC.v_liveConnectionMetaData.getClone();
 		
 		EC.v_rapidRunData.initializeAccumulators(p_runEndTime_h - p_runStartTime_h, p_timeStep_h, EC.v_activeEnergyCarriers, EC.v_activeConsumptionEnergyCarriers, EC.v_activeProductionEnergyCarriers);
 	}
 	EC.f_resetStates();
-	EC.v_rapidRunData.assetsMetaData = EC.v_liveAssetsMetaData.getClone();
-	EC.v_rapidRunData.connectionMetaData = EC.v_liveConnectionMetaData.getClone();
+
 }
 
 
@@ -307,14 +309,17 @@
 	if (b_storePreviousRapidRunData) {
 		v_previousRunData = v_rapidRunData.getClone();
 	}
+	v_rapidRunData.assetsMetaData = v_liveAssetsMetaData.getClone();	
+	v_rapidRunData.connectionMetaData = v_liveConnectionMetaData.getClone();
 } else {
 	v_rapidRunData = new J_RapidRunData(this);
+	v_rapidRunData.assetsMetaData = v_liveAssetsMetaData.getClone();	
+	v_rapidRunData.connectionMetaData = v_liveConnectionMetaData.getClone();
 	v_rapidRunData.initializeAccumulators(p_runEndTime_h - p_runStartTime_h, p_timeStep_h, v_activeEnergyCarriers, v_activeConsumptionEnergyCarriers, v_activeProductionEnergyCarriers); //f_initializeAccumulators();	
 }
 
 f_resetAnnualValues();
-v_rapidRunData.assetsMetaData = v_liveAssetsMetaData.getClone();	
-v_rapidRunData.connectionMetaData = v_liveConnectionMetaData.getClone();
+traceln("Active asset flows in this model: %s", v_rapidRunData.assetsMetaData.activeAssetFlows);
 
 
 v_isRapidRun = true;
@@ -350,11 +355,12 @@
 	v_rapidRunData.addTimeStep(fm_currentBalanceFlows_kW, 
 								fm_currentConsumptionFlows_kW, 
 								fm_currentProductionFlows_kW, 
+								fm_currentAssetFlows_kW,
 								v_currentPrimaryEnergyProduction_kW, 
 								v_currentFinalEnergyConsumption_kW, 
 								v_currentPrimaryEnergyProductionHeatpumps_kW, 
-								v_currentEnergyCurtailed_kW, 
-								v_assetFlows, 
+								v_currentEnergyCurtailed_kW,
+								v_batteryStoredEnergy_kWh/1000, 
 								this);
 	v_timeStepsElapsed++;
 }	
@@ -731,93 +737,21 @@ J_ProfilePointer f_findProfile(String assetName)
 	fm_currentBalanceFlows_kW,
 	fm_currentConsumptionFlows_kW,
 	fm_currentProductionFlows_kW,
+	fm_currentAssetFlows_kW,
 	v_currentPrimaryEnergyProduction_kW, 
 	v_currentFinalEnergyConsumption_kW, 
 	v_currentPrimaryEnergyProductionHeatpumps_kW, 
 	v_currentEnergyCurtailed_kW, 
-	v_assetFlows 
+	v_batteryStoredEnergy_kWh/1000 
 );
-/*
-//Energy carrier flows
-for (OL_EnergyCarriers EC : v_activeConsumptionEnergyCarriers) {
-	v_liveData.dsm_liveDemand_kW.get(EC).add( currentTime_h, roundToDecimal(fm_currentConsumptionFlows_kW.get(EC), 3));
-}
-for (OL_EnergyCarriers EC : v_activeProductionEnergyCarriers) {
-	v_liveData.dsm_liveSupply_kW.get(EC).add( currentTime_h, roundToDecimal(fm_currentProductionFlows_kW.get(EC) , 3));
-}
-
-//Totals
-v_liveData.data_totalDemand_kW.add(currentTime_h, v_currentFinalEnergyConsumption_kW);
-v_liveData.data_totalSupply_kW.add(currentTime_h, v_currentPrimaryEnergyProduction_kW);
-v_liveData.data_liveElectricityBalance_kW.add(currentTime_h, sum(c_gridNodesTopLevel.stream().filter(x -> x.p_energyCarrier == OL_EnergyCarriers.ELECTRICITY).toList(), x -> x.v_currentLoad_kW));
-
-//Grid capacity
-v_liveData.data_gridCapacityDemand_kW.add(currentTime_h, v_liveConnectionMetaData.physicalCapacity_kW);
-v_liveData.data_gridCapacitySupply_kW.add(currentTime_h, -v_liveConnectionMetaData.physicalCapacity_kW);
-
-////Specific assets
-
-//Demand
 
-//Base load electricity
-v_liveData.data_baseloadElectricityDemand_kW.add(currentTime_h, roundToDecimal(sum(c_gridConnections, x->x.v_fixedConsumptionElectric_kW), 3));
-
-//Heatpump consumption (electric)
-v_liveData.data_heatPumpElectricityDemand_kW.add(currentTime_h, roundToDecimal(sum(c_gridConnections, x->x.v_heatPumpElectricityConsumption_kW), 3));
-
-//Hydrogen electricity consumption
-v_liveData.data_hydrogenElectricityDemand_kW.add(currentTime_h, roundToDecimal(sum(c_gridConnections, x->x.v_hydrogenElectricityConsumption_kW), 3));
-
-//EV chargings
-v_liveData.data_electricVehicleDemand_kW.add(currentTime_h, roundToDecimal(sum(c_gridConnections, x -> max(0,x.v_evChargingPowerElectric_kW)), 3));
-
-//Battery charging
-v_liveData.data_batteryCharging_kW.add(currentTime_h, roundToDecimal(sum(c_gridConnections, x -> max(0, x.v_batteryPowerElectric_kW)), 3));
-
-//Electric Cooking 
-v_liveData.data_cookingElectricityDemand_kW.add(currentTime_h, roundToDecimal(sum(c_gridConnections, x-> x.v_electricHobConsumption_kW), 3));
-
-//District heating
-v_liveData.data_districtHeatDelivery_kW.add(currentTime_h, roundToDecimal(sum(c_gridConnections, x -> x.v_districtHeatDelivery_kW), 3));
-
-//Supply
-
-//PV
-v_liveData.data_PVGeneration_kW.add(currentTime_h, roundToDecimal(sum(c_gridConnections, x->x.v_pvProductionElectric_kW), 3));
-
-//Wind
-v_liveData.data_windGeneration_kW.add(currentTime_h, roundToDecimal(sum(c_gridConnections,x->x.v_windProductionElectric_kW), 3));
-
-//PT
-v_liveData.data_PTGeneration_kW.add(currentTime_h, roundToDecimal(sum(c_gridConnections, x->x.v_ptProductionHeat_kW), 3));
-
-//Battery discharge
-v_liveData.data_batteryDischarging_kW.add(currentTime_h, roundToDecimal(sum(c_gridConnections, x -> max(0, -x.v_batteryPowerElectric_kW)), 3));
-
-//V2G
-v_liveData.data_V2GSupply_kW.add(currentTime_h, roundToDecimal(sum(c_gridConnections,x->max(0,-x.v_evChargingPowerElectric_kW)), 3));
-
-//CHP
-v_liveData.data_CHPElectricityProductionLiveWeek_kW.add(currentTime_h, roundToDecimal(sum(c_gridConnections,x->x.v_CHPProductionElectric_kW), 3));
-
-//Other
-
-//Battery storage
-double currentBatteryStoredEnergy_MWh = sum(c_gridConnections, x->x.v_batteryStoredEnergy_kWh/1000);
-v_liveData.data_batteryStoredEnergyLiveWeek_MWh.add(currentTime_h, currentBatteryStoredEnergy_MWh);
-
-double currentSOC = 0;
-if(v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh > 0){
-	currentSOC = currentBatteryStoredEnergy_MWh/v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh;
-}
-v_liveData.data_batterySOC_fr.add(currentTime_h, roundToDecimal(currentSOC, 3));
-*/
 /*ALCODEEND*/}
 
 double f_initializeLiveDataSets()
 {/*ALCODESTART::1731573713521*/
 v_liveData.dsm_liveDemand_kW.createEmptyDataSets(v_activeEnergyCarriers, (int) (168 / p_timeStep_h));
 v_liveData.dsm_liveSupply_kW.createEmptyDataSets(v_activeEnergyCarriers, (int) (168 / p_timeStep_h));
+v_liveData.dsm_liveAssetFlows_kW.createEmptyDataSets(v_liveData.assetsMetaData.activeAssetFlows, (int)(168 / p_timeStep_h));
 /*ALCODEEND*/}
 
 EnergyCoop f_addEnergyCoop(ArrayList<GridConnection> gcList)
@@ -880,17 +814,19 @@ EnergyCoop f_removeEnergyCoop(EnergyCoop energyCoop)
 
 EnergyCoop f_addConsumptionEnergyCarrier(OL_EnergyCarriers EC)
 {/*ALCODESTART::1740056275008*/
-v_activeEnergyCarriers.add(EC);
-v_activeConsumptionEnergyCarriers.add(EC);
-
-DataSet dsDemand = new DataSet( (int)(168 / p_timeStep_h) );
-
-double startTime = v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMin();
-double endTime = v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMax();
-for (double t = startTime; t <= endTime; t += p_timeStep_h) {
-	dsDemand.add( t, 0);
+if (!v_activeConsumptionEnergyCarriers.contains(EC)) {
+	v_activeEnergyCarriers.add(EC);
+	v_activeConsumptionEnergyCarriers.add(EC);
+	
+	DataSet dsDemand = new DataSet( (int)(168 / p_timeStep_h) );
+	
+	double startTime = v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMin();
+	double endTime = v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMax();
+	for (double t = startTime; t <= endTime; t += p_timeStep_h) {
+		dsDemand.add( t, 0);
+	}
+	v_liveData.dsm_liveDemand_kW.put( EC, dsDemand);
 }
-v_liveData.dsm_liveDemand_kW.put( EC, dsDemand);
 /*ALCODEEND*/}
 
 double f_updateActiveAssetsMetaData()
@@ -913,16 +849,18 @@ EnergyCoop f_addConsumptionEnergyCarrier(OL_EnergyCarriers EC)
 
 EnergyCoop f_addProductionEnergyCarrier(OL_EnergyCarriers EC)
 {/*ALCODESTART::1746021439807*/
-v_activeEnergyCarriers.add(EC);
-v_activeProductionEnergyCarriers.add(EC);
-
-DataSet dsSupply = new DataSet( (int)(168 / p_timeStep_h) );
-double startTime = v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMin();
-double endTime = v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMax();
-for (double t = startTime; t <= endTime; t += p_timeStep_h) {
-	dsSupply.add( t, 0);
+if (!v_activeProductionEnergyCarriers.contains(EC)) {
+	v_activeEnergyCarriers.add(EC);
+	v_activeProductionEnergyCarriers.add(EC);
+	
+	DataSet dsSupply = new DataSet( (int)(168 / p_timeStep_h) );
+	double startTime = v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMin();
+	double endTime = v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMax();
+	for (double t = startTime; t <= endTime; t += p_timeStep_h) {
+		dsSupply.add( t, 0);
+	}
+	v_liveData.dsm_liveSupply_kW.put( EC, dsSupply);
 }
-v_liveData.dsm_liveSupply_kW.put( EC, dsSupply);
 /*ALCODEEND*/}
 
 double f_updateAmbientDependentAssets()
@@ -1108,3 +1046,78 @@ EnergyCoop f_addProductionEnergyCarrier(OL_EnergyCarriers EC)
 v_liveData.assetsMetaData = v_liveAssetsMetaData;
 /*ALCODEEND*/}
 
+Pair<J_DataSetMap, J_DataSetMap> f_getPeakWeekDataSets()
+{/*ALCODESTART::1754052061419*/
+double[] elecBalance_kW = v_rapidRunData.am_totalBalanceAccumulators_kW.get(OL_EnergyCarriers.ELECTRICITY).getTimeSeries_kW();
+
+int maxIndex = 0; // index with peak import
+for (int i = 1; i < elecBalance_kW.length; i++) {
+    if (elecBalance_kW[i] > elecBalance_kW[maxIndex]) {
+        maxIndex = i;
+    }
+}
+
+int minIndex = 0; // index with peak export
+for (int i = 1; i < elecBalance_kW.length; i++) {
+    if (elecBalance_kW[i] < elecBalance_kW[minIndex]) {
+        minIndex = i;
+    }
+}
+
+int startIdx = max(0,maxIndex - 7*48);
+int endIdx = max(startIdx + 7*96, maxIndex + 7*48);
+J_DataSetMap peakImportWeekAssetFlows = new J_DataSetMap(OL_AssetFlowCategories.class);
+for (OL_AssetFlowCategories AC : v_rapidRunData.am_assetFlowsAccumulators_kW.keySet()) {
+	double[] assetFlowArray_kW = v_rapidRunData.am_assetFlowsAccumulators_kW.get(AC).getTimeSeries_kW();
+	for (int i=startIdx; i<endIdx; i++) {
+		peakImportWeekAssetFlows.get(AC).add(p_timeStep_h * i, assetFlowArray_kW[i]);
+	}
+}
+
+startIdx = max(0,minIndex - 7*48);
+endIdx = max(startIdx + 7*96, minIndex + 7*48);
+J_DataSetMap peakExportWeekAssetFlows = new J_DataSetMap(OL_AssetFlowCategories.class);
+for (OL_AssetFlowCategories AC : v_rapidRunData.am_assetFlowsAccumulators_kW.keySet()) {
+	double[] assetFlowArray_kW = v_rapidRunData.am_assetFlowsAccumulators_kW.get(AC).getTimeSeries_kW();
+	for (int i=startIdx; i<endIdx; i++) {
+		peakExportWeekAssetFlows.get(AC).add(p_timeStep_h * i, assetFlowArray_kW[i]);
+	}
+}
+
+return new Pair<>(peakImportWeekAssetFlows, peakExportWeekAssetFlows);
+
+/*ALCODEEND*/}
+
+EnergyCoop f_addAssetFlow(OL_AssetFlowCategories AC)
+{/*ALCODESTART::1754379679149*/
+if (!v_liveAssetsMetaData.activeAssetFlows.contains(AC)) {
+	v_liveAssetsMetaData.activeAssetFlows.add(AC);
+	
+	DataSet dsAsset = new DataSet( (int)(168 / p_timeStep_h) );
+	
+	double startTime = v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMin();
+	double endTime = v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMax();
+	for (double t = startTime; t <= endTime; t += p_timeStep_h) {
+		dsAsset.add( t, 0);
+	}
+	v_liveData.dsm_liveAssetFlows_kW.put( AC, dsAsset);
+	
+	if (AC == OL_AssetFlowCategories.batteriesChargingPower_kW) { // also add batteriesDischarging!
+		dsAsset = new DataSet( (int)(168 / p_timeStep_h) );
+		
+		for (double t = startTime; t <= endTime; t += p_timeStep_h) {
+			dsAsset.add( t, 0);
+		}
+		v_liveData.dsm_liveAssetFlows_kW.put( OL_AssetFlowCategories.batteriesDischargingPower_kW, dsAsset);
+	}
+	if (AC == OL_AssetFlowCategories.V2GPower_kW && !v_liveAssetsMetaData.activeAssetFlows.contains(OL_AssetFlowCategories.evChargingPower_kW)) { // also add evCharging!
+		dsAsset = new DataSet( (int)(168 / p_timeStep_h) );
+		
+		for (double t = startTime; t <= endTime; t += p_timeStep_h) {
+			dsAsset.add( t, 0);
+		}
+		v_liveData.dsm_liveAssetFlows_kW.put( OL_AssetFlowCategories.evChargingPower_kW, dsAsset);
+	}	
+}
+/*ALCODEEND*/}
+
diff --git a/_alp/Agents/EnergyModel/Code/Functions.xml b/_alp/Agents/EnergyModel/Code/Functions.xml
index c86278e8..1b3b9043 100644
--- a/_alp/Agents/EnergyModel/Code/Functions.xml
+++ b/_alp/Agents/EnergyModel/Code/Functions.xml
@@ -6,7 +6,7 @@
 		<Id>1664894248130</Id>
 		<Name><![CDATA[f_updatePricesForNextTimestep]]></Name>
 		<X>1090</X>
-		<Y>260</Y>
+		<Y>290</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -26,7 +26,7 @@
 		<Id>1664952601107</Id>
 		<Name><![CDATA[f_updateTimeseries]]></Name>
 		<X>1090</X>
-		<Y>160</Y>
+		<Y>190</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -46,7 +46,7 @@
 		<Id>1665051878402</Id>
 		<Name><![CDATA[f_calculateGridnodeFlows]]></Name>
 		<X>1090</X>
-		<Y>220</Y>
+		<Y>250</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -66,7 +66,7 @@
 		<Id>1665051962956</Id>
 		<Name><![CDATA[f_calculateActorFlows]]></Name>
 		<X>1090</X>
-		<Y>240</Y>
+		<Y>270</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -102,7 +102,7 @@
 		<Id>1668528129020</Id>
 		<Name><![CDATA[f_calculateGridConnectionFlows]]></Name>
 		<X>1090</X>
-		<Y>200</Y>
+		<Y>230</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -190,7 +190,7 @@
 		<Id>1701162826549</Id>
 		<Name><![CDATA[f_runTimestep]]></Name>
 		<X>1070</X>
-		<Y>138</Y>
+		<Y>168</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -444,7 +444,7 @@
 		<Id>1731329529733</Id>
 		<Name><![CDATA[f_updateLiveData]]></Name>
 		<X>1091</X>
-		<Y>283</Y>
+		<Y>313</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -572,7 +572,7 @@
 		<Id>1751886925823</Id>
 		<Name><![CDATA[f_updateAmbientDependentAssets]]></Name>
 		<X>1113</X>
-		<Y>180</Y>
+		<Y>210</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -614,4 +614,40 @@
 		<ShowLabel>true</ShowLabel>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
+	<Function AccessType="public" StaticFunction="false">
+		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
+		<ReturnType>Pair&lt;J_DataSetMap, J_DataSetMap&gt;</ReturnType>
+		<Id>1754052061419</Id>
+		<Name><![CDATA[f_getPeakWeekDataSets]]></Name>
+		<X>1071</X>
+		<Y>132</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>EnergyCoop</ReturnType>
+		<Id>1754379679149</Id>
+		<Name><![CDATA[f_addAssetFlow]]></Name>
+		<X>1580</X>
+		<Y>640</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[AC]]></Name>
+			<Type><![CDATA[OL_AssetFlowCategories]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
 </Functions>
diff --git a/_alp/Agents/EnergyModel/Variables.xml b/_alp/Agents/EnergyModel/Variables.xml
index 37e23453..15c33388 100644
--- a/_alp/Agents/EnergyModel/Variables.xml
+++ b/_alp/Agents/EnergyModel/Variables.xml
@@ -1566,6 +1566,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1753110053329</Id>
 		<Name><![CDATA[v_assetFlows]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>80</X>
 		<Y>1120</Y>
 		<Label>
@@ -1585,6 +1586,47 @@
 			</InitialValue>
 		</Properties>
 	</Variable>
+	<Variable Class="PlainVariable">
+		<Id>1753971036198</Id>
+		<Name><![CDATA[fm_currentAssetFlows_kW]]></Name>
+		<X>180</X>
+		<Y>1120</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[J_ValueMap<OL_AssetFlowCategories>]]></Type>
+			<InitialValue Class="CodeValue">
+				<Code><![CDATA[new J_ValueMap(OL_AssetFlowCategories.class)]]></Code>
+			</InitialValue>
+		</Properties>
+	</Variable>
+	<Variable Class="PlainVariable">
+		<Id>1754321000847</Id>
+		<Name><![CDATA[v_batteryStoredEnergy_kWh]]></Name>
+		<X>80</X>
+		<Y>1260</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="Parameter">
 		<Id>1658496701675</Id>
 		<Name><![CDATA[p_timeStep_h]]></Name>
diff --git a/_alp/Agents/GCEnergyConversion/Code/Functions.java b/_alp/Agents/GCEnergyConversion/Code/Functions.java
index 0078c78e..39fb8042 100644
--- a/_alp/Agents/GCEnergyConversion/Code/Functions.java
+++ b/_alp/Agents/GCEnergyConversion/Code/Functions.java
@@ -189,8 +189,8 @@
 	//Pair<J_FlowsMap, Double> flowsPair = ElectrolyserAsset.f_updateAllFlows(electrolyserSetpointElectric_kW/ElectrolyserAsset.getCapacityElectric_kW());
 	ElectrolyserAsset.f_updateAllFlows(electrolyserSetpointElectric_kW/ElectrolyserAsset.getInputCapacity_kW());
 		
-	v_conversionPowerElectric_kW += ElectrolyserAsset.getLastFlows().get(OL_EnergyCarriers.ELECTRICITY);
-	v_hydrogenElectricityConsumption_kW += ElectrolyserAsset.getLastFlows().get(OL_EnergyCarriers.ELECTRICITY);
+	//v_conversionPowerElectric_kW += ElectrolyserAsset.getLastFlows().get(OL_EnergyCarriers.ELECTRICITY);
+	//v_hydrogenElectricityConsumption_kW += ElectrolyserAsset.getLastFlows().get(OL_EnergyCarriers.ELECTRICITY);
 	
 	v_hydrogenProductionDeficit_kWh += ProductionSetpoint_kW - max(0,-ElectrolyserAsset.getLastFlows().get(OL_EnergyCarriers.HYDROGEN));	// Update hydrogen production deficit	
 	
diff --git a/_alp/Agents/GCEnergyProduction/Code/Functions.java b/_alp/Agents/GCEnergyProduction/Code/Functions.java
index 22e6b8e2..3dc1b08e 100644
--- a/_alp/Agents/GCEnergyProduction/Code/Functions.java
+++ b/_alp/Agents/GCEnergyProduction/Code/Functions.java
@@ -1,10 +1,10 @@
 double f_operateFlexAssets_overwrite()
 {/*ALCODESTART::1671111800831*/
-for( J_EA v : c_conversionAssets ){
+/*for( J_EA v : c_conversionAssets ){
 	if (v instanceof J_EAConversionElektrolyser) {
 		f_manageElektrolyser((J_EAConversionElektrolyser)v);
 	}
-}
+}*/
 
 f_manageCharging();
 
diff --git a/_alp/Agents/GCEnergyProduction/Code/Functions.xml b/_alp/Agents/GCEnergyProduction/Code/Functions.xml
index 59a72262..e4594aac 100644
--- a/_alp/Agents/GCEnergyProduction/Code/Functions.xml
+++ b/_alp/Agents/GCEnergyProduction/Code/Functions.xml
@@ -21,6 +21,7 @@
 		<ReturnType>double</ReturnType>
 		<Id>1671112355094</Id>
 		<Name><![CDATA[f_manageElektrolyser]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>800</X>
 		<Y>480</Y>
 		<Label>
diff --git a/_alp/Agents/GCHouse/Code/Functions.java b/_alp/Agents/GCHouse/Code/Functions.java
index fc307798..f09ca3d6 100644
--- a/_alp/Agents/GCHouse/Code/Functions.java
+++ b/_alp/Agents/GCHouse/Code/Functions.java
@@ -4,9 +4,9 @@
 
 //Check if there is hot water being produced by the pt
 double ptProduction_kW = 0; //NEEDS TO BE A LOCAL
-for (J_EA j_ea : c_ptAssets) {
+/*for (J_EA j_ea : c_ptAssets) {
 	ptProduction_kW -= j_ea.getLastFlows().get(OL_EnergyCarriers.HEAT);
-}
+}*/
 v_hotwaterDemand_kW = max(0, v_hotwaterDemand_kW - ptProduction_kW); // Need to do this, because pt has already compensated the hot water demand in the gc flows, so just need to update this value
 
 if(p_heatBuffer != null){
@@ -773,7 +773,7 @@ else if ( v_batterySOC_fr < 0.6 && v_currentPowerElectricity_kW < 1 && v_current
 }
 if (j_ea instanceof J_EAAirco) {
 	p_airco = (J_EAAirco)j_ea;
-	c_electricHeatpumpAssets.add(j_ea);
+	//c_electricHeatpumpAssets.add(j_ea);
 }
 /*ALCODEEND*/}
 
@@ -875,8 +875,8 @@ else if (p_primaryHeatingAsset instanceof J_EAConversionGasBurner && p_BuildingT
 // Add heat from cooking assets to house
 if (p_cookingTracker != null) { // check for presence of cooking asset
 	p_cookingTracker.manageActivities((energyModel.t_h-energyModel.p_runStartTime_h)*60); // also calls f_updateAllFlows in HOB asset	
-	v_electricHobConsumption_kW += p_cookingTracker.HOB.getLastFlows().get(OL_EnergyCarriers.ELECTRICITY); // PowerFlows van consumption assets worden in f_calculateEnergyBalance opgeteld, dus ken dit niet toe aan totale consumptie!
-	v_electricHobConsumption_kWh += v_electricHobConsumption_kW * energyModel.p_timeStep_h;
+	//v_electricHobConsumption_kW += p_cookingTracker.HOB.getLastFlows().get(OL_EnergyCarriers.ELECTRICITY); // PowerFlows van consumption assets worden in f_calculateEnergyBalance opgeteld, dus ken dit niet toe aan totale consumptie!
+	//v_electricHobConsumption_kWh += v_electricHobConsumption_kW * energyModel.p_timeStep_h;
 	v_residualHeatGasPit_kW = -p_cookingTracker.HOB.getLastFlows().get(OL_EnergyCarriers.HEAT);
 	if (p_BuildingThermalAsset != null) {
 		p_BuildingThermalAsset.v_powerFraction_fr += v_residualHeatGasPit_kW / p_BuildingThermalAsset.getCapacityHeat_kW();
@@ -934,7 +934,7 @@ else if (p_primaryHeatingAsset instanceof J_EAConversionGasBurner && p_BuildingT
 }
 if (j_ea instanceof J_EAAirco) {
 	p_airco = null;
-	c_electricHeatpumpAssets.remove(j_ea);
+	//c_electricHeatpumpAssets.remove(j_ea);
 }
 /*ALCODEEND*/}
 
diff --git a/_alp/Agents/GCHouse/Variables.xml b/_alp/Agents/GCHouse/Variables.xml
index a17259a5..1df4fb8c 100644
--- a/_alp/Agents/GCHouse/Variables.xml
+++ b/_alp/Agents/GCHouse/Variables.xml
@@ -122,6 +122,7 @@
 		<Id>1690363061408</Id>
 		<Name><![CDATA[v_electricHobConsumption_kWh]]></Name>
 		<Description><![CDATA[This is part of the v_fixedConsumptionElectric_kW, thus variable only exists for additional information]]></Description>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>150</X>
 		<Y>1520</Y>
 		<Label>
diff --git a/_alp/Agents/GCNeighborhood/Code/Functions.java b/_alp/Agents/GCNeighborhood/Code/Functions.java
index 81a56619..967afc46 100644
--- a/_alp/Agents/GCNeighborhood/Code/Functions.java
+++ b/_alp/Agents/GCNeighborhood/Code/Functions.java
@@ -322,7 +322,7 @@ else if (j_ea.energyAssetType == OL_EnergyAssetType.WINDMILL) {
 	} else if (vehicle instanceof J_EAEV) {
 		c_vehiclesAvailableForCharging.add((J_EAEV)vehicle);
 		energyModel.c_EVs.add((J_EAEV)vehicle);	
-		c_EvAssets.add(j_ea);
+		//c_EvAssets.add(j_ea);
 	}
 	c_vehicleAssets.add(vehicle);		
 	J_ActivityTrackerTrips tripTracker = vehicle.getTripTracker();
@@ -353,23 +353,23 @@ else if (j_ea.energyAssetType == OL_EnergyAssetType.WINDMILL) {
 		p_DHWAsset = (J_EAConsumption)j_ea;	
 	}
 	if( j_ea.energyAssetType == OL_EnergyAssetType.ELECTRICITY_DEMAND ) {
-		c_fixedConsumptionElectricAssets.add(j_ea);
+		//c_fixedConsumptionElectricAssets.add(j_ea);
 	}
 	if( j_ea.energyAssetType == OL_EnergyAssetType.ELECTRIC_HOB ) {
-		c_electricHobAssets.add(j_ea);
+		//c_electricHobAssets.add(j_ea);
 	}
 } else if (j_ea instanceof J_EAProduction) {
 	c_productionAssets.add((J_EAProduction)j_ea);
 	//energyModel.c_productionAssets.add((J_EAProduction)j_ea);
 	
 	if (j_ea.energyAssetType == OL_EnergyAssetType.PHOTOVOLTAIC) {
-		v_liveAssetsMetaData.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);
 		}
 		energyModel.v_liveAssetsMetaData.totalInstalledPVPower_kW += ((J_EAProduction)j_ea).getCapacityElectric_kW();
-		c_pvAssets.add(j_ea);
+		//c_pvAssets.add(j_ea);
 	}
 	else if (j_ea.energyAssetType == OL_EnergyAssetType.WINDMILL) {
 		v_liveAssetsMetaData.totalInstalledWindPower_kW += ((J_EAProduction)j_ea).getCapacityElectric_kW();
@@ -377,17 +377,17 @@ else if (j_ea.energyAssetType == OL_EnergyAssetType.WINDMILL) {
 			p_parentNodeElectric.f_updateTotalInstalledProductionAssets(OL_EnergyAssetType.WINDMILL, ((J_EAProduction)j_ea).getCapacityElectric_kW(), true);
 		}
 		energyModel.v_liveAssetsMetaData.totalInstalledWindPower_kW += ((J_EAProduction)j_ea).getCapacityElectric_kW();
-		c_windAssets.add(j_ea);
+		//c_windAssets.add(j_ea);
 	}
 	else if (j_ea.energyAssetType == OL_EnergyAssetType.PHOTOTHERMAL){
-		v_liveAssetsMetaData.hasPT = true;
-		c_ptAssets.add(j_ea);
+		//v_liveAssetsMetaData.hasPT = true;
+		//c_ptAssets.add(j_ea);
 	}
 } 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){
 		if (j_ea.energyAssetType == OL_EnergyAssetType.ELECTRIC_HOB) {
-			c_electricHobAssets.add(j_ea);
+			//c_electricHobAssets.add(j_ea);
 			//c_conversionElectricAssets.add(j_ea);
 		}
 		if (p_cookingTracker == null) {
@@ -400,7 +400,7 @@ else if (j_ea.energyAssetType == OL_EnergyAssetType.PHOTOTHERMAL){
 		p_primaryHeatingAsset = (J_EAConversion)j_ea;
 	} else if (j_ea instanceof J_EAConversionHeatPump) {
 		energyModel.c_ambientDependentAssets.add(j_ea);
-		c_electricHeatpumpAssets.add(j_ea);
+//		c_electricHeatpumpAssets.add(j_ea);
 		if(((J_EAConversionHeatPump)j_ea).getAmbientTempType() == OL_AmbientTempType.AMBIENT_AIR){
 			p_secondaryHeatingAsset = (J_EAConversion)j_ea;
 		}
@@ -412,7 +412,7 @@ else if(((J_EAConversionHeatPump)j_ea).getAmbientTempType() == OL_AmbientTempTyp
 	} else if (j_ea instanceof J_EAConversionHydrogenBurner) {
 		p_quaternaryHeatingAsset = (J_EAConversion)j_ea;
 	} else if (j_ea instanceof J_EAConversionGasCHP) {
-		c_chpAssets.add(j_ea);
+		//c_chpAssets.add(j_ea);
 	}
 } else if  (j_ea instanceof J_EAStorage) {
 	c_storageAssets.add((J_EAStorage)j_ea);
@@ -436,7 +436,7 @@ else if(((J_EAConversionHeatPump)j_ea).getAmbientTempType() == OL_AmbientTempTyp
 		p_gasBuffer = (J_EAStorageGas)j_ea;
 	} else if (j_ea instanceof J_EAStorageElectric) {
 		p_batteryAsset = (J_EAStorageElectric)j_ea;
-		c_batteryAssets.add(j_ea);
+		//c_batteryAssets.add(j_ea);
 		v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh += ((J_EAStorageElectric)j_ea).getStorageCapacity_kWh()/1000;
 		energyModel.v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh += ((J_EAStorageElectric)j_ea).getStorageCapacity_kWh()/1000;
 		
@@ -446,20 +446,22 @@ else if(((J_EAConversionHeatPump)j_ea).getAmbientTempType() == OL_AmbientTempTyp
 } else if  (j_ea instanceof J_EAProfile) {
 	//p_energyProfile = (J_EAProfile)j_ea;
 	c_profileAssets.add((J_EAProfile)j_ea);
+	/*
 	if (((J_EAProfile)j_ea).profileType == OL_ProfileAssetType.CHARGING){
-			//v_evChargingPowerElectric_kW += flowsArray[4] - flowsArray[0];
-			c_EvAssets.add(j_ea);
-		} else if( ((J_EAProfile)j_ea).profileType == OL_ProfileAssetType.ELECTRICITYBASELOAD){
-			//v_fixedConsumptionElectric_kW += flowsArray[4] - flowsArray[0];
-			c_fixedConsumptionElectricAssets.add(j_ea);
-		} else if( ((J_EAProfile)j_ea).profileType == OL_ProfileAssetType.WINDTURBINE){
-			//v_windProductionElectric_kW += flowsArray[0];
-			c_windAssets.add(j_ea);
-		} else if( ((J_EAProfile)j_ea).profileType == OL_ProfileAssetType.HEATDEMAND){
-			//Do nothing
-		} else {
-			traceln( "Unrecognized profile type!");
-		}
+		//v_evChargingPowerElectric_kW += flowsArray[4] - flowsArray[0];
+		//c_EvAssets.add(j_ea);
+	} else if( ((J_EAProfile)j_ea).profileType == OL_ProfileAssetType.ELECTRICITYBASELOAD){
+		//v_fixedConsumptionElectric_kW += flowsArray[4] - flowsArray[0];
+		//c_fixedConsumptionElectricAssets.add(j_ea);
+	} else if( ((J_EAProfile)j_ea).profileType == OL_ProfileAssetType.WINDTURBINE){
+		//v_windProductionElectric_kW += flowsArray[0];
+		//c_windAssets.add(j_ea);
+	} else if( ((J_EAProfile)j_ea).profileType == OL_ProfileAssetType.HEATDEMAND){
+		//Do nothing
+	} else {
+		traceln( "Unrecognized profile type!");
+	}
+	*/
 } else {
 	traceln("Unrecognized energy asset %s in gridconnection %s", j_ea, this);
 }
diff --git a/_alp/Agents/GridConnection/Code/Functions.java b/_alp/Agents/GridConnection/Code/Functions.java
index 3c419938..019521e3 100644
--- a/_alp/Agents/GridConnection/Code/Functions.java
+++ b/_alp/Agents/GridConnection/Code/Functions.java
@@ -44,6 +44,13 @@
 	//}
 }
 
+if (energyModel.v_isRapidRun){
+	f_rapidRunDataLogging();
+} else {
+	f_fillLiveDataSets();
+}
+
+/*
 // Further Subdivision of asset types within energy carriers
 v_fixedConsumptionElectric_kW = 0;
 for (J_EA j_ea : c_fixedConsumptionElectricAssets) {
@@ -115,13 +122,9 @@
 	max(0,-v_batteryPowerElectric_kW),
 	max(0,-v_evChargingPowerElectric_kW),
 	v_batteryStoredEnergy_kWh/1000);
-
+*/
 // 
-if (energyModel.v_isRapidRun){
-	f_rapidRunDataLogging();
-} else {
-	f_fillLiveDataSets();
-}
+
 /*ALCODEEND*/}
 
 double f_operateFlexAssets()
@@ -137,15 +140,16 @@
 fm_currentProductionFlows_kW.clear();
 fm_currentConsumptionFlows_kW.clear();
 fm_currentBalanceFlows_kW.clear();
+fm_currentAssetFlows_kW.clear();
 
 v_currentPrimaryEnergyProduction_kW = 0;
 v_currentFinalEnergyConsumption_kW = 0;
 
 v_currentEnergyCurtailed_kW = 0;
 v_currentPrimaryEnergyProductionHeatpumps_kW = 0;
-
+v_batteryStoredEnergy_kWh = 0;
 // Categorical power flows
-v_fixedConsumptionElectric_kW = 0;
+/*v_fixedConsumptionElectric_kW = 0;
 v_electricHobConsumption_kW = 0;
 v_heatPumpElectricityConsumption_kW = 0;
 v_hydrogenElectricityConsumption_kW = 0;
@@ -156,7 +160,7 @@
 v_ptProductionHeat_kW = 0;
 v_conversionPowerElectric_kW = 0;
 v_CHPProductionElectric_kW = 0;
-v_districtHeatDelivery_kW = 0;
+v_districtHeatDelivery_kW = 0;*/
 
 if (v_enableNFato) {
 	f_nfatoUpdateConnectionCapacity();
@@ -214,7 +218,7 @@
 
 double powerDemand_kW = fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.HEAT);
 
-if(powerDemand_kW < 0 && v_liveAssetsMetaData.hasPT){//If there is 'overproduction' of heat, that can not be collected by the heat buffer: no power demand -> will be curtailed.
+if(powerDemand_kW < 0 && v_liveAssetsMetaData.activeAssetFlows.contains(OL_AssetFlowCategories.ptProductionHeat_kW)){//If there is 'overproduction' of heat, that can not be collected by the heat buffer: no power demand -> will be curtailed.
 	powerDemand_kW = 0;
 }
 
@@ -521,46 +525,40 @@ else if (p_primaryHeatingAsset== null && p_secondaryHeatingAsset != null && v_ha
 {/*ALCODESTART::1692799608559*/
 for (OL_EnergyCarriers EC : j_ea.getActiveConsumptionEnergyCarriers()) {
 	if (!v_activeConsumptionEnergyCarriers.contains(EC)) {
-		v_activeEnergyCarriers.add(EC);
 		v_activeConsumptionEnergyCarriers.add(EC);
-			
-		if (energyModel.b_isInitialized) {
+		v_activeEnergyCarriers.add(EC);
+		if (energyModel.b_isInitialized && v_isActive) {
+			f_addConsumptionEnergyCarrier(EC);	
 			//Add EC to energyModel
 			energyModel.f_addConsumptionEnergyCarrier(EC);
-			
-			//Initialize dataset
-			DataSet dsDemand = new DataSet( (int)(168 / energyModel.p_timeStep_h) );
-			double startTime = v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMin();
-			double endTime = v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMax();
-			for (double t = startTime; t <= endTime; t += energyModel.p_timeStep_h) {
-				dsDemand.add( t, 0);
-			}
-			v_liveData.dsm_liveDemand_kW.put( EC, dsDemand);
+			c_parentCoops.forEach(x -> x.f_addConsumptionEnergyCarrier(EC));
 		}
 	}
 }
 
 for (OL_EnergyCarriers EC : j_ea.getActiveProductionEnergyCarriers()) {
 	if (!v_activeProductionEnergyCarriers.contains(EC)) {
+		v_activeProductionEnergyCarriers.add(EC);
 		v_activeEnergyCarriers.add(EC);
-		v_activeProductionEnergyCarriers.add(EC);		
-		if (energyModel.b_isInitialized) {
-		
+		if (energyModel.b_isInitialized && v_isActive) {		
+			f_addProductionEnergyCarrier(EC);
 			//Add EC to energyModel
 			energyModel.f_addProductionEnergyCarrier(EC);
-			
-			//Initialize datasets
-			DataSet dsSupply = new DataSet( (int)(168 / energyModel.p_timeStep_h) );
-			double startTime = v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMin();
-			double endTime = v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMax();
-			for (double t = startTime; t <= endTime; t += energyModel.p_timeStep_h) {
-				dsSupply.add( t, 0);
-			}
-			v_liveData.dsm_liveSupply_kW.put( EC, dsSupply);
+			c_parentCoops.forEach(x -> x.f_addProductionEnergyCarrier(EC));			
 		}
 	}
 }
 
+if(j_ea.assetFlowCategory != null &&!v_liveAssetsMetaData.activeAssetFlows.contains(j_ea.assetFlowCategory)) { // add live dataset
+	OL_AssetFlowCategories AC = j_ea.assetFlowCategory;
+	v_liveAssetsMetaData.activeAssetFlows.add(AC);
+	if (energyModel.b_isInitialized && v_isActive) {		
+		f_addAssetFlow(AC);
+		energyModel.f_addAssetFlow(AC);
+		c_parentCoops.forEach(x->x.f_addAssetFlow(AC));		
+	}
+}
+
 energyModel.c_energyAssets.add(j_ea);
 c_energyAssets.add(j_ea);
 
@@ -573,7 +571,7 @@ else if (p_primaryHeatingAsset== null && p_secondaryHeatingAsset != null && v_ha
 	} else if (vehicle instanceof J_EAEV) {
 		c_vehiclesAvailableForCharging.add((J_EAEV)vehicle);
 		energyModel.c_EVs.add((J_EAEV)vehicle);	
-		c_EvAssets.add(j_ea);
+		//c_EvAssets.add(j_ea);
 	}
 	c_vehicleAssets.add(vehicle);		
 	J_ActivityTrackerTrips tripTracker = vehicle.getTripTracker();
@@ -604,17 +602,17 @@ else if (p_primaryHeatingAsset== null && p_secondaryHeatingAsset != null && v_ha
 		p_DHWAsset = (J_EAConsumption)j_ea;	
 	}
 	if( j_ea.energyAssetType == OL_EnergyAssetType.ELECTRICITY_DEMAND ) {
-		c_fixedConsumptionElectricAssets.add(j_ea);
+		//c_fixedConsumptionElectricAssets.add(j_ea);
 	}
 	if( j_ea.energyAssetType == OL_EnergyAssetType.ELECTRIC_HOB ) {
-		c_electricHobAssets.add(j_ea);
+		//c_electricHobAssets.add(j_ea);
 	}
 } else if (j_ea instanceof J_EAProduction) {
 	c_productionAssets.add((J_EAProduction)j_ea);
 	//energyModel.c_productionAssets.add((J_EAProduction)j_ea);
 	
 	if (j_ea.energyAssetType == OL_EnergyAssetType.PHOTOVOLTAIC) {
-		v_liveAssetsMetaData.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 ) {
@@ -622,10 +620,10 @@ else if (p_primaryHeatingAsset== null && p_secondaryHeatingAsset != null && v_ha
 		}
 		c_parentCoops.forEach( coop -> coop.v_liveAssetsMetaData.totalInstalledPVPower_kW += capacity_kW);
 		energyModel.v_liveAssetsMetaData.totalInstalledPVPower_kW += capacity_kW;
-		c_pvAssets.add(j_ea);
+		//c_pvAssets.add(j_ea);
 	}
 	else if (j_ea.energyAssetType == OL_EnergyAssetType.WINDMILL) {
-		v_liveAssetsMetaData.hasWindturbine = true;
+		//v_liveAssetsMetaData.hasWindturbine = true;
 		double capacity_kW = ((J_EAProduction)j_ea).getCapacityElectric_kW();
 		v_liveAssetsMetaData.totalInstalledWindPower_kW += capacity_kW;
 		if ( p_parentNodeElectric != null ) {
@@ -633,11 +631,11 @@ 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;
-		c_windAssets.add(j_ea);
+		//c_windAssets.add(j_ea);
 	}
 	else if (j_ea.energyAssetType == OL_EnergyAssetType.PHOTOTHERMAL){
-		v_liveAssetsMetaData.hasPT = true;
-		c_ptAssets.add(j_ea);
+		//v_liveAssetsMetaData.hasPT = true;
+		//c_ptAssets.add(j_ea);
 		if (p_heatingManagement != null) {
 			p_heatingManagement.notInitialized();
 		}
@@ -647,7 +645,8 @@ else if (j_ea.energyAssetType == OL_EnergyAssetType.PHOTOTHERMAL){
 	// Non Heating Assets
 	if ( j_ea.energyAssetType == OL_EnergyAssetType.GAS_PIT || j_ea.energyAssetType == OL_EnergyAssetType.ELECTRIC_HOB){
 		if (j_ea.energyAssetType == OL_EnergyAssetType.ELECTRIC_HOB) {
-			c_electricHobAssets.add(j_ea);
+			//c_electricHobAssets.add(j_ea);
+			//c_conversionElectricAssets.add(j_ea);
 		}
 		if (p_cookingTracker == null) {
 			int rowIndex = uniform_discr(2, 300); 
@@ -655,8 +654,8 @@ else if (j_ea.energyAssetType == OL_EnergyAssetType.PHOTOTHERMAL){
 		} else {
 			p_cookingTracker.HOB = (J_EAConversion)j_ea;
 		}
-	} else if (j_ea instanceof J_EAConversionElectrolyser || j_ea instanceof J_EAConversionElektrolyser) {
-		c_electrolyserAssets.add(j_ea);
+	//} else if (j_ea instanceof J_EAConversionElectrolyser) {
+		//c_electrolyserAssets.add(j_ea);
 	} else {
 		// Heating Assets
 		c_heatingAssets.add((J_EAConversion)j_ea);
@@ -666,9 +665,9 @@ else if (j_ea.energyAssetType == OL_EnergyAssetType.PHOTOTHERMAL){
 		// Special Heating Assets
 		if (j_ea instanceof J_EAConversionHeatPump) {
 			energyModel.c_ambientDependentAssets.add(j_ea);
-			c_electricHeatpumpAssets.add(j_ea);
+			//c_electricHeatpumpAssets.add(j_ea);
 		} else if (j_ea instanceof J_EAConversionGasCHP) {
-			c_chpAssets.add(j_ea);
+			//c_chpAssets.add(j_ea);
 		}
 	}
 } else if  (j_ea instanceof J_EAStorage) {
@@ -692,7 +691,7 @@ else if (j_ea.energyAssetType == OL_EnergyAssetType.PHOTOTHERMAL){
 		p_gasBuffer = (J_EAStorageGas)j_ea;
 	} else if (j_ea instanceof J_EAStorageElectric) {
 		p_batteryAsset = (J_EAStorageElectric)j_ea;
-		c_batteryAssets.add(j_ea);
+		//c_batteryAssets.add(j_ea);
 		double capacity_MWh = ((J_EAStorageElectric)j_ea).getStorageCapacity_kWh()/1000;
 		v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh += capacity_MWh;
 		c_parentCoops.forEach( coop -> coop.v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh += capacity_MWh);
@@ -702,30 +701,11 @@ else if (j_ea.energyAssetType == OL_EnergyAssetType.PHOTOTHERMAL){
 } else if  (j_ea instanceof J_EAProfile) {
 	//p_energyProfile = (J_EAProfile)j_ea;
 	c_profileAssets.add((J_EAProfile)j_ea);
-	if (((J_EAProfile)j_ea).profileType == OL_ProfileAssetType.CHARGING){
-			//v_evChargingPowerElectric_kW += flowsArray[4] - flowsArray[0];
-			c_EvAssets.add(j_ea);
-		} else if( ((J_EAProfile)j_ea).profileType == OL_ProfileAssetType.ELECTRICITYBASELOAD){
-			//v_fixedConsumptionElectric_kW += flowsArray[4] - flowsArray[0];
-			c_fixedConsumptionElectricAssets.add(j_ea);
-		} else if( ((J_EAProfile)j_ea).profileType == OL_ProfileAssetType.WINDTURBINE){
-			//v_windProductionElectric_kW += flowsArray[0];
-			c_windAssets.add(j_ea);
-			// TODO: Add some to the total installed wind (of this GC, its GN, the energymodel (and its parent coop))
-		} else if( ((J_EAProfile)j_ea).profileType == OL_ProfileAssetType.HEATDEMAND){
-			//Do nothing
-		} else if( ((J_EAProfile)j_ea).profileType == OL_ProfileAssetType.METHANEDEMAND){
-			//Do nothing
-		} else if( ((J_EAProfile)j_ea).profileType == OL_ProfileAssetType.HEATPUMP_ELECTRICITY_CONSUMPTION){
-			c_electricHeatpumpAssets.add(j_ea);
-		} else {
-			traceln( "Unrecognized profile type!");
-		}
 } 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);
+	//c_EvAssets.add(j_ea);
 } else {
 	if (!(this instanceof GCHouse && j_ea instanceof J_EAAirco)) {
 		traceln("Unrecognized energy asset %s in gridconnection %s", j_ea, this);
@@ -908,7 +888,7 @@ else if (j_ea.getEAType() == OL_EnergyAssetType.WINDMILL) {
 
 /*ALCODEEND*/}
 
-double f_addFlows(J_FlowsMap flowsMap,double energyUse_kW,J_EA caller)
+double f_addFlows(J_FlowsMap flowsMap,double energyUse_kW,J_ValueMap assetFlowsMap,J_EA caller)
 {/*ALCODESTART::1702373771433*/
 if (caller instanceof J_EAStorageElectric) { 
 	fm_currentBalanceFlows_kW.addFlow(OL_EnergyCarriers.ELECTRICITY, flowsMap.get(OL_EnergyCarriers.ELECTRICITY));
@@ -916,6 +896,7 @@ else if (j_ea.getEAType() == OL_EnergyAssetType.WINDMILL) {
 	// Only allocate battery losses as consumption. Charging/discharging is neither production nor consumption. Do we need an element in flowsmap indicating power into storage??
 	fm_currentConsumptionFlows_kW.addFlow(OL_EnergyCarriers.ELECTRICITY, max(0, energyUse_kW));
 	v_currentFinalEnergyConsumption_kW += max(0, energyUse_kW);
+	v_batteryStoredEnergy_kWh += ((J_EAStorageElectric)caller).getCurrentStateOfCharge_kWh();
 } else {
 	fm_currentBalanceFlows_kW.addFlows(flowsMap);
 	for (OL_EnergyCarriers EC : flowsMap.keySet()) {
@@ -934,6 +915,8 @@ else if (j_ea.getEAType() == OL_EnergyAssetType.WINDMILL) {
 if ( caller instanceof J_EAConversionHeatPump ) {
 	v_currentPrimaryEnergyProductionHeatpumps_kW -= energyUse_kW;
 }
+
+fm_currentAssetFlows_kW.addFlows(assetFlowsMap);
 /*ALCODEEND*/}
 
 double f_removeTheJ_EA(J_EA j_ea)
@@ -956,7 +939,7 @@ else if (j_ea.getEAType() == OL_EnergyAssetType.WINDMILL) {
 	} else if (vehicle instanceof J_EAEV) {
 		c_vehiclesAvailableForCharging.remove((J_EAEV)vehicle);
 		energyModel.c_EVs.remove((J_EAEV)vehicle);
-		c_EvAssets.remove(j_ea);
+		//c_EvAssets.remove(j_ea);
 	}
 	c_vehicleAssets.remove(j_ea);
 		
@@ -970,10 +953,10 @@ else if (j_ea.getEAType() == OL_EnergyAssetType.WINDMILL) {
 		p_DHWAsset = null;	
 	}
 	if( j_ea.energyAssetType == OL_EnergyAssetType.ELECTRICITY_DEMAND ) {
-		c_fixedConsumptionElectricAssets.remove(j_ea);
+		//c_fixedConsumptionElectricAssets.remove(j_ea);
 	}
 	if( j_ea.energyAssetType == OL_EnergyAssetType.ELECTRIC_HOB ) {
-		c_electricHobAssets.remove(j_ea);
+		//c_electricHobAssets.remove(j_ea);
 	}
 } else if (j_ea instanceof J_EAProduction) {
 	c_productionAssets.remove((J_EAProduction)j_ea);
@@ -981,7 +964,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_liveAssetsMetaData.hasPV = false;
+			//v_liveAssetsMetaData.hasPV = false;
 		}
 		double capacity_kW = ((J_EAProduction)j_ea).getCapacityElectric_kW();
 		v_liveAssetsMetaData.totalInstalledPVPower_kW -= capacity_kW;
@@ -990,7 +973,7 @@ else if (j_ea.getEAType() == OL_EnergyAssetType.WINDMILL) {
 		}
 		c_parentCoops.forEach( coop -> coop.v_liveAssetsMetaData.totalInstalledPVPower_kW -= capacity_kW);		
 		energyModel.v_liveAssetsMetaData.totalInstalledPVPower_kW -= capacity_kW;
-		c_pvAssets.remove(j_ea);
+		//c_pvAssets.remove(j_ea);
 	}
 	else if (j_ea.energyAssetType == OL_EnergyAssetType.WINDMILL) {
 		double capacity_kW = ((J_EAProduction)j_ea).getCapacityElectric_kW();
@@ -1000,24 +983,24 @@ else if (j_ea.energyAssetType == OL_EnergyAssetType.WINDMILL) {
 		}
 		c_parentCoops.forEach( coop -> coop.v_liveAssetsMetaData.totalInstalledPVPower_kW -= capacity_kW);		
 		energyModel.v_liveAssetsMetaData.totalInstalledWindPower_kW -= capacity_kW;
-		c_windAssets.remove(j_ea);
+		//c_windAssets.remove(j_ea);
 	}
 	else if (j_ea.energyAssetType == OL_EnergyAssetType.PHOTOTHERMAL){
-		if (c_ptAssets.size() <= 1) {
-			v_liveAssetsMetaData.hasPT = false;
+		/*if (c_ptAssets.size() <= 1) {
+			//v_liveAssetsMetaData.hasPT = false;
 		}
-		c_ptAssets.remove(j_ea);
+		c_ptAssets.remove(j_ea);*/
 	}
 } else if (j_ea instanceof J_EAConversion) {
 	c_conversionAssets.remove((J_EAConversion)j_ea);
 	// Non Heating Assets
 	if (j_ea.energyAssetType == OL_EnergyAssetType.ELECTRIC_HOB) {
-		c_electricHobAssets.remove(j_ea);
+		//c_electricHobAssets.remove(j_ea);
 	}
 	if ( j_ea.energyAssetType == OL_EnergyAssetType.GAS_PIT || j_ea.energyAssetType == OL_EnergyAssetType.ELECTRIC_HOB){
 		p_cookingTracker = null;
 	} else if (j_ea instanceof J_EAConversionElectrolyser) {
-		c_electrolyserAssets.remove(j_ea);
+		//c_electrolyserAssets.remove(j_ea);
 	}
 	else{
 		// Heating Assets
@@ -1028,9 +1011,9 @@ else if (j_ea.energyAssetType == OL_EnergyAssetType.PHOTOTHERMAL){
 		// Special Heating Assets
 		if (j_ea instanceof J_EAConversionHeatPump) {
 			energyModel.c_ambientDependentAssets.remove(j_ea);
-			c_electricHeatpumpAssets.remove(j_ea);
+			//c_electricHeatpumpAssets.remove(j_ea);
 		} else if (j_ea instanceof J_EAConversionGasCHP) {
-			c_chpAssets.remove(j_ea);
+			//c_chpAssets.remove(j_ea);
 		}
 	}
 } else if  (j_ea instanceof J_EAStorage) {
@@ -1054,7 +1037,7 @@ else if (j_ea.energyAssetType == OL_EnergyAssetType.PHOTOTHERMAL){
 		p_gasBuffer = null;
 	} else if (j_ea instanceof J_EAStorageElectric) {
 		p_batteryAsset = null;
-		c_batteryAssets.remove(j_ea);
+		//c_batteryAssets.remove(j_ea);
 		v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh -= ((J_EAStorageElectric)j_ea).getStorageCapacity_kWh()/1000;
 		energyModel.v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh -= ((J_EAStorageElectric)j_ea).getStorageCapacity_kWh()/1000;
 	}
@@ -1062,11 +1045,11 @@ else if (j_ea.energyAssetType == OL_EnergyAssetType.PHOTOTHERMAL){
 	//p_energyProfile = null;
 	c_profileAssets.remove((J_EAProfile)j_ea);
 	if( ((J_EAProfile)j_ea).profileType == OL_ProfileAssetType.HEATPUMP_ELECTRICITY_CONSUMPTION){
-		c_electricHeatpumpAssets.add(j_ea);
+		//c_electricHeatpumpAssets.add(j_ea);
 	}
 } else if (j_ea instanceof J_EACharger) {
 	c_chargers.remove(j_ea);
-	c_EvAssets.remove(j_ea);	
+	//c_EvAssets.remove(j_ea);	
 } else {
 	traceln("Unrecognized energy asset %s in gridconnection %s", j_ea, this);
 }
@@ -1203,7 +1186,7 @@ else if (j_ea.energyAssetType == OL_EnergyAssetType.PHOTOTHERMAL){
 }
 /*ALCODEEND*/}
 
-double f_removeFlows(J_FlowsMap flowsMap,double energyUse_kW,J_EA caller)
+double f_removeFlows(J_FlowsMap flowsMap,double energyUse_kW,J_ValueMap<OL_AssetFlowCategories> assetFlowsMap_kW,J_EA caller)
 {/*ALCODESTART::1722512642645*/
 for (OL_EnergyCarriers EC : flowsMap.keySet()) {
 	fm_currentBalanceFlows_kW.addFlow(EC, -flowsMap.get(EC));
@@ -1231,6 +1214,10 @@ else if (flowsMap.get(EC) > 0){
 if ( caller instanceof J_EAConversionHeatPump ) {
 	v_currentPrimaryEnergyProductionHeatpumps_kW += energyUse_kW;
 }
+
+for(var AC : assetFlowsMap_kW.keySet()) {
+	fm_currentAssetFlows_kW.addFlow(AC, -assetFlowsMap_kW.get(AC));
+}
 /*ALCODEEND*/}
 
 double f_fillLiveDataSets()
@@ -1242,11 +1229,12 @@ else if (flowsMap.get(EC) > 0){
 	fm_currentBalanceFlows_kW,
 	fm_currentConsumptionFlows_kW,
 	fm_currentProductionFlows_kW,
+	fm_currentAssetFlows_kW,
 	v_currentPrimaryEnergyProduction_kW, 
 	v_currentFinalEnergyConsumption_kW, 
 	v_currentPrimaryEnergyProductionHeatpumps_kW, 
-	v_currentEnergyCurtailed_kW, 
-	v_assetFlows 
+	v_currentEnergyCurtailed_kW,
+	v_batteryStoredEnergy_kWh/1000 
 );
 /*ALCODEEND*/}
 
@@ -1255,11 +1243,12 @@ else if (flowsMap.get(EC) > 0){
 v_rapidRunData.addTimeStep(fm_currentBalanceFlows_kW,
 	fm_currentConsumptionFlows_kW,
 	fm_currentProductionFlows_kW,
+	fm_currentAssetFlows_kW,
 	v_currentPrimaryEnergyProduction_kW, 
 	v_currentFinalEnergyConsumption_kW, 
 	v_currentPrimaryEnergyProductionHeatpumps_kW, 
 	v_currentEnergyCurtailed_kW, 
-	v_assetFlows, 
+	v_batteryStoredEnergy_kWh/1000,
 	energyModel);
 /*ALCODEEND*/}
 
@@ -1277,8 +1266,7 @@ else if (flowsMap.get(EC) > 0){
 	// Set GIS Region visibility
 	for (GIS_Object obj : c_connectedGISObjects) {
 		obj.gisRegion.setVisible(false);
-	}
-	
+	}	
 
 	// update GN parents' wind / solar totals
 	p_parentNodeElectric.f_updateTotalInstalledProductionAssets(OL_EnergyAssetType.PHOTOVOLTAIC, v_liveAssetsMetaData.totalInstalledPVPower_kW, false);
@@ -1300,35 +1288,19 @@ else if (flowsMap.get(EC) > 0){
 	fm_currentProductionFlows_kW.clear();
 	fm_currentConsumptionFlows_kW.clear();
 	fm_currentBalanceFlows_kW.clear();
+	fm_currentAssetFlows_kW.clear();
 	
 	v_previousPowerElectricity_kW = 0;
 	v_previousPowerHeat_kW = 0;
-	//v_currentPowerElectricity_kW = 0;
-	//v_currentPowerMethane_kW = 0;
-	//v_currentPowerHydrogen_kW = 0;
-	//v_currentPowerHeat_kW = 0;
-	//v_currentPowerDiesel_kW = 0;
-	//v_currentElectricityConsumption_kW = 0;
-	//v_currentElectricityProduction_kW = 0;
-	//v_currentEnergyConsumption_kW = 0;
-	//v_currentEnergyProduction_kW = 0;
+
 	v_currentEnergyCurtailed_kW = 0;
 	v_currentPrimaryEnergyProductionHeatpumps_kW = 0;
-	v_fixedConsumptionElectric_kW = 0;
-	v_electricHobConsumption_kW = 0;
-	v_heatPumpElectricityConsumption_kW = 0;
-	v_hydrogenElectricityConsumption_kW = 0;
-	v_evChargingPowerElectric_kW = 0;
-	v_districtHeatDelivery_kW = 0;
-	v_batteryPowerElectric_kW = 0;
-	v_windProductionElectric_kW = 0;
-	v_pvProductionElectric_kW = 0;
-	v_ptProductionHeat_kW = 0;
-	v_conversionPowerElectric_kW = 0;
-	v_CHPProductionElectric_kW = 0;
-	
+	v_batteryStoredEnergy_kWh = 0;
+
+	v_isActive = setActive;
 }
 else {
+	//traceln("Activating gridConnection");
 	energyModel.c_gridConnections.add(this);
 	energyModel.c_pausedGridConnections.remove(this);
 
@@ -1340,7 +1312,9 @@ else if (flowsMap.get(EC) > 0){
 	// Set Connection Capacity according to NFATO
 	f_nfatoSetConnectionCapacity(false);
 	
+	v_isActive = setActive; // v_isActive must be true before calling updateActiveAssetData!
 	v_liveAssetsMetaData.updateActiveAssetData(new ArrayList<>(List.of(this)));
+	v_liveAssetsMetaData.activeAssetFlows.forEach(x->energyModel.f_addAssetFlow(x));
 	
 	// update GN parents' wind / solar totals (will be wrong if you changed your totals while paused)
 	p_parentNodeElectric.f_updateTotalInstalledProductionAssets(OL_EnergyAssetType.PHOTOVOLTAIC, v_liveAssetsMetaData.totalInstalledPVPower_kW, true);
@@ -1354,17 +1328,16 @@ else if (flowsMap.get(EC) > 0){
 		coop.v_liveAssetsMetaData.totalInstalledWindPower_kW += v_liveAssetsMetaData.totalInstalledWindPower_kW;
 		coop.v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh += v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh;
 	}
-	
-	
+		
 	//Initialize/reset dataset maps to 0
 	double startTime = energyModel.v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMin();
 	double endTime = energyModel.v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMax();
 	v_liveData.resetLiveDatasets(startTime, endTime, energyModel.p_timeStep_h);
-
+	//v_isActive = setActive; // 
 }
 
 //Update the 'isActive' variable
-v_isActive = setActive;
+
 /*ALCODEEND*/}
 
 double f_getChargeDeadline(J_EAEV ev)
@@ -1378,8 +1351,9 @@ else if (flowsMap.get(EC) > 0){
 
 double f_initializeDataSets()
 {/*ALCODESTART::1730728785333*/
-v_liveData.dsm_liveDemand_kW.createEmptyDataSets(v_activeEnergyCarriers, (int)(168 / energyModel.p_timeStep_h));
-v_liveData.dsm_liveSupply_kW.createEmptyDataSets(v_activeEnergyCarriers, (int)(168 / energyModel.p_timeStep_h));
+v_liveData.dsm_liveDemand_kW.createEmptyDataSets(v_activeConsumptionEnergyCarriers, (int)(168 / energyModel.p_timeStep_h));
+v_liveData.dsm_liveSupply_kW.createEmptyDataSets(v_activeProductionEnergyCarriers, (int)(168 / energyModel.p_timeStep_h));
+v_liveData.dsm_liveAssetFlows_kW.createEmptyDataSets(v_liveData.assetsMetaData.activeAssetFlows, (int)(168 / energyModel.p_timeStep_h));
 
 /*
 dsm_dailyAverageDemandDataSets_kW.createEmptyDataSets(v_activeEnergyCarriers, 365);
@@ -1490,3 +1464,62 @@ OL_GridConnectionHeatingType f_getCurrentHeatingType()
 engineGC.p_heatingManagement = heatingManagement;
 /*ALCODEEND*/}
 
+EnergyCoop f_addConsumptionEnergyCarrier(OL_EnergyCarriers EC)
+{/*ALCODESTART::1754380684463*/
+v_activeEnergyCarriers.add(EC);
+v_activeConsumptionEnergyCarriers.add(EC);
+
+DataSet dsDemand = new DataSet( (int)(168 / energyModel.p_timeStep_h) );
+
+double startTime = v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMin();
+double endTime = v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMax();
+for (double t = startTime; t <= endTime; t += energyModel.p_timeStep_h) {
+	dsDemand.add( t, 0);
+}
+v_liveData.dsm_liveDemand_kW.put( EC, dsDemand);
+
+/*ALCODEEND*/}
+
+EnergyCoop f_addProductionEnergyCarrier(OL_EnergyCarriers EC)
+{/*ALCODESTART::1754380684465*/
+v_activeEnergyCarriers.add(EC);
+v_activeProductionEnergyCarriers.add(EC);
+
+DataSet dsSupply = new DataSet( (int)(168 / energyModel.p_timeStep_h) );
+double startTime = v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMin();
+double endTime = v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMax();
+for (double t = startTime; t <= endTime; t += energyModel.p_timeStep_h) {
+	dsSupply.add( t, 0);
+}
+v_liveData.dsm_liveSupply_kW.put( EC, dsSupply);
+
+/*ALCODEEND*/}
+
+EnergyCoop f_addAssetFlow(OL_AssetFlowCategories AC)
+{/*ALCODESTART::1754380684467*/
+DataSet dsAsset = new DataSet( (int)(168 / energyModel.p_timeStep_h) );
+double startTime = v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMin();
+double endTime = v_liveData.dsm_liveDemand_kW.get(OL_EnergyCarriers.ELECTRICITY).getXMax();
+for (double t = startTime; t <= endTime; t += energyModel.p_timeStep_h) {
+	dsAsset.add( t, 0);
+}
+v_liveData.dsm_liveAssetFlows_kW.put( AC, dsAsset);
+
+if (AC == OL_AssetFlowCategories.batteriesChargingPower_kW) { // also add batteriesDischarging!
+	v_liveAssetsMetaData.activeAssetFlows.add(OL_AssetFlowCategories.batteriesDischargingPower_kW);
+	dsAsset = new DataSet( (int)(168 / energyModel.p_timeStep_h) );
+	for (double t = startTime; t <= endTime; t += energyModel.p_timeStep_h) {
+		dsAsset.add( t, 0);
+	}
+	v_liveData.dsm_liveAssetFlows_kW.put( OL_AssetFlowCategories.batteriesDischargingPower_kW, dsAsset);
+}
+if (AC == OL_AssetFlowCategories.V2GPower_kW) { // also add evCharging!
+	v_liveAssetsMetaData.activeAssetFlows.add(OL_AssetFlowCategories.evChargingPower_kW);	
+	dsAsset = new DataSet( (int)(168 / energyModel.p_timeStep_h) );
+	for (double t = startTime; t <= endTime; t += energyModel.p_timeStep_h) {
+		dsAsset.add( t, 0);
+	}
+	v_liveData.dsm_liveAssetFlows_kW.put( OL_AssetFlowCategories.evChargingPower_kW, dsAsset);
+}			
+/*ALCODEEND*/}
+
diff --git a/_alp/Agents/GridConnection/Code/Functions.xml b/_alp/Agents/GridConnection/Code/Functions.xml
index 38f404a5..f9ee7253 100644
--- a/_alp/Agents/GridConnection/Code/Functions.xml
+++ b/_alp/Agents/GridConnection/Code/Functions.xml
@@ -325,6 +325,10 @@
 			<Name><![CDATA[energyUse_kW]]></Name>
 			<Type><![CDATA[double]]></Type>
 		</Parameter>
+		<Parameter>
+			<Name><![CDATA[assetFlowsMap]]></Name>
+			<Type><![CDATA[J_ValueMap]]></Type>
+		</Parameter>
 		<Parameter>
 			<Name><![CDATA[caller]]></Name>
 			<Type><![CDATA[J_EA]]></Type>
@@ -494,6 +498,10 @@
 			<Name><![CDATA[energyUse_kW]]></Name>
 			<Type><![CDATA[double]]></Type>
 		</Parameter>
+		<Parameter>
+			<Name><![CDATA[assetFlowsMap_kW]]></Name>
+			<Type><![CDATA[J_ValueMap<OL_AssetFlowCategories>]]></Type>
+		</Parameter>
 		<Parameter>
 			<Name><![CDATA[caller]]></Name>
 			<Type><![CDATA[J_EA]]></Type>
@@ -714,4 +722,64 @@
 		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
+	<Function AccessType="public" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>EnergyCoop</ReturnType>
+		<Id>1754380684463</Id>
+		<Name><![CDATA[f_addConsumptionEnergyCarrier]]></Name>
+		<X>1644.8</X>
+		<Y>823.2</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[EC]]></Name>
+			<Type><![CDATA[OL_EnergyCarriers]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="public" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>EnergyCoop</ReturnType>
+		<Id>1754380684465</Id>
+		<Name><![CDATA[f_addProductionEnergyCarrier]]></Name>
+		<X>1644.8</X>
+		<Y>843.2</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[EC]]></Name>
+			<Type><![CDATA[OL_EnergyCarriers]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="public" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>EnergyCoop</ReturnType>
+		<Id>1754380684467</Id>
+		<Name><![CDATA[f_addAssetFlow]]></Name>
+		<X>1644.8</X>
+		<Y>863.2</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[AC]]></Name>
+			<Type><![CDATA[OL_AssetFlowCategories]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
 </Functions>
diff --git a/_alp/Agents/GridConnection/Levels/Level.level.xml b/_alp/Agents/GridConnection/Levels/Level.level.xml
index f8793f9f..50edd549 100644
--- a/_alp/Agents/GridConnection/Levels/Level.level.xml
+++ b/_alp/Agents/GridConnection/Levels/Level.level.xml
@@ -488,7 +488,7 @@
 			<Id>1668439095464</Id>
 			<Expression>my_dataset1</Expression>
 			<Color>-3137392</Color>
-			<Expression2>v_pvProductionElectric_kW + v_windProductionElectric_kW</Expression2>
+			<Expression2>fm_currentAssetFlows_kW.get(windProductionElectric_kW) + fm_currentAssetFlows_kW.get(pvProductionElectric_kW)</Expression2>
 			<Expression2Flag>true</Expression2Flag>
 			<PointStyle>NONE</PointStyle>
 			<LineWidth>1.0</LineWidth>
@@ -498,7 +498,7 @@
 			<Id>1668439095465</Id>
 			<Expression>my_dataset2</Expression>
 			<Color>-32944</Color>
-			<Expression2>v_conversionPowerElectric_kW</Expression2>
+			<Expression2>fm_currentAssetFlows_kW.get(heatPumpElectricityConsumption_kW)</Expression2>
 			<Expression2Flag>true</Expression2Flag>
 			<PointStyle>NONE</PointStyle>
 			<LineWidth>1.0</LineWidth>
@@ -508,7 +508,7 @@
 			<Id>1668439095466</Id>
 			<Expression>my_dataset3</Expression>
 			<Color>-13447886</Color>
-			<Expression2>v_evChargingPowerElectric_kW</Expression2>
+			<Expression2>fm_currentAssetFlows_kW.get(evChargingPower_kW)</Expression2>
 			<Expression2Flag>true</Expression2Flag>
 			<PointStyle>NONE</PointStyle>
 			<LineWidth>2.0</LineWidth>
@@ -518,7 +518,7 @@
 			<Id>1658477089943</Id>
 			<Expression>my_dataset4</Expression>
 			<Color>-8388608</Color>
-			<Expression2>v_batteryPowerElectric_kW</Expression2>
+			<Expression2>fm_currentAssetFlows_kW.get(batteriesChargingPower_kW)</Expression2>
 			<Expression2Flag>true</Expression2Flag>
 			<PointStyle>NONE</PointStyle>
 			<LineWidth>1.0</LineWidth>
diff --git a/_alp/Agents/GridConnection/Variables.xml b/_alp/Agents/GridConnection/Variables.xml
index 3a0fefe4..e6e28bfa 100644
--- a/_alp/Agents/GridConnection/Variables.xml
+++ b/_alp/Agents/GridConnection/Variables.xml
@@ -48,6 +48,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1667902447354</Id>
 		<Name><![CDATA[v_evChargingPowerElectric_kW]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>110</X>
 		<Y>1110</Y>
 		<Label>
@@ -90,6 +91,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1668610729237</Id>
 		<Name><![CDATA[v_fixedConsumptionElectric_kW]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>110</X>
 		<Y>980</Y>
 		<Label>
@@ -109,6 +111,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1668610741368</Id>
 		<Name><![CDATA[v_pvProductionElectric_kW]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>110</X>
 		<Y>1240</Y>
 		<Label>
@@ -128,6 +131,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1668610757391</Id>
 		<Name><![CDATA[v_batteryPowerElectric_kW]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>110</X>
 		<Y>1130</Y>
 		<Label>
@@ -147,6 +151,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1668611038479</Id>
 		<Name><![CDATA[v_conversionPowerElectric_kW]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>110</X>
 		<Y>1030</Y>
 		<Label>
@@ -210,6 +215,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1671027786040</Id>
 		<Name><![CDATA[v_windProductionElectric_kW]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>110</X>
 		<Y>1260</Y>
 		<Label>
@@ -230,6 +236,7 @@
 		<Id>1673870786520</Id>
 		<Name><![CDATA[v_electricHobConsumption_kW]]></Name>
 		<Description><![CDATA[This is part of the v_fixedConsumptionElectric_kW, thus variable only exists for additional information]]></Description>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>140</X>
 		<Y>1050</Y>
 		<Label>
@@ -370,6 +377,7 @@
 		<Id>1696837525849</Id>
 		<Name><![CDATA[v_heatPumpElectricityConsumption_kW]]></Name>
 		<Description><![CDATA[This is part of the v_fixedConsumptionElectric_kW, thus variable only exists for additional information]]></Description>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>140</X>
 		<Y>1070</Y>
 		<Label>
@@ -389,8 +397,8 @@
 	<Variable Class="PlainVariable">
 		<Id>1701700372072</Id>
 		<Name><![CDATA[v_currentEnergyCurtailed_kW]]></Name>
-		<X>110</X>
-		<Y>1280</Y>
+		<X>840</X>
+		<Y>1000</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -427,6 +435,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1717414924763</Id>
 		<Name><![CDATA[v_hydrogenElectricityConsumption_kW]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>140</X>
 		<Y>1090</Y>
 		<Label>
@@ -869,6 +878,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1734088515133</Id>
 		<Name><![CDATA[v_CHPProductionElectric_kW]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>110</X>
 		<Y>1170</Y>
 		<Label>
@@ -888,8 +898,8 @@
 	<Variable Class="PlainVariable">
 		<Id>1737539227165</Id>
 		<Name><![CDATA[v_batteryStoredEnergy_kWh]]></Name>
-		<X>110</X>
-		<Y>1190</Y>
+		<X>840</X>
+		<Y>1030</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1005,6 +1015,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1751442438903</Id>
 		<Name><![CDATA[v_ptProductionHeat_kW]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>530</X>
 		<Y>1070</Y>
 		<Label>
@@ -1024,6 +1035,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1753110629668</Id>
 		<Name><![CDATA[v_assetFlows]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>570</X>
 		<Y>840</Y>
 		<Label>
@@ -1043,6 +1055,28 @@
 			</InitialValue>
 		</Properties>
 	</Variable>
+	<Variable Class="PlainVariable">
+		<Id>1753970741239</Id>
+		<Name><![CDATA[fm_currentAssetFlows_kW]]></Name>
+		<X>840</X>
+		<Y>970</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[J_ValueMap]]></Type>
+			<InitialValue Class="CodeValue">
+				<Code><![CDATA[new J_ValueMap(OL_AssetFlowCategories.class)]]></Code>
+			</InitialValue>
+		</Properties>
+	</Variable>
 	<Variable Class="Parameter">
 		<Id>1658499438204</Id>
 		<Name><![CDATA[p_gridConnectionCategory]]></Name>
@@ -2035,6 +2069,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1722516437894</Id>
 		<Name><![CDATA[c_fixedConsumptionElectricAssets]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>-280</X>
 		<Y>980</Y>
 		<Label>
@@ -2053,6 +2088,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1722516468629</Id>
 		<Name><![CDATA[c_electricHobAssets]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>-280</X>
 		<Y>1050</Y>
 		<Label>
@@ -2073,7 +2109,7 @@
 		<Name><![CDATA[c_conversionElectricAssets]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>-280</X>
-		<Y>1030</Y>
+		<Y>1020</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2090,6 +2126,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1722516532968</Id>
 		<Name><![CDATA[c_electricHeatpumpAssets]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>-280</X>
 		<Y>1070</Y>
 		<Label>
@@ -2108,6 +2145,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1722516544883</Id>
 		<Name><![CDATA[c_electrolyserAssets]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>-280</X>
 		<Y>1090</Y>
 		<Label>
@@ -2126,6 +2164,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1722516559744</Id>
 		<Name><![CDATA[c_EvAssets]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>-280</X>
 		<Y>1110</Y>
 		<Label>
@@ -2144,6 +2183,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1722516579645</Id>
 		<Name><![CDATA[c_pvAssets]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>-280</X>
 		<Y>1200</Y>
 		<Label>
@@ -2162,6 +2202,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1722516597938</Id>
 		<Name><![CDATA[c_windAssets]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>-280</X>
 		<Y>1220</Y>
 		<Label>
@@ -2180,6 +2221,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1722517079192</Id>
 		<Name><![CDATA[c_batteryAssets]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>-280</X>
 		<Y>1130</Y>
 		<Label>
@@ -2198,6 +2240,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1734089799023</Id>
 		<Name><![CDATA[c_chpAssets]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>-280</X>
 		<Y>1260</Y>
 		<Label>
@@ -2252,6 +2295,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1751442406691</Id>
 		<Name><![CDATA[c_ptAssets]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>-280</X>
 		<Y>1240</Y>
 		<Label>
diff --git a/_alp/Agents/GridNode/Code/Functions.java b/_alp/Agents/GridNode/Code/Functions.java
index aab85f88..54842142 100644
--- a/_alp/Agents/GridNode/Code/Functions.java
+++ b/_alp/Agents/GridNode/Code/Functions.java
@@ -517,3 +517,41 @@ J_LoadDurationCurves f_getDuurkrommes()
 return new J_LoadDurationCurves(acc_annualElectricityBalance_kW.getTimeSeries_kW(), energyModel);
 /*ALCODEEND*/}
 
+DataSet f_getPeakImportWeekDataSet()
+{/*ALCODESTART::1754461654982*/
+double[] elecBalance_kW = acc_annualElectricityBalance_kW.getTimeSeries_kW();
+
+Integer maxIndex = 0; // index with peak import
+for (int i = 1; i < elecBalance_kW.length; i++) {
+    if (elecBalance_kW[i] > elecBalance_kW[maxIndex]) {
+        maxIndex = i;
+    }
+}
+
+double peakTime_h = maxIndex*energyModel.p_timeStep_h;
+double duration_h = acc_annualElectricityBalance_kW.getDuration();
+double accStartTime_h = min(duration_h-7*24,max(0,peakTime_h - 3.5*24));
+DataSet ds = acc_annualElectricityBalance_kW.getDataSet(energyModel.p_runStartTime_h, accStartTime_h, accStartTime_h+24*7);
+   
+return ds;
+/*ALCODEEND*/}
+
+DataSet f_getPeakExportWeekDataSet()
+{/*ALCODESTART::1754462048041*/
+double[] elecBalance_kW = acc_annualElectricityBalance_kW.getTimeSeries_kW();
+
+Integer minIndex = 0; // index with peak import
+for (int i = 1; i < elecBalance_kW.length; i++) {
+    if (elecBalance_kW[i] < elecBalance_kW[minIndex]) {
+        minIndex = i;
+    }
+}
+
+double peakTime_h = minIndex*energyModel.p_timeStep_h;
+double duration_h = acc_annualElectricityBalance_kW.getDuration();
+double accStartTime_h = min(duration_h-7*24,max(0,peakTime_h - 3.5*24));
+DataSet ds = acc_annualElectricityBalance_kW.getDataSet(energyModel.p_runStartTime_h, accStartTime_h, accStartTime_h+24*7);
+   
+return ds;
+/*ALCODEEND*/}
+
diff --git a/_alp/Agents/GridNode/Code/Functions.xml b/_alp/Agents/GridNode/Code/Functions.xml
index c81065cb..3197b3b4 100644
--- a/_alp/Agents/GridNode/Code/Functions.xml
+++ b/_alp/Agents/GridNode/Code/Functions.xml
@@ -369,4 +369,36 @@
 		<ShowLabel>true</ShowLabel>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
+	<Function AccessType="public" StaticFunction="false">
+		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
+		<ReturnType>DataSet</ReturnType>
+		<Id>1754461654982</Id>
+		<Name><![CDATA[f_getPeakImportWeekDataSet]]></Name>
+		<X>1060</X>
+		<Y>440</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="public" StaticFunction="false">
+		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
+		<ReturnType>DataSet</ReturnType>
+		<Id>1754462048041</Id>
+		<Name><![CDATA[f_getPeakExportWeekDataSet]]></Name>
+		<X>1060</X>
+		<Y>460</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/Classes/Class.J_AccumulatorMap.java b/_alp/Classes/Class.J_AccumulatorMap.java
index 54207ab8..54f61224 100644
--- a/_alp/Classes/Class.J_AccumulatorMap.java
+++ b/_alp/Classes/Class.J_AccumulatorMap.java
@@ -3,44 +3,52 @@
  */	
 //import java.util.EnumMap;
 import java.util.EnumSet;
+
 //import zeroPackage.ZeroAccumulator;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreType;
 @JsonIgnoreType
-public class J_AccumulatorMap implements Serializable {
+public class J_AccumulatorMap <E extends Enum<E>> implements Serializable {
+	
+	private ZeroAccumulator[] accumulatorArray;
+    private final EnumSet<E> enumSet;
+    private final Class<E> enumClass;
+	//private ZeroAccumulator[] accumulatorArray = new ZeroAccumulator[OL_EnergyCarriers.values().length]; // Use array with size of all possible energyCarriers; more than strictly needed but memory footprint is negligable anyway.;
+	//private EnumSet<OL_EnergyCarriers> energyCarrierList = EnumSet.noneOf(OL_EnergyCarriers.class);
 	
-	private ZeroAccumulator[] accumulatorArray = new ZeroAccumulator[OL_EnergyCarriers.values().length]; // Use array with size of all possible energyCarriers; more than strictly needed but memory footprint is negligable anyway.;
-	private EnumSet<OL_EnergyCarriers> energyCarrierList = EnumSet.noneOf(OL_EnergyCarriers.class);
 
-    /**
-     * Default constructor
-     */
-    public J_AccumulatorMap() {
-    	//super(OL_EnergyCarriers.class);
+    public J_AccumulatorMap(Class<E> enumClass) {
+        this.enumClass = enumClass;
+        this.enumSet = EnumSet.noneOf(enumClass);
+        this.accumulatorArray = new ZeroAccumulator[enumClass.getEnumConstants().length];
     }
-
-    public void createEmptyAccumulators(EnumSet<OL_EnergyCarriers> selectedFlows, boolean hasTimeSeries, double signalResolution_h, double duration_h) {
-    	for (OL_EnergyCarriers key : selectedFlows) {
+    
+    public void createEmptyAccumulators(EnumSet<E> selectedFlows, boolean hasTimeSeries, double signalResolution_h, double duration_h) {
+    	for (E key : selectedFlows) {
     		this.put(key, new ZeroAccumulator(hasTimeSeries, signalResolution_h, duration_h));
     	}
     }
     
     public J_AccumulatorMap getClone() {
-    	J_AccumulatorMap am = new J_AccumulatorMap();
-    	for (var EC : this.energyCarrierList) {
+    	J_AccumulatorMap am = new J_AccumulatorMap(enumClass);
+    	for (var EC : this.enumSet) {
     		am.put(EC, accumulatorArray[EC.ordinal()].getClone());
     	}
     	return am;
     }
    
-    public ZeroAccumulator get(OL_EnergyCarriers key) {
+    public ZeroAccumulator get(E key) {
 		return accumulatorArray[key.ordinal()];
 	}
     	
 
-	public void put(OL_EnergyCarriers key, ZeroAccumulator acc) {
+	public void put(E key, ZeroAccumulator acc) {
 		accumulatorArray[key.ordinal()] = acc;
-		energyCarrierList.add(key);		
+		enumSet.add(key);		
+	}
+	
+	public Set<E> keySet() {
+		return enumSet;
 	}
     /*
 	public double totalSum() {
@@ -53,7 +61,7 @@ public double totalSum() {
 	*/
 	public double totalIntegral_kWh() {
 		double totalIntegral_kWh = 0.0;
-		for (var EC : energyCarrierList) {
+		for (var EC : enumSet) {
 			totalIntegral_kWh += accumulatorArray[EC.ordinal()].getIntegral_kWh();
 		}
 		return totalIntegral_kWh;
@@ -65,7 +73,7 @@ public double totalIntegral_MWh() {
 	
 	public double totalIntegralPos_kWh() {
 		double totalIntegralPos_kWh = 0.0;
-		for (var EC : energyCarrierList) {
+		for (var EC : enumSet) {
 			totalIntegralPos_kWh += accumulatorArray[EC.ordinal()].getIntegralPos_kWh();
 		}
 		return totalIntegralPos_kWh;
@@ -77,7 +85,7 @@ public double totalIntegralPos_MWh() {
 	
 	public double totalIntegralNeg_kWh() {
 		double totalIntegralNeg_kWh = 0.0;
-		for (var EC : energyCarrierList) {
+		for (var EC : enumSet) {
 			totalIntegralNeg_kWh += accumulatorArray[EC.ordinal()].getIntegralNeg_kWh();
 		}
 		return totalIntegralNeg_kWh;
@@ -89,18 +97,18 @@ public double totalIntegralNeg_MWh() {
 	
 	public void clear() {
 		accumulatorArray = new ZeroAccumulator[OL_EnergyCarriers.values().length];
-		energyCarrierList.clear();
+		enumSet.clear();
 	}
 	
 	public void reset() {
-		for (var EC : energyCarrierList) {
+		for (var EC : enumSet) {
 			accumulatorArray[EC.ordinal()].reset();
 		}
 	}
 	
-	public J_AccumulatorMap add( J_AccumulatorMap accumulatorMap ) {
-		for (var EC : accumulatorMap.energyCarrierList) {
-			if (!this.energyCarrierList.contains(EC)) {
+	public J_AccumulatorMap<E> add( J_AccumulatorMap<E> accumulatorMap ) {
+		for (var EC : accumulatorMap.enumSet) {
+			if (!this.enumSet.contains(EC)) {
 				// make a new one?
 				throw new RuntimeException("Tried to add an AccumulatorMap with a new EnergyCarrier.");
 			}
@@ -109,9 +117,9 @@ public J_AccumulatorMap add( J_AccumulatorMap accumulatorMap ) {
 		return this;
 	}
 	
-	public J_AccumulatorMap subtract( J_AccumulatorMap accumulatorMap ) {
-		for (var EC : accumulatorMap.energyCarrierList) {
-			if (!this.energyCarrierList.contains(EC)) {
+	public J_AccumulatorMap<E> subtract( J_AccumulatorMap<E> accumulatorMap ) {
+		for (var EC : accumulatorMap.enumSet) {
+			if (!this.enumSet.contains(EC)) {
 				// make a new one?
 				throw new RuntimeException("Tried to subtract an AccumulatorMap with a new EnergyCarrier.");
 			}
@@ -121,8 +129,8 @@ public J_AccumulatorMap subtract( J_AccumulatorMap accumulatorMap ) {
 	}
 	
 	public J_DataSetMap getDataSetMap( double startTime_h ) {
-		J_DataSetMap dsm = new J_DataSetMap();
-		for (var EC : this.energyCarrierList) {
+		J_DataSetMap dsm = new J_DataSetMap(OL_EnergyCarriers.class);
+		for (var EC : this.enumSet) {
 			dsm.put(EC, this.get(EC).getDataSet(startTime_h));
 		}
 		return dsm;
@@ -134,7 +142,7 @@ public String toString() {
         }
         StringBuilder sb = new StringBuilder();
         sb.append('{');
-        for (OL_EnergyCarriers key : this.energyCarrierList) {
+        for (E key : this.enumSet) {
         	ZeroAccumulator acc = this.get(key);
         	//double value = this.get(key);
         	if (acc.getIntegral_kWh() == 0.0) {
diff --git a/_alp/Classes/Class.J_AssetFlowsAccumulatorMap.java b/_alp/Classes/Class.J_AssetFlowsAccumulatorMap.java
new file mode 100644
index 00000000..d9234de9
--- /dev/null
+++ b/_alp/Classes/Class.J_AssetFlowsAccumulatorMap.java
@@ -0,0 +1,165 @@
+/**
+ * J_AssetFlowsAccumulatorMap
+ */	
+//import java.util.EnumMap;
+import java.util.EnumSet;
+//import zeroPackage.ZeroAccumulator;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreType;
+@JsonIgnoreType
+public class J_AssetFlowsAccumulatorMap implements Serializable {
+	
+	private ZeroAccumulator[] accumulatorArray = new ZeroAccumulator[OL_AssetFlowCategories.values().length]; // Use array with size of all possible energyCarriers; more than strictly needed but memory footprint is negligable anyway.;
+	private EnumSet<OL_AssetFlowCategories> assetFlowsList = EnumSet.noneOf(OL_AssetFlowCategories.class);
+
+    /**
+     * Default constructor
+     */
+    public J_AssetFlowsAccumulatorMap() {
+    	//super(OL_EnergyCarriers.class);
+    }
+
+    public void createEmptyAccumulators(EnumSet<OL_AssetFlowCategories> selectedFlows, boolean hasTimeSeries, double signalResolution_h, double duration_h) {
+    	for (OL_AssetFlowCategories key : selectedFlows) {
+    		this.put(key, new ZeroAccumulator(hasTimeSeries, signalResolution_h, duration_h));
+    	}
+    }
+    
+    public J_AssetFlowsAccumulatorMap getClone() {
+    	J_AssetFlowsAccumulatorMap am = new J_AssetFlowsAccumulatorMap();
+    	for (var EC : this.assetFlowsList) {
+    		am.put(EC, accumulatorArray[EC.ordinal()].getClone());
+    	}
+    	return am;
+    }
+   
+    public ZeroAccumulator get(OL_AssetFlowCategories key) {
+		return accumulatorArray[key.ordinal()];
+	}
+    	
+
+	public void put(OL_AssetFlowCategories key, ZeroAccumulator acc) {
+		accumulatorArray[key.ordinal()] = acc;
+		assetFlowsList.add(key);		
+	}
+    /*
+	public double totalSum() {
+		double totalSum = 0.0;
+		for (var EC : assetFlowsList) {
+			totalSum += accumulatorArray[EC.ordinal()].getSum();
+		}
+		return totalSum;
+	}
+	*/
+	/*public double totalIntegral_kWh() {
+		double totalIntegral_kWh = 0.0;
+		for (var EC : assetFlowsList) {
+			totalIntegral_kWh += accumulatorArray[EC.ordinal()].getIntegral_kWh();
+		}
+		return totalIntegral_kWh;
+	}
+	
+	public double totalIntegral_MWh() {
+		return this.totalIntegral_kWh() / 1000;
+	}
+	
+	public double totalIntegralPos_kWh() {
+		double totalIntegralPos_kWh = 0.0;
+		for (var EC : assetFlowsList) {
+			totalIntegralPos_kWh += accumulatorArray[EC.ordinal()].getIntegralPos_kWh();
+		}
+		return totalIntegralPos_kWh;
+	}
+	
+	public double totalIntegralPos_MWh() {
+		return this.totalIntegralPos_kWh() / 1000;
+	}
+	
+	public double totalIntegralNeg_kWh() {
+		double totalIntegralNeg_kWh = 0.0;
+		for (var EC : assetFlowsList) {
+			totalIntegralNeg_kWh += accumulatorArray[EC.ordinal()].getIntegralNeg_kWh();
+		}
+		return totalIntegralNeg_kWh;
+	}
+	
+	public double totalIntegralNeg_MWh() {
+		return this.totalIntegralNeg_kWh() / 1000;
+	}
+	*/
+	
+	public void clear() {
+		accumulatorArray = new ZeroAccumulator[OL_EnergyCarriers.values().length];
+		assetFlowsList.clear();
+	}
+	
+	public void reset() {
+		for (var EC : assetFlowsList) {
+			accumulatorArray[EC.ordinal()].reset();
+		}
+	}
+	
+	public J_AssetFlowsAccumulatorMap add( J_AssetFlowsAccumulatorMap accumulatorMap ) {
+		for (var EC : accumulatorMap.assetFlowsList) {
+			if (!this.assetFlowsList.contains(EC)) {
+				// make a new one?
+				throw new RuntimeException("Tried to add an AccumulatorMap with a new EnergyCarrier.");
+			}
+			this.get(EC).add(accumulatorMap.get(EC));
+		}
+		return this;
+	}
+	
+	public J_AssetFlowsAccumulatorMap subtract( J_AssetFlowsAccumulatorMap accumulatorMap ) {
+		for (var EC : accumulatorMap.assetFlowsList) {
+			if (!this.assetFlowsList.contains(EC)) {
+				// make a new one?
+				throw new RuntimeException("Tried to subtract an AccumulatorMap with a new EnergyCarrier.");
+			}
+			this.get(EC).subtract(accumulatorMap.get(EC));
+		}
+		return this;
+	}
+	
+	/*
+	public J_DataSetMap getDataSetMap( double startTime_h ) {
+		J_DataSetMap dsm = new J_DataSetMap();
+		for (var EC : this.assetFlowsList) {
+			dsm.put(EC, this.get(EC).getDataSet(startTime_h));
+		}
+		return dsm;
+	}
+	*/
+	
+    public String toString() {
+        if (this.accumulatorArray.length == 0) {
+            return "{}";        	
+        }
+        StringBuilder sb = new StringBuilder();
+        sb.append('{');
+        for (OL_AssetFlowCategories key : this.assetFlowsList) {
+        	ZeroAccumulator acc = this.get(key);
+        	//double value = this.get(key);
+        	if (acc.getIntegral_kWh() == 0.0) {
+        		continue;
+        	}
+        	
+        	sb.append(key);
+        	sb.append(" ");
+            sb.append(acc.toString());
+            //sb.append(" = ");
+            //sb.append(value);
+            sb.append(", ");
+        }
+        //sb.delete(sb.length()-2, sb.length());
+        sb.append('}');
+        return sb.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_AssetsMetaData.java b/_alp/Classes/Class.J_AssetsMetaData.java
index c6b22de9..1c9ba027 100644
--- a/_alp/Classes/Class.J_AssetsMetaData.java
+++ b/_alp/Classes/Class.J_AssetsMetaData.java
@@ -11,18 +11,8 @@ public class J_AssetsMetaData {
 	
 	public Agent parentAgent;
 
-	public boolean hasElectricHeating = false;
-	public boolean hasElectricTransport = false;
-	public boolean hasPV = false;
-	public boolean hasWindturbine = false;
-	public boolean hasPT = false;
-	public boolean hasBattery = false;
-	public boolean hasHeatGridConnection = false;
-	public boolean hasElectrolyser = false;
-	public boolean hasCHP = false;
-	public boolean hasV2G = false;
-	public boolean hasElectricCooking = false;
-	
+	public EnumSet<OL_AssetFlowCategories> activeAssetFlows = EnumSet.noneOf(OL_AssetFlowCategories.class);
+		
 	public Double totalInstalledPVPower_kW = 0.0;
 	public Double totalInstalledWindPower_kW = 0.0;
 	public Double totalInstalledBatteryStorageCapacity_MWh = 0.0;
@@ -43,109 +33,25 @@ public J_AssetsMetaData(Agent parentAgent) {
     }
     
     public void updateActiveAssetData(ArrayList<GridConnection> gcList) {
-    	this.hasElectricHeating = false;
-	    this.hasElectricTransport = false;
-	    this.hasPV = false;
-	    this.hasWindturbine = false;
-	    this.hasBattery = false;
-	    this.hasHeatGridConnection = false;  // read as: has heatgrid connection, not has heat gridconnection
-	    this.hasElectrolyser = false;
-	    this.hasCHP = false;
-	    this.hasV2G = false;
-	    this.hasElectricCooking = false;
-	
-	    //Electric heating
-	    for(GridConnection GC : gcList){
-	    	if(GC.c_electricHeatpumpAssets.size()>0 && GC.v_isActive){
-	    		this.hasElectricHeating = true;
-	    		break;
-	    	}
-	    }
-	    //Electric vehicles
-	    for(GridConnection GC : gcList){
-	    	if(GC.c_EvAssets.size()>0 && GC.v_isActive){
-	    		this.hasElectricTransport = true;
-	    		break;
-	    	}
-	    }
-	    //PV
-	    for(GridConnection GC : gcList){
-	    	if (GC.v_liveAssetsMetaData.totalInstalledPVPower_kW > 0 && GC.v_isActive) {
-	    		this.hasPV = true;
-	    		break;	    		
-	    	}
-	    }
-	    //Wind
-	    for(GridConnection GC : gcList){
-	    	if (GC.v_liveAssetsMetaData.totalInstalledWindPower_kW > 0 && GC.v_isActive) {
-	    		this.hasWindturbine = true;
-	    		break;
-	    	}
-	    }
-	    //PT
-	    for(GridConnection GC : gcList){
-	    	if (GC.c_ptAssets.size()>0 && GC.v_isActive) {
-	    		this.hasPT = true;
-	    		break;	    		
-	    	}
-	    }
-	    //Battery
-	    for(GridConnection GC : gcList){
-	    	if (GC.v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh > 0 && GC.v_isActive) {
-				this.hasBattery = true;
-				break;
-	    	}
-	    }
-	    //Heat grid
-	    for(GridConnection GC : gcList){
-	    	if(GC.p_parentNodeHeat != null && GC.v_isActive){
-	    		this.hasHeatGridConnection = true;
-	    		break;
-	    	}
-	    }
-	    //Electrolyser
-	    for(GridConnection GC : gcList){
-	    	if(GC.c_electrolyserAssets.size()>0 && GC.v_isActive){
-	    		this.hasElectrolyser = true;
-	    		break;
-	    	}
-	    }
-	    //CHP
-	    for(GridConnection GC : gcList){
-	    	if(GC.c_chpAssets.size()>0 && GC.v_isActive){
-	    		this.hasCHP = true;
-	    		break;
-	    	}
-	    }
-	    //V2g
-	    for(GridConnection GC : gcList){
-	    	if(GC.p_chargingAttitudeVehicles == OL_ChargingAttitude.V2G && GC.c_EvAssets.size()>0 && GC.v_isActive){
-	    		this.hasV2G = true;
-	    		break;
-	    	}
-	    }
-	    //Electric cooking
-	    for(GridConnection GC : gcList){
-	    	if(GC.c_electricHobAssets.size()>0 && GC.v_isActive){
-	    		this.hasElectricCooking = true;
-	    		break;
-	    	}
-	    }
+    	activeAssetFlows.clear();
+    	for(GridConnection GC : gcList){
+    		if (GC.v_isActive) {
+	    		for (J_EA ea : GC.c_energyAssets) {
+	    			if (ea.assetFlowCategory!=null) {
+	    				activeAssetFlows.add(ea.assetFlowCategory);
+	    			}
+	    		}
+    		}
+    	}    	
+    	if (activeAssetFlows.contains(OL_AssetFlowCategories.batteriesChargingPower_kW)) { activeAssetFlows.add(OL_AssetFlowCategories.batteriesDischargingPower_kW); }
+    	if (activeAssetFlows.contains(OL_AssetFlowCategories.V2GPower_kW)) { activeAssetFlows.add(OL_AssetFlowCategories.evChargingPower_kW); }
+    	
 	}
 
     public J_AssetsMetaData getClone() {
     	J_AssetsMetaData clone = new J_AssetsMetaData(this.parentAgent);
-    	clone.hasElectricHeating = this.hasElectricHeating;
-    	clone.hasElectricTransport = this.hasElectricTransport;
-    	clone.hasPV = this.hasPV;
-    	clone.hasWindturbine = this.hasWindturbine;
-    	clone.hasPT = this.hasPT;
-    	clone.hasBattery = this.hasBattery;
-    	clone.hasHeatGridConnection = this.hasHeatGridConnection;
-    	clone.hasElectrolyser = this.hasElectrolyser;
-    	clone.hasCHP = this.hasCHP;
-    	clone.hasV2G = this.hasV2G;
-    	clone.hasElectricCooking = this.hasElectricCooking;
+    	clone.activeAssetFlows = this.activeAssetFlows.clone();
+  
     	clone.totalInstalledPVPower_kW = this.totalInstalledPVPower_kW.doubleValue();
     	clone.totalInstalledWindPower_kW = this.totalInstalledWindPower_kW.doubleValue();
     	clone.totalInstalledBatteryStorageCapacity_MWh = this.totalInstalledBatteryStorageCapacity_MWh.doubleValue();
@@ -159,17 +65,8 @@ public J_AssetsMetaData getClone() {
 	public String toString() {
 		return "totalInstalledPVPower_kW: " + totalInstalledPVPower_kW + 
 				", totalInstalledWindPower_kW: " + totalInstalledWindPower_kW + 
-	            ", totalInstalledBatteryStorageCapacity_MWh: " + totalInstalledBatteryStorageCapacity_MWh + 
-	            ", hasPV: " + hasPV +
-	            ", hasElectricHeating: " + hasElectricHeating + 
-	            ", hasElectricTransport: " + hasElectricTransport + 
-	            ", hasWindturbine: " + hasWindturbine +
-	            ", hasPT: " + hasPT +
-		        ", hasBattery: " + hasBattery +
-		        ", hasHeatGridConnection: " + hasHeatGridConnection +
-		        ", hasElectrolyser: " + hasElectrolyser +
-		        ", hasCHP: " + hasCHP +
-		        ", hasV2G: " + hasV2G +
-		        ", hasElectricCooking: " + hasElectricCooking;
+	            ", totalInstalledBatteryStorageCapacity_MWh: " + totalInstalledBatteryStorageCapacity_MWh +
+	            activeAssetFlows.toString();
+
 	}
 }
\ No newline at end of file
diff --git a/_alp/Classes/Class.J_DataSetMap.java b/_alp/Classes/Class.J_DataSetMap.java
index 04983290..572688a1 100644
--- a/_alp/Classes/Class.J_DataSetMap.java
+++ b/_alp/Classes/Class.J_DataSetMap.java
@@ -5,46 +5,55 @@
 import java.util.EnumSet;
 import com.fasterxml.jackson.annotation.JsonIgnoreType;
 @JsonIgnoreType
-public class J_DataSetMap implements Serializable {
-	private DataSet[] datasetArray = new DataSet[OL_EnergyCarriers.values().length]; // Use array with size of all possible energyCarriers; more than strictly needed but memory footprint is negligable anyway.;
-	private EnumSet<OL_EnergyCarriers> energyCarrierList = EnumSet.noneOf(OL_EnergyCarriers.class);
-
+public class J_DataSetMap <E extends Enum<E>> implements Serializable {
+	private DataSet[] datasetArray; // = new DataSet[OL_EnergyCarriers.values().length]; // Use array with size of all possible energyCarriers; more than strictly needed but memory footprint is negligable anyway.;
+	//private EnumSet<OL_EnergyCarriers> enumSet = EnumSet.noneOf(OL_EnergyCarriers.class);
+	private final EnumSet<E> enumSet;
+	private final Class<E> enumClass;
+	
     /**
      * Default constructor
      */
-    public J_DataSetMap() {
+    public J_DataSetMap(Class<E> enumClass) {
+        this.enumClass = enumClass;
+        this.enumSet = EnumSet.noneOf(enumClass);
+        this.datasetArray = new DataSet[enumClass.getEnumConstants().length];
     	//super(OL_EnergyCarriers.class);
     }
 
-    public void createEmptyDataSets(EnumSet<OL_EnergyCarriers> selectedFlows, int size) {
-    	for (OL_EnergyCarriers key : selectedFlows) {
+    public void createEmptyDataSets(EnumSet<E> selectedFlows, int size) {
+    	for (E key : selectedFlows) {
     		this.put(key, new DataSet(size));
     	}
     }
     
-    public DataSet get(OL_EnergyCarriers key) {
+    public DataSet get(E key) {
 		return datasetArray[key.ordinal()];
 	}
     	
 
-	public void put(OL_EnergyCarriers key, DataSet ds) {
+	public void put(E key, DataSet ds) {
 		datasetArray[key.ordinal()] = ds;
-		energyCarrierList.add(key);		
+		enumSet.add(key);		
 	}
 	
 	public void clear() {
-		datasetArray = new DataSet[OL_EnergyCarriers.values().length];
-		energyCarrierList.clear();
+		datasetArray = new DataSet[enumClass.getEnumConstants().length];
+		enumSet.clear();
 	}
     
+	public EnumSet<E> keySet() {
+		return enumSet;
+	}
+	
 	@Override
 	public String toString() {
-        if (this.energyCarrierList.size() == 0) {
+        if (this.enumSet.size() == 0) {
             return "{}";        	
         }
         StringBuilder sb = new StringBuilder();
         sb.append('{');
-        for (OL_EnergyCarriers key : this.energyCarrierList) {
+        for (E key : this.enumSet) {
         	DataSet value = this.get(key);
         	int len = value.toString().length();
             sb.append(key);
diff --git a/_alp/Classes/Class.J_EA.java b/_alp/Classes/Class.J_EA.java
index 393093b3..a45e3ec3 100644
--- a/_alp/Classes/Class.J_EA.java
+++ b/_alp/Classes/Class.J_EA.java
@@ -49,10 +49,12 @@ abstract public class J_EA implements Cloneable {
 	
 	 protected Agent parentAgent;
 	 public OL_EnergyAssetType energyAssetType;
+	 public OL_AssetFlowCategories assetFlowCategory;
 	 public String energyAssetName;
 	 protected double v_powerFraction_fr = 0; // Better to make this one protected? Public is needed to access from other packages, for example when inheriting a GC-type in your project with its own flexmanagement functions
 	 protected J_FlowsMap flowsMap = new J_FlowsMap();
 	 protected J_FlowsMap lastFlowsMap = new J_FlowsMap();
+	 protected J_ValueMap assetFlowsMap = new J_ValueMap(OL_AssetFlowCategories.class);
 	 protected double lastEnergyUse_kW = 0.0;
 	 
 	 protected EnumSet<OL_EnergyCarriers> activeProductionEnergyCarriers = EnumSet.noneOf(OL_EnergyCarriers.class); // To fill activeProductionEnergyCarriers in GridConnections and EnergyModel	
@@ -125,7 +127,7 @@ public void f_updateAllFlows(double powerFraction_fr) {
      	double powerFractionBounded_fr = min(1,max(-1, powerFraction_fr));
      	operate(powerFractionBounded_fr);
     	if (parentAgent instanceof GridConnection) {    		
-    		((GridConnection)parentAgent).f_addFlows(flowsMap, this.energyUse_kW, this);
+    		((GridConnection)parentAgent).f_addFlows(flowsMap, this.energyUse_kW, assetFlowsMap, this);    		
     	}
     	/*
     	if (ui_energyAsset!= null) {
@@ -147,7 +149,8 @@ public void f_setPowerFraction_fr(double powerFraction_fr) {
     }
     
     public void clear() {
-	    flowsMap.clear();   	  	
+	    flowsMap.clear();
+	    assetFlowsMap.clear();
     	energyUse_kW = 0;
     	v_powerFraction_fr = 0;
     }
@@ -220,7 +223,9 @@ public void setEnergyAssetType(OL_EnergyAssetType assetType) {
 		 this.energyAssetType = assetType;
 	 }
 	 
-
+	 public void setAssetFlowCategory(OL_AssetFlowCategories assetFlowCat) {
+		 this.assetFlowCategory = assetFlowCat;
+	 }
     
 //    public double getOutputTemperature_degC() {
 //   	return 0;
diff --git a/_alp/Classes/Class.J_EAAirco.java b/_alp/Classes/Class.J_EAAirco.java
index 68df251d..03e7d288 100644
--- a/_alp/Classes/Class.J_EAAirco.java
+++ b/_alp/Classes/Class.J_EAAirco.java
@@ -13,6 +13,7 @@ public J_EAAirco(Agent parentAgent, double capacityElectric_kW, double timestep_
     	this.capacityElectric_kW = capacityElectric_kW;
     	this.timestep_h = timestep_h;	
 		this.activeConsumptionEnergyCarriers.add(OL_EnergyCarriers.ELECTRICITY);
+		//this.assetFlowCategory = OL_AssetFlowCategories.AIRCO; // bestaat nog niet!
 		this.registerEnergyAsset();
     }
     
diff --git a/_alp/Classes/Class.J_EACharger.java b/_alp/Classes/Class.J_EACharger.java
index 4ce59f70..155fdc61 100644
--- a/_alp/Classes/Class.J_EACharger.java
+++ b/_alp/Classes/Class.J_EACharger.java
@@ -39,10 +39,14 @@ public J_EACharger(Agent parentAgent, double electricCapacity_kW, double timeste
 		    this.V2GCapable = V2GCapable;
 	    	this.activeProductionEnergyCarriers.add(OL_EnergyCarriers.ELECTRICITY);		
 			this.activeConsumptionEnergyCarriers.add(OL_EnergyCarriers.ELECTRICITY);
+			if(V2GCapable) {
+				this.assetFlowCategory = OL_AssetFlowCategories.V2GPower_kW;
+			} else {
+				this.assetFlowCategory = OL_AssetFlowCategories.evChargingPower_kW;
+			}
 			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)
 	    	
@@ -87,6 +91,9 @@ public void operate(double ratioOfCapacity) {
 	    	energyUsed_kWh += energyUse_kW * timestep_h;
 	    	
 			flowsMap.put(OL_EnergyCarriers.ELECTRICITY, electricityConsumption_kW - electricityProduction_kW);	
+			// Split charging and discharing power 'at the source'!
+			assetFlowsMap.put(OL_AssetFlowCategories.evChargingPower_kW, electricityConsumption_kW);
+			assetFlowsMap.put(OL_AssetFlowCategories.V2GPower_kW, electricityProduction_kW);
 	   	}
 		
 		private void manageSocket1() {
diff --git a/_alp/Classes/Class.J_EAConsumption.java b/_alp/Classes/Class.J_EAConsumption.java
index 003b64fc..44e1290e 100644
--- a/_alp/Classes/Class.J_EAConsumption.java
+++ b/_alp/Classes/Class.J_EAConsumption.java
@@ -35,6 +35,9 @@ public J_EAConsumption(Agent parentAgent, OL_EnergyAssetType type, String name,
 			profilePointer = profile;
 		}		
 		this.activeConsumptionEnergyCarriers.add(this.energyCarrier);
+		if (this.energyCarrier == OL_EnergyCarriers.ELECTRICITY) {
+			this.assetFlowCategory = OL_AssetFlowCategories.fixedConsumptionElectric_kW; //
+		}
 		registerEnergyAsset();
     }
 
@@ -63,7 +66,9 @@ public void operate(double ratioOfCapacity) {
     	this.energyUsed_kWh += this.energyUse_kW * this.timestep_h;
 
 		flowsMap.put(this.energyCarrier, consumption_kW);		
-
+		if (this.assetFlowCategory != null) {
+			assetFlowsMap.put(this.assetFlowCategory, consumption_kW);
+		}
    	}
 	
     public Pair<J_FlowsMap, Double> curtailElectricityConsumption(double curtailmentSetpoint_kW) {
@@ -78,6 +83,9 @@ public Pair<J_FlowsMap, Double> curtailElectricityConsumption(double curtailment
 
     	J_FlowsMap flowsMap = new J_FlowsMap();
     	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.put(OL_EnergyCarriers.ELECTRICITY, this.lastFlowsMap.get(OL_EnergyCarriers.ELECTRICITY) - curtailmentPower_kW);
@@ -85,7 +93,7 @@ public Pair<J_FlowsMap, Double> curtailElectricityConsumption(double curtailment
     	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(flowsMap, this.energyUse_kW, this);
+    		((GridConnection)parentAgent).f_removeFlows(flowsMap, this.energyUse_kW, assetFlows_kW, this);
     	}
     	return new Pair(flowsMap, this.energyUse_kW);
     }
diff --git a/_alp/Classes/Class.J_EAConversion.java b/_alp/Classes/Class.J_EAConversion.java
index 0f0751ea..cfbbcde7 100644
--- a/_alp/Classes/Class.J_EAConversion.java
+++ b/_alp/Classes/Class.J_EAConversion.java
@@ -52,6 +52,9 @@ public void operate(double ratioOfCapacity) {
 		this.energyUsed_kWh += this.energyUse_kW * this.timestep_h;
     	this.flowsMap.put(this.energyCarrierConsumed, ratioOfCapacity * this.inputCapacity_kW);
     	this.flowsMap.addFlow(this.energyCarrierProduced, -ratioOfCapacity * this.outputCapacity_kW); // We don't put here, in case the energy carrier is the same
+    	if (this.assetFlowCategory != null) {
+    		this.assetFlowsMap.put(this.assetFlowCategory, ratioOfCapacity * this.outputCapacity_kW);
+    	}
 	}
 	
 	public void setInputCapacity_kW ( double inputCapacity_kW ) {
diff --git a/_alp/Classes/Class.J_EAConversionElectricHeater.java b/_alp/Classes/Class.J_EAConversionElectricHeater.java
index ec8133b6..dcb1714a 100644
--- a/_alp/Classes/Class.J_EAConversionElectricHeater.java
+++ b/_alp/Classes/Class.J_EAConversionElectricHeater.java
@@ -23,6 +23,7 @@ public J_EAConversionElectricHeater(Agent parentAgent, double outputHeatCapacity
 	    
 	    this.activeProductionEnergyCarriers.add(this.energyCarrierProduced);		
 		this.activeConsumptionEnergyCarriers.add(this.energyCarrierConsumed);
+		this.assetFlowCategory = OL_AssetFlowCategories.heatPumpElectricityConsumption_kW;
 		registerEnergyAsset();
 	}
 	
diff --git a/_alp/Classes/Class.J_EAConversionElectrolyser.java b/_alp/Classes/Class.J_EAConversionElectrolyser.java
index 62540bb7..ac1f64b4 100644
--- a/_alp/Classes/Class.J_EAConversionElectrolyser.java
+++ b/_alp/Classes/Class.J_EAConversionElectrolyser.java
@@ -35,7 +35,8 @@ public J_EAConversionElectrolyser(Agent parentAgent, double inputElectricCapacit
 		this.energyAssetType = OL_EnergyAssetType.ELECTROLYSER;
 
 	    this.energyCarrierProduced = OL_EnergyCarriers.HYDROGEN;
-	    this.energyCarrierConsumed = OL_EnergyCarriers.ELECTRICITY;	   
+	    this.energyCarrierConsumed = OL_EnergyCarriers.ELECTRICITY;	
+	    this.assetFlowCategory = OL_AssetFlowCategories.electrolyserElectricityConsumption_kW;
 	    
 	    this.activeProductionEnergyCarriers.add(this.energyCarrierProduced);		
 		this.activeConsumptionEnergyCarriers.add(this.energyCarrierConsumed);
@@ -46,7 +47,7 @@ public J_EAConversionElectrolyser(Agent parentAgent, double inputElectricCapacit
     public void f_updateAllFlows( double powerFraction_fr ) {
 		this.operate( min(1, max(0,powerFraction_fr)) );
     	if (parentAgent instanceof GridConnection) {    		
-    		((GridConnection)parentAgent).f_addFlows(flowsMap, this.energyUse_kW, this);		
+    		((GridConnection)parentAgent).f_addFlows(flowsMap, this.energyUse_kW, assetFlowsMap, this);		
     	}
     	this.lastFlowsMap.cloneMap(this.flowsMap);
     	this.lastEnergyUse_kW = this.energyUse_kW;
@@ -71,6 +72,7 @@ else if (electrolyserState == OL_ElectrolyserState.IDLE) {
 
 		flowsMap.put(OL_EnergyCarriers.ELECTRICITY, electricityConsumption_kW);
 		flowsMap.put(OL_EnergyCarriers.HYDROGEN, -hydrogenProduction_kW);
+		assetFlowsMap.put(OL_AssetFlowCategories.electrolyserElectricityConsumption_kW, electricityConsumption_kW);
     }
     
     public void setElectrolyserState(OL_ElectrolyserState electrolyserState) { // Used for regime control
diff --git a/_alp/Classes/Class.J_EAConversionGasCHP.java b/_alp/Classes/Class.J_EAConversionGasCHP.java
index ca49f761..68d8adcf 100644
--- a/_alp/Classes/Class.J_EAConversionGasCHP.java
+++ b/_alp/Classes/Class.J_EAConversionGasCHP.java
@@ -38,6 +38,7 @@ public J_EAConversionGasCHP(Agent parentAgent, double outputElectricCapacity_kW,
     	
         this.activeProductionEnergyCarriers.addAll(energyCarriersProduced);
     	this.activeConsumptionEnergyCarriers.add(this.energyCarrierConsumed);
+    	this.assetFlowCategory = OL_AssetFlowCategories.CHPProductionElectric_kW;
 	    registerEnergyAsset();
 	}
 
@@ -56,6 +57,7 @@ public void operate(double ratioOfCapacity) {
 		flowsMap.put(OL_EnergyCarriers.HEAT, -heatProduction_kW);		
 		flowsMap.put(OL_EnergyCarriers.ELECTRICITY, -electricityProduction_kW);
 		flowsMap.put(OL_EnergyCarriers.METHANE, methaneConsumption_kW);
+		assetFlowsMap.put(this.assetFlowCategory, electricityProduction_kW);
     }
 
 	@Override
diff --git a/_alp/Classes/Class.J_EAConversionHeatDeliverySet.java b/_alp/Classes/Class.J_EAConversionHeatDeliverySet.java
index 95deae23..625396db 100644
--- a/_alp/Classes/Class.J_EAConversionHeatDeliverySet.java
+++ b/_alp/Classes/Class.J_EAConversionHeatDeliverySet.java
@@ -22,8 +22,9 @@ public J_EAConversionHeatDeliverySet(Agent parentAgent, double outputHeatCapacit
 	    this.inputCapacity_kW = this.outputCapacity_kW / this.eta_r;
 	    this.timestep_h = timestep_h;	    
 	    this.outputTemperature_degC = outputTemperature_degC;
-
+	    
 	    this.energyAssetType = OL_EnergyAssetType.HEAT_DELIVERY_SET;
+	    this.assetFlowCategory = OL_AssetFlowCategories.districtHeatDelivery_kW;
 
 	    this.energyCarrierProduced = OL_EnergyCarriers.HEAT;
 	    this.energyCarrierConsumed = OL_EnergyCarriers.HEAT;
diff --git a/_alp/Classes/Class.J_EAConversionHeatPump.java b/_alp/Classes/Class.J_EAConversionHeatPump.java
index f9371190..27d2feec 100644
--- a/_alp/Classes/Class.J_EAConversionHeatPump.java
+++ b/_alp/Classes/Class.J_EAConversionHeatPump.java
@@ -42,7 +42,7 @@ public J_EAConversionHeatPump(Agent parentAgent, double inputElectricCapacity_kW
     	
 	    this.activeProductionEnergyCarriers.add(this.energyCarrierProduced);   	
 		this.activeConsumptionEnergyCarriers.add(this.energyCarrierConsumed);
-
+		this.assetFlowCategory = OL_AssetFlowCategories.heatPumpElectricityConsumption_kW;
 		registerEnergyAsset();
 	}
 
@@ -118,7 +118,8 @@ public void operate(double ratioOfCapacity) {
 	    	this.energyUse_kW = electricityConsumption_kW - heatProduction_kW; 		
 			flowsMap.put(OL_EnergyCarriers.HEAT, -heatProduction_kW);		
 			flowsMap.put(OL_EnergyCarriers.ELECTRICITY, electricityConsumption_kW);		
-	    	}
+	    }
+    	this.assetFlowsMap.addFlow	(OL_AssetFlowCategories.heatPumpElectricityConsumption_kW, electricityConsumption_kW);
 		this.energyUsed_kWh += energyUse_kW * timestep_h;
 	}
 
diff --git a/_alp/Classes/Class.J_EADieselTractor.java b/_alp/Classes/Class.J_EADieselTractor.java
index f40dfe2e..ab1038db 100644
--- a/_alp/Classes/Class.J_EADieselTractor.java
+++ b/_alp/Classes/Class.J_EADieselTractor.java
@@ -52,7 +52,7 @@ public J_EADieselTractor(Agent parentAgent, double yearlyDieselConsumption_L, do
     public void f_updateAllFlows(double t_h) {
          operate(t_h);
          if (parentAgent instanceof GridConnection) {        
-            ((GridConnection)parentAgent).f_addFlows(flowsMap, this.energyUse_kW, this);
+            ((GridConnection)parentAgent).f_addFlows(flowsMap, this.energyUse_kW, assetFlowsMap, this);
         }
         this.lastFlowsMap.cloneMap(this.flowsMap);
         this.lastEnergyUse_kW = this.energyUse_kW;
diff --git a/_alp/Classes/Class.J_EADieselVehicle.java b/_alp/Classes/Class.J_EADieselVehicle.java
index b4dd68c7..3b01bc7d 100644
--- a/_alp/Classes/Class.J_EADieselVehicle.java
+++ b/_alp/Classes/Class.J_EADieselVehicle.java
@@ -35,9 +35,9 @@ public J_EADieselVehicle(Agent ownerAssetAgent, double energyConsumption_kWhpkm,
     public void f_updateAllFlows(double powerFraction_fr) {
     	
     	flowsMap.put(OL_EnergyCarriers.DIESEL, this.energyUse_kW);
-    	    	
+
     	if (parentAgent instanceof GridConnection) {
-    		((GridConnection)parentAgent).f_addFlows(flowsMap, this.energyUse_kW, this);
+    		((GridConnection)parentAgent).f_addFlows(flowsMap, this.energyUse_kW, assetFlowsMap, this);
     	}
     	this.lastFlowsMap = flowsMap;
     	this.lastEnergyUse_kW = this.energyUse_kW;
diff --git a/_alp/Classes/Class.J_EAEV.java b/_alp/Classes/Class.J_EAEV.java
index b35a0bd4..bfec036c 100644
--- a/_alp/Classes/Class.J_EAEV.java
+++ b/_alp/Classes/Class.J_EAEV.java
@@ -51,6 +51,7 @@ public J_EAEV(Agent parentAgent, double capacityElectricity_kW, double storageCa
 	    }
 	    this.activeProductionEnergyCarriers.add(this.storageMedium);   	
 		this.activeConsumptionEnergyCarriers.add(this.storageMedium);
+		this.assetFlowCategory = OL_AssetFlowCategories.evChargingPower_kW;
 		registerEnergyAsset();
     }
  
@@ -58,24 +59,34 @@ public J_EAEV(Agent parentAgent, double capacityElectricity_kW, double storageCa
 	public void operate(double ratioOfChargeCapacity_r) {
 		//traceln( "ratio: " + ratioOfChargeCapacity_r);
 
-    	double discharge_kW = 0;
-    	double deltaEnergy_kWh;   // to check the request with the energy currently in storage
+    	double chargeSetpoint_kW = min(1,max(-1,ratioOfChargeCapacity_r)) * (capacityElectric_kW * vehicleScaling); // capped between -1 and 1. (does this already happen in f_updateAllFlows()?
+    	double chargePower_kW = max(min(chargeSetpoint_kW, (1 - stateOfCharge_fr) * storageCapacity_kWh * vehicleScaling / timestep_h), -stateOfCharge_fr * storageCapacity_kWh * vehicleScaling / timestep_h); // Limit charge power to stay within SoC 0-100
+    			
+    	/*double deltaEnergy_kWh;   // to check the request with the energy currently in storage
     	
     	deltaEnergy_kWh = ( ratioOfChargeCapacity_r * (capacityElectric_kW * vehicleScaling) * timestep_h ) ;
-    	deltaEnergy_kWh = - min( -deltaEnergy_kWh, (stateOfCharge_fr * (storageCapacity_kWh * vehicleScaling)) ); // Prevent negative charge
+    	deltaEnergy_kWh = max( deltaEnergy_kWh, -(stateOfCharge_fr * (storageCapacity_kWh * vehicleScaling)) ); // Prevent negative charge
+    	
+    	//deltaEnergy_kWh = - min( -deltaEnergy_kWh, (stateOfCharge_fr * (storageCapacity_kWh * vehicleScaling)) ); // Prevent negative charge
     	deltaEnergy_kWh = min(deltaEnergy_kWh, ratioOfChargeCapacity_r * (capacityElectric_kW * vehicleScaling) * timestep_h ); // prevent charging faster than allowed
+    	deltaEnergy_kWh = max(deltaEnergy_kWh, -ratioOfChargeCapacity_r * (capacityElectric_kW * vehicleScaling) * timestep_h ); // prevent discharging faster than allowed
     	deltaEnergy_kWh = min(deltaEnergy_kWh, (1 - stateOfCharge_fr) * (storageCapacity_kWh * vehicleScaling) ); // Prevent overcharge
-    
-		discharge_kW = -deltaEnergy_kWh / timestep_h;
+    	 */
+		
 		//traceln("state of charge: " + stateOfCharge_fr * storageCapacity_kWh + ", charged: " + discharge_kW / 4+ " kWh, charging power kW: " + discharge_kW);
-		double electricityProduction_kW = max(discharge_kW, 0);
-		double electricityConsumption_kW = max(-discharge_kW, 0);
-		updateStateOfCharge( discharge_kW );
+		double electricityProduction_kW = max(-chargePower_kW, 0);
+		double electricityConsumption_kW = max(chargePower_kW, 0);
+		updateStateOfCharge( -chargePower_kW );
 		//traceln("new state of charge: " + stateOfCharge_fr * storageCapacity_kWh);
 		updateChargingHistory( electricityProduction_kW, electricityConsumption_kW );
 
-		flowsMap.put(OL_EnergyCarriers.ELECTRICITY, electricityConsumption_kW - electricityProduction_kW);				
-		//return new Pair(this.flowsMap, this.energyUse_kW);
+		flowsMap.put(OL_EnergyCarriers.ELECTRICITY, electricityConsumption_kW - electricityProduction_kW);
+		// Split charging and discharing power 'at the source'!
+		if (chargePower_kW >= 0) { // charging
+			assetFlowsMap.put(OL_AssetFlowCategories.evChargingPower_kW, electricityConsumption_kW);
+		} else {
+			assetFlowsMap.put(OL_AssetFlowCategories.V2GPower_kW, electricityProduction_kW);
+		}
 	}
  
 	public void updateStateOfCharge( double power_kW ) {
@@ -87,8 +98,6 @@ public void updateStateOfCharge( double power_kW ) {
 		}
 	}
  
-
-	
 	@Override
 	public boolean startTrip() {
 		if (available) {
@@ -127,7 +136,7 @@ public boolean endTrip(double tripDist_km) {
 			if (stateOfCharge_fr < 0) {
 				//traceln( ownerAsset.date());
 				//traceln( "Trip distance: " + tripDist_km + ", vehicle scaling: " + vehicleScaling + ", energy cons_kWhpkm: " + energyConsumption_kWhpkm );
-				//traceln("EV of type: " + this.energyAssetType + " from GC " + this.parentAgent + " arrived home with negative SOC: " + stateOfCharge_fr );
+				traceln("EV of type: " + this.energyAssetType + " from GC " + this.parentAgent + " arrived home with negative SOC: " + stateOfCharge_fr );
 						
 				//energyChargedOutsideModelArea_kWh += -stateOfCharge_fr * storageCapacity_kWh;
 				//traceln("energyChargedOutsideModelArea_kWh: " + energyChargedOutsideModelArea_kWh);
diff --git a/_alp/Classes/Class.J_EAElectricHob.java b/_alp/Classes/Class.J_EAElectricHob.java
index 882d57bf..e8b9a900 100644
--- a/_alp/Classes/Class.J_EAElectricHob.java
+++ b/_alp/Classes/Class.J_EAElectricHob.java
@@ -19,6 +19,7 @@ public J_EAElectricHob(Agent ownerAgent, double inputCapacity_kW, double efficie
 		this.energyCarrierProduced = OL_EnergyCarriers.HEAT;
 		this.energyCarrierConsumed = OL_EnergyCarriers.ELECTRICITY;
 	    this.energyAssetType = OL_EnergyAssetType.ELECTRIC_HOB;
+	    this.assetFlowCategory = OL_AssetFlowCategories.electricHobConsumption_kW;
 	    this.activeProductionEnergyCarriers.add(this.energyCarrierProduced);		
 		this.activeConsumptionEnergyCarriers.add(this.energyCarrierConsumed);
 		registerEnergyAsset();
@@ -32,7 +33,8 @@ public void operate( double ratioOfCapacity ) {
 		this.energyUsed_kWh += timestep_h * (electricityConsumption_kW - heatProduction_kW); // This represents losses!
 		this.heatProduced_kWh += heatProduction_kW * timestep_h;
 		flowsMap.put(OL_EnergyCarriers.ELECTRICITY, electricityConsumption_kW);		
-		flowsMap.put(OL_EnergyCarriers.HEAT, -heatProduction_kW);		
+		flowsMap.put(OL_EnergyCarriers.HEAT, -heatProduction_kW);	
+		assetFlowsMap.put(this.assetFlowCategory, electricityConsumption_kW);
     }
     
 	@Override
diff --git a/_alp/Classes/Class.J_EAHydrogenVehicle.java b/_alp/Classes/Class.J_EAHydrogenVehicle.java
index 0239586d..efd07777 100644
--- a/_alp/Classes/Class.J_EAHydrogenVehicle.java
+++ b/_alp/Classes/Class.J_EAHydrogenVehicle.java
@@ -34,7 +34,7 @@ public void f_updateAllFlows(double powerFraction_fr) {
     	flowsMap.put(OL_EnergyCarriers.HYDROGEN, this.energyUse_kW);
     	    	
     	if (parentAgent instanceof GridConnection) {
-    		((GridConnection)parentAgent).f_addFlows(flowsMap, this.energyUse_kW, this);
+    		((GridConnection)parentAgent).f_addFlows(flowsMap, this.energyUse_kW, assetFlowsMap, this);
     	}
     	this.lastFlowsMap = flowsMap;
     	this.lastEnergyUse_kW = this.energyUse_kW;
diff --git a/_alp/Classes/Class.J_EAProduction.java b/_alp/Classes/Class.J_EAProduction.java
index 9e8ad8e1..3e14ef69 100644
--- a/_alp/Classes/Class.J_EAProduction.java
+++ b/_alp/Classes/Class.J_EAProduction.java
@@ -20,6 +20,13 @@ public J_EAProduction() {
 	public J_EAProduction(Agent parentAgent, OL_EnergyAssetType type, String name, OL_EnergyCarriers energyCarrier, double capacity_kW, double timestep_h, J_ProfilePointer profile) {
 	    this.parentAgent = parentAgent;
 	    this.energyAssetType = type;
+	    if (type == OL_EnergyAssetType.PHOTOVOLTAIC) {
+	    	this.assetFlowCategory = OL_AssetFlowCategories.pvProductionElectric_kW;
+	    } else if (type == OL_EnergyAssetType.WINDMILL) {
+	    	this.assetFlowCategory = OL_AssetFlowCategories.windProductionElectric_kW;
+	    } else if (type == OL_EnergyAssetType.PHOTOTHERMAL) {
+	    	this.assetFlowCategory = OL_AssetFlowCategories.ptProductionHeat_kW;
+	    }
 	    this.energyAssetName = name;
 	    this.energyCarrier = energyCarrier;
 	    this.capacity_kW = capacity_kW;
@@ -89,14 +96,15 @@ public String getName() {
     public void operate(double ratioOfCapacity) {
 		ratioOfCapacity = profilePointer.getCurrentValue();
 		
-		if (ratioOfCapacity>0.0) { // Skip when there is no production -> saves time?
+		//if (ratioOfCapacity>0.0) { // Skip when there is no production -> saves time?
 			double currentProduction_kW = ratioOfCapacity * this.capacity_kW;
 			
 	    	this.energyUse_kW = -currentProduction_kW;
 	    	this.energyUsed_kWh += this.energyUse_kW * this.timestep_h; 	    	    	
 	       	this.flowsMap.put(this.energyCarrier, -currentProduction_kW);
-	    	
-		}
+	    	this.assetFlowsMap.put(this.assetFlowCategory, currentProduction_kW);
+		//}
+	    throw new RuntimeException("J_EAProduction operate override is called!");
 	}
 	
 	@Override
@@ -109,9 +117,10 @@ public void f_updateAllFlows(double powerFraction_fr) {
 	    	this.energyUse_kW = -currentProduction_kW;
 	    	this.energyUsed_kWh += this.energyUse_kW * this.timestep_h; 	    	    	
 	       	this.flowsMap.put(this.energyCarrier, -currentProduction_kW);
+	       	this.assetFlowsMap.put(this.assetFlowCategory, currentProduction_kW);
 	       	if (parentAgent instanceof GridConnection) {    		
 	    		//((GridConnection)parentAgent).f_addFlows(arr, this);
-	    		((GridConnection)parentAgent).f_addFlows(flowsMap, this.energyUse_kW, this);
+	    		((GridConnection)parentAgent).f_addFlows(flowsMap, this.energyUse_kW, assetFlowsMap, this);
 	    	}
 
 		}
@@ -129,13 +138,16 @@ public void curtailElectricityProduction(double curtailmentSetpoint_kW) {  // Th
     	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, this);
+    		((GridConnection)parentAgent).f_removeFlows(this.flowsMap, this.energyUse_kW, assetFlows_kW, this);
     	}
     	clear();
     	
@@ -153,13 +165,15 @@ public double curtailEnergyCarrierProduction(OL_EnergyCarriers curtailedEnergyCa
     	energyUsed_kWh += curtailmentPower_kW * timestep_h;
     	this.totalEnergyCurtailed_kWh += curtailmentPower_kW * timestep_h;
     	this.flowsMap.put(curtailedEnergyCarrier, -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(curtailedEnergyCarrier, 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, this);
+    		((GridConnection)parentAgent).f_removeFlows(this.flowsMap, this.energyUse_kW, assetFlows_kW, this);
     	}
     	clear();
     	
diff --git a/_alp/Classes/Class.J_EAProfile.java b/_alp/Classes/Class.J_EAProfile.java
index ce83f3b8..b3652086 100644
--- a/_alp/Classes/Class.J_EAProfile.java
+++ b/_alp/Classes/Class.J_EAProfile.java
@@ -37,6 +37,18 @@ 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) {
+	    	this.assetFlowCategory = OL_AssetFlowCategories.evChargingPower_kW;
+	    } else if (profileType == OL_ProfileAssetType.WINDTURBINE) {
+	    	this.assetFlowCategory = OL_AssetFlowCategories.windProductionElectric_kW;
+	    } else if (profileType == OL_ProfileAssetType.SOLARPANELS) {
+	    	this.assetFlowCategory = OL_AssetFlowCategories.pvProductionElectric_kW;	    	
+	    } else if (profileType == OL_ProfileAssetType.HEATPUMP_ELECTRICITY_CONSUMPTION) {
+	    	this.assetFlowCategory = OL_AssetFlowCategories.heatPumpElectricityConsumption_kW;
+	    } 
+	    
 	    //this.activeProductionEnergyCarriers.add(this.energyCarrier);
 	    this.activeConsumptionEnergyCarriers.add(this.energyCarrier);
 	    
@@ -56,7 +68,7 @@ public void f_updateAllFlows(double time_h) {
     	operate(time_h-this.profileStarTime_h);
     	//J_FlowsMap flowsMap = flowsPair.getFirst();
     	if (parentAgent instanceof GridConnection) {    		
-    		((GridConnection)parentAgent).f_addFlows(flowsMap, this.energyUse_kW, this);
+    		((GridConnection)parentAgent).f_addFlows(flowsMap, this.energyUse_kW, assetFlowsMap, this);
     	}
     	//if (ui_energyAsset!= null) {
     		//ui_energyAsset.f_addFlows(flowsMap);
@@ -85,37 +97,22 @@ public void operate(double time_h) {
     	}
     	if ( time_h < 0 ) {
     		traceln("Time out of lower bound for evaluating J_EAProfile power in profile asset %s!", this.energyAssetName);
-    		//time_h = 0;
     		throw new RuntimeException(String.format("Time out of lower bound for evaluating J_EAProfile power! Time is: %s", time_h));
     	}
-    	/*if (energyCarrierConsumed == OL_EnergyCarriers.ELECTRICITY) {
-    		this.electricityConsumption_kW = max(0,a_energyProfile_kWh[(int)floor(time_h/profileTimestep_h)]/profileTimestep_h);
-        	this.electricityProduction_kW = -min(0,a_energyProfile_kWh[(int)floor(time_h/profileTimestep_h)]/profileTimestep_h);        	
-    	} else if (energyCarrierConsumed == OL_EnergyCarriers.METHANE) {
-    		this.methaneConsumption_kW = max(0,a_energyProfile_kWh[(int)floor(time_h/profileTimestep_h)]/profileTimestep_h);
-        	this.methaneProduction_kW = -min(0,a_energyProfile_kWh[(int)floor(time_h/profileTimestep_h)]/profileTimestep_h);    		    		
-    	} else if (energyCarrierConsumed == OL_EnergyCarriers.HYDROGEN) {
-    		this.hydrogenConsumption_kW = max(0,a_energyProfile_kWh[(int)floor(time_h/profileTimestep_h)]/profileTimestep_h);
-        	this.hydrogenProduction_kW = -min(0,a_energyProfile_kWh[(int)floor(time_h/profileTimestep_h)]/profileTimestep_h);
-    	} else if  (energyCarrierConsumed == OL_EnergyCarriers.HEAT) {
-    		this.heatConsumption_kW = max(0,a_energyProfile_kWh[(int)floor(time_h/profileTimestep_h)]/profileTimestep_h);
-        	this.heatProduction_kW = -min(0,a_energyProfile_kWh[(int)floor(time_h/profileTimestep_h)]/profileTimestep_h);
-        	//traceln("Current heat consumption: %s", this.heatConsumption_kW);
-    	} else if  (energyCarrierConsumed == OL_EnergyCarriers.DIESEL) {
-    		this.dieselConsumption_kW = max(0,a_energyProfile_kWh[(int)floor(time_h/profileTimestep_h)]/profileTimestep_h);
-    	}*/
-		//traceln("Running custom demand profile for " + energyAssetName + " with current timestep demand " + (electricityConsumption_kW - electricityProduction_kW) + " kW. Array index is " + (int)floor(time_h/timestep_h) + ", time is: " + time_h + " hours, array size is " + a_energyProfile_kWh.length);	
+
     	double currentPower_kW = a_energyProfile_kWh[(int)floor(time_h/profileTimestep_h)]/profileTimestep_h;
     	this.energyUse_kW = currentPower_kW;
 		this.energyUsed_kWh += timestep_h * energyUse_kW; 
 		this.flowsMap.put(this.energyCarrier, currentPower_kW);		
+		if (this.assetFlowCategory != null) {
+			this.assetFlowsMap.put(this.assetFlowCategory, currentPower_kW);
+		}
     }
 
 	public double getEnergyUsed_kWh() {
 		return energyUsed_kWh;
 	}
 
-    //public Pair<J_FlowsMap, Double> curtailElectricityConsumption(double curtailmentSetpoint_kW) {
     public void curtailElectricityConsumption(double curtailmentSetpoint_kW) {
     	//double currentElectricityProduction_kW = lastFlowsArray[4];
     	double currentElectricityConsumption_kW = this.lastFlowsMap.get(OL_EnergyCarriers.ELECTRICITY);
@@ -124,7 +121,10 @@ public void curtailElectricityConsumption(double curtailmentSetpoint_kW) {
     	loadLoad_kWh += curtailmentPower_kW * timestep_h;
     	//double[] arr = {0, 0, 0, 0, -curtailmentPower_kW, 0, 0, 0, 0, -curtailmentPower_kW};
     	J_FlowsMap flowsMap = new J_FlowsMap();
-    	flowsMap.put(OL_EnergyCarriers.ELECTRICITY, -curtailmentPower_kW);
+    	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;
     	//flowsMap.put(OL_EnergyCarriers.ENERGY_USE, -curtailmentPower_kW);
 
@@ -136,7 +136,7 @@ public void curtailElectricityConsumption(double curtailmentSetpoint_kW) {
 
     	//traceln("Electricity production of asset %s curtailed by %s kW!", this, curtailmentPower_kW);
     	if (parentAgent instanceof GridConnection) {    		
-    		((GridConnection)parentAgent).f_removeFlows(flowsMap, this.energyUse_kW, this);
+    		((GridConnection)parentAgent).f_removeFlows(flowsMap, this.energyUse_kW, assetFlows_kW, this);
     	}
     	//if (ui_energyAsset!= null) {
     		//ui_energyAsset.f_removeFlows(flowsMap);
diff --git a/_alp/Classes/Class.J_EAStorageElectric.java b/_alp/Classes/Class.J_EAStorageElectric.java
index 5ca90a2d..3fd4b45f 100644
--- a/_alp/Classes/Class.J_EAStorageElectric.java
+++ b/_alp/Classes/Class.J_EAStorageElectric.java
@@ -8,6 +8,7 @@ public class J_EAStorageElectric extends J_EAStorage implements Serializable {
 	private double etaCharge_r; // charging efficiency
 	private double etaDischarge_r;
 	protected double capacityElectric_kW;
+	
     /**
      * Default constructor
      */
@@ -30,6 +31,7 @@ public J_EAStorageElectric(Agent parentAgent, double capacityElectric_kW, double
 		this.etaDischarge_r = Math.sqrt(eta_r);
 	    this.activeProductionEnergyCarriers.add(this.storageMedium);		
 		this.activeConsumptionEnergyCarriers.add(this.storageMedium);
+		this.assetFlowCategory = OL_AssetFlowCategories.batteriesChargingPower_kW;
 		registerEnergyAsset();
     }
     
@@ -70,6 +72,11 @@ public void operate(double ratioOfChargeCapacity_r) {
 		updateStateOfCharge( deltaEnergy_kWh );
 		//traceln("Battery SoC: %s", stateOfCharge_fr);
 		flowsMap.put(OL_EnergyCarriers.ELECTRICITY, electricityConsumption_kW-electricityProduction_kW);		
+		//assetFlowsMap.put(this.assetFlowCategory, electricityConsumption_kW-electricityProduction_kW);		
+		
+		// Split charging and discharing power 'at the source'!
+		assetFlowsMap.put(OL_AssetFlowCategories.batteriesChargingPower_kW, electricityConsumption_kW);
+		assetFlowsMap.put(OL_AssetFlowCategories.batteriesDischargingPower_kW, electricityProduction_kW);
 	}
 	
 	public void setBatteryEfficiency_r(double eta_r) {
diff --git a/_alp/Classes/Class.J_FlowsMap.java b/_alp/Classes/Class.J_FlowsMap.java
index e027a1e8..089050d1 100644
--- a/_alp/Classes/Class.J_FlowsMap.java
+++ b/_alp/Classes/Class.J_FlowsMap.java
@@ -96,7 +96,7 @@ public String toString() {
             sb.append(key);
             sb.append(" = ");
             sb.append(value);
-            sb.append(", ");
+            sb.append("\n ");
         }
         sb.delete(sb.length()-2, sb.length());
         sb.append('}');
diff --git a/_alp/Classes/Class.J_LiveData.java b/_alp/Classes/Class.J_LiveData.java
index e069cc41..197e8f5c 100644
--- a/_alp/Classes/Class.J_LiveData.java
+++ b/_alp/Classes/Class.J_LiveData.java
@@ -14,26 +14,16 @@ public class J_LiveData {
 	public J_AssetsMetaData assetsMetaData;
 	public J_ConnectionMetaData connectionMetaData;
 
-	public J_DataSetMap dsm_liveDemand_kW = new J_DataSetMap(); 
-	public J_DataSetMap dsm_liveSupply_kW = new J_DataSetMap(); 
-	public DataSet data_baseloadElectricityDemand_kW = new DataSet(672);
-	public DataSet data_hydrogenElectricityDemand_kW = new DataSet(672);
-	public DataSet data_heatPumpElectricityDemand_kW = new DataSet(672);
-	public DataSet data_electricVehicleDemand_kW = new DataSet(672);
-	public DataSet data_batteryCharging_kW = new DataSet(672);
-	public DataSet data_PVGeneration_kW = new DataSet(672);
-	public DataSet data_windGeneration_kW = new DataSet(672);
-	public DataSet data_PTGeneration_kW = new DataSet(672);
-	public DataSet data_batteryDischarging_kW = new DataSet(672);
-	public DataSet data_V2GSupply_kW = new DataSet(672);
-	public DataSet data_CHPElectricityProductionLiveWeek_kW = new DataSet(672);
+	public J_DataSetMap dsm_liveDemand_kW = new J_DataSetMap(OL_EnergyCarriers.class); 
+	public J_DataSetMap dsm_liveSupply_kW = new J_DataSetMap(OL_EnergyCarriers.class); 
+	
 	public DataSet data_totalDemand_kW = new DataSet(672); 
 	public DataSet data_totalSupply_kW = new DataSet(672);
 	public DataSet data_liveElectricityBalance_kW = new DataSet(672);
 	public DataSet data_gridCapacityDemand_kW = new DataSet(672); 
 	public DataSet data_gridCapacitySupply_kW = new DataSet(672);
-	public DataSet data_cookingElectricityDemand_kW = new DataSet(672);
-	public DataSet data_districtHeatDelivery_kW = new DataSet(672);
+
+	public J_DataSetMap<OL_AssetFlowCategories> dsm_liveAssetFlows_kW = new J_DataSetMap(OL_AssetFlowCategories.class); 
 	public DataSet data_batteryStoredEnergyLiveWeek_MWh = new DataSet(672);
 	public DataSet data_batterySOC_fr = new DataSet(672);
     /**
@@ -60,31 +50,33 @@ public void resetLiveDatasets(double startTime, double endTime, double timeStep_
     		dsm_liveSupply_kW.put( EC, dsSupply);
     	}
     	
+    	for (OL_AssetFlowCategories AC : assetsMetaData.activeAssetFlows) { // First add missing assetFlow datasets if there are any
+			if (!dsm_liveAssetFlows_kW.keySet().contains(AC)) {
+				DataSet dsAsset = new DataSet((int)(168 / timeStep_h));
+				dsm_liveAssetFlows_kW.put(AC, dsAsset);
+			}
+    	}
+    	
 		for (double t = startTime; t <= endTime; t += timeStep_h) {
-	    	data_baseloadElectricityDemand_kW.add( t, 0);
-	    	data_hydrogenElectricityDemand_kW.add( t, 0);
-	    	data_heatPumpElectricityDemand_kW.add( t, 0);
-	    	data_electricVehicleDemand_kW.add( t, 0);
-	    	data_batteryCharging_kW.add( t, 0);
-	    	data_PVGeneration_kW.add( t, 0);
-	    	data_windGeneration_kW.add( t, 0);
-	    	data_PTGeneration_kW.add( t, 0);
-	    	data_batteryDischarging_kW.add( t, 0);
-	    	data_V2GSupply_kW.add( t, 0);
-	    	data_CHPElectricityProductionLiveWeek_kW.add( t, 0);
+			
+			for (OL_AssetFlowCategories AC : assetsMetaData.activeAssetFlows) {
+				dsm_liveAssetFlows_kW.get(AC).add(t, 0);
+			}
+
 	    	data_totalDemand_kW.add( t, 0); 
 	    	data_totalSupply_kW.add( t, 0);
 	    	data_liveElectricityBalance_kW.add( t, 0);
 	    	data_gridCapacityDemand_kW.add( t, 0); 
 	    	data_gridCapacitySupply_kW.add( t, 0);
-	    	data_cookingElectricityDemand_kW.add( t, 0);
-	    	data_districtHeatDelivery_kW.add( t, 0);
+
+
 	    	data_batteryStoredEnergyLiveWeek_MWh.add( t, 0);
 	    	data_batterySOC_fr.add( t, 0);	
-    	}
+		}
     }
     
-    public void addTimeStep(double currentTime_h, J_FlowsMap fm_currentBalanceFlows_kW, J_FlowsMap fm_currentConsumptionFlows_kW, J_FlowsMap fm_currentProductionFlows_kW, double v_currentPrimaryEnergyProduction_kW, double v_currentFinalEnergyConsumption_kW, double v_currentPrimaryEnergyProductionHeatpumps_kW, double v_currentEnergyCurtailed_kW, J_AssetFlows assetFlows) {
+    public void addTimeStep(double currentTime_h, J_FlowsMap fm_currentBalanceFlows_kW, J_FlowsMap fm_currentConsumptionFlows_kW, J_FlowsMap fm_currentProductionFlows_kW, J_ValueMap<OL_AssetFlowCategories> assetFlowsMap, double v_currentPrimaryEnergyProduction_kW, double v_currentFinalEnergyConsumption_kW, double v_currentPrimaryEnergyProductionHeatpumps_kW, double v_currentEnergyCurtailed_kW, double currentStoredEnergyBatteries_MWh) {
+
     	//Energy carrier flows
     	for (OL_EnergyCarriers EC : activeConsumptionEnergyCarriers) {
     		this.dsm_liveDemand_kW.get(EC).add( currentTime_h, roundToDecimal(fm_currentConsumptionFlows_kW.get(EC), 3) );
@@ -96,63 +88,34 @@ public void addTimeStep(double currentTime_h, J_FlowsMap fm_currentBalanceFlows_
     	//Electricity balance
     	this.data_liveElectricityBalance_kW.add(currentTime_h, fm_currentBalanceFlows_kW.get(OL_EnergyCarriers.ELECTRICITY));
 
-
     	//Total demand and supply
     	this.data_totalDemand_kW.add(currentTime_h, v_currentFinalEnergyConsumption_kW);
     	this.data_totalSupply_kW.add(currentTime_h, v_currentPrimaryEnergyProduction_kW);
 
-
     	//Live capacity datasets
     	this.data_gridCapacityDemand_kW.add(currentTime_h, connectionMetaData.contractedDeliveryCapacity_kW);
     	this.data_gridCapacitySupply_kW.add(currentTime_h, -connectionMetaData.contractedFeedinCapacity_kW);
 
-
     	//// Gather specific electricity flows from corresponding energy assets
-
-    	//Baseload electricity
-    	this.data_baseloadElectricityDemand_kW.add(currentTime_h, roundToDecimal(assetFlows.fixedConsumptionElectric_kW,3));
-
-    	//Cooking
-    	this.data_cookingElectricityDemand_kW.add(currentTime_h, roundToDecimal(assetFlows.electricHobConsumption_kW, 3));
-
-    	//Hydrogen elec consumption
-    	this.data_hydrogenElectricityDemand_kW.add(currentTime_h, roundToDecimal(max(0, assetFlows.hydrogenElectricityConsumption_kW), 3));
-
-    	//Heatpump elec consumption
-    	this.data_heatPumpElectricityDemand_kW.add(currentTime_h, roundToDecimal(max(0, assetFlows.heatPumpElectricityConsumption_kW), 3));
-
-    	//EVs
-    	this.data_electricVehicleDemand_kW.add(currentTime_h, roundToDecimal(max(0,assetFlows.evChargingPowerElectric_kW), 3));
-    	this.data_V2GSupply_kW.add(currentTime_h, roundToDecimal(max(0, -assetFlows.evChargingPowerElectric_kW), 3));
-
-    	//Batteries
-    	this.data_batteryCharging_kW.add(currentTime_h, roundToDecimal(assetFlows.currentBatteriesConsumption_kW, 3));		
-    	this.data_batteryDischarging_kW.add(currentTime_h, roundToDecimal(assetFlows.currentBatteriesProduction_kW, 3));	
-    	this.data_batteryStoredEnergyLiveWeek_MWh.add(currentTime_h, assetFlows.currentStoredEnergyBatteries_MWh);
+		//for (OL_AssetFlowCategories AC : assetFlowsMap.keySet()) {
+		for (OL_AssetFlowCategories AC : dsm_liveAssetFlows_kW.keySet()) {	
+			//traceln("Assetsflows in dsm_liveAssetflows_kW: %s", dsm_liveAssetFlows_kW.keySet());
+			/*if (!dsm_liveAssetFlows_kW.keySet().contains(AC)) {
+				traceln("Trying to add assetflow: %s", AC);
+				traceln("Parent GC: %s", ((GridConnection)parentAgent).p_gridConnectionID);
+			}*/
+			dsm_liveAssetFlows_kW.get(AC).add(currentTime_h, roundToDecimal(assetFlowsMap.get(AC),3));
+		}
+    	
+		//Batteries    
+    	this.data_batteryStoredEnergyLiveWeek_MWh.add(currentTime_h, currentStoredEnergyBatteries_MWh);
     	if(assetsMetaData.totalInstalledBatteryStorageCapacity_MWh > 0){
-    		this.data_batterySOC_fr.add(currentTime_h, assetFlows.currentStoredEnergyBatteries_MWh/assetsMetaData.totalInstalledBatteryStorageCapacity_MWh);	
+    		this.data_batterySOC_fr.add(currentTime_h, currentStoredEnergyBatteries_MWh/assetsMetaData.totalInstalledBatteryStorageCapacity_MWh);	
     	}
     	else{
     		this.data_batterySOC_fr.add(currentTime_h, 0);	
     	}	
-    	
-    	//CHP production
-    	this.data_CHPElectricityProductionLiveWeek_kW.add(currentTime_h, roundToDecimal(assetFlows.CHPProductionElectric_kW, 3));
-
-    	//PV production
-    	if (assetFlows.pvProductionElectric_kW < 0) {
-    		throw new RuntimeException("Negative assetFlows.pvProductionElectric_kW! Curtailment error? Value: " + assetFlows.pvProductionElectric_kW );
-    	}
-    	this.data_PVGeneration_kW.add(currentTime_h, roundToDecimal(assetFlows.pvProductionElectric_kW , 3));
-
-    	//Wind production
-    	this.data_windGeneration_kW.add(currentTime_h, roundToDecimal(assetFlows.windProductionElectric_kW, 3));	
-
-    	//PT production
-    	this.data_PTGeneration_kW.add(currentTime_h, roundToDecimal(assetFlows.ptProductionHeat_kW, 3));
-
-    	//District heating
-    	this.data_districtHeatDelivery_kW.add(currentTime_h, roundToDecimal(assetFlows.districtHeatDelivery_kW, 3));	
+	
 
     }
     
diff --git a/_alp/Classes/Class.J_LoadDurationCurves.java b/_alp/Classes/Class.J_LoadDurationCurves.java
index 462210ee..4124f0de 100644
--- a/_alp/Classes/Class.J_LoadDurationCurves.java
+++ b/_alp/Classes/Class.J_LoadDurationCurves.java
@@ -35,7 +35,7 @@ public J_LoadDurationCurves(double[] loadArray_kW, EnergyModel energyModel) {
     	this.energyModel = energyModel;
     	calculateLoadDurationCurves(loadArray_kW);	
     }    
-     
+    
     public void calculateLoadDurationCurves(double[] loadArray_kW) {
     	this.arraySize = loadArray_kW.length;
     	if (ds_loadDurationCurveTotal_kW != null) {	
@@ -64,22 +64,51 @@ public void calculateLoadDurationCurves(double[] loadArray_kW) {
     	int i_weekday=0;
     	int i_weekend=0;
 
+    	int maxIndex = 0; // index with peak import
+    	for (int i = 1; i < loadArray_kW.length; i++) {
+    	    if (loadArray_kW[i] > loadArray_kW[maxIndex]) {
+    	        maxIndex = i;
+    	    }
+    	}
+    	
+    	int minIndex = 0; // index with peak export
+    	for (int i = 1; i < loadArray_kW.length; i++) {
+    	    if (loadArray_kW[i] < loadArray_kW[minIndex]) {
+    	        minIndex = i;
+    	    }
+    	}
     	//double[] annualElectricityBalanceTimeSeries_kW = acc_annualElectricityBalance_kW.getTimeSeries();
-
+    	boolean replaceSummerWinterWithPeaks = true;
+    	
     	for(int i=0; i<arraySize ; i++) {
     		if (!firstRun) {
     			// First we make sure to store our previous Load Curve
     			ds_previousLoadDurationCurveTotal_kW.add(i*energyModel.p_timeStep_h,ds_loadDurationCurveTotal_kW.getY(i));		
     		}
-    		// summer/winter
-    		if (energyModel.p_runStartTime_h + i*energyModel.p_timeStep_h > energyModel.p_startOfSummerWeek_h && energyModel.p_runStartTime_h + i*energyModel.p_timeStep_h<= energyModel.p_startOfSummerWeek_h+24*7) {
-    			netLoadArraySummerweek_kW[i_summer]=-netLoadArrayAnnual_kW[i];
-    			i_summer++;
-    		}
-    		if (energyModel.p_runStartTime_h + i*energyModel.p_timeStep_h > energyModel.p_startOfWinterWeek_h && energyModel.p_runStartTime_h + i*energyModel.p_timeStep_h<= energyModel.p_startOfWinterWeek_h+24*7) {
-    			netLoadArrayWinterweek_kW[i_winter]=-netLoadArrayAnnual_kW[i];
-    			i_winter++;
-    		}
+    		
+    		if (replaceSummerWinterWithPeaks) {
+	    		// peak weeks
+	    		if (i >= (minIndex - roundToInt(84 / energyModel.p_timeStep_h)) && i < (minIndex + roundToInt(84 / energyModel.p_timeStep_h)) ) {
+	    			netLoadArraySummerweek_kW[i_summer]=-netLoadArrayAnnual_kW[i];
+	    			i_summer++;
+	    		}
+	    		
+	    		if (i >= (maxIndex - roundToInt(84 / energyModel.p_timeStep_h)) && i < (maxIndex + roundToInt(84 / energyModel.p_timeStep_h)) ) {
+	    			netLoadArrayWinterweek_kW[i_winter]=-netLoadArrayAnnual_kW[i];
+	    			i_winter++;
+	    		}
+			} else {
+				// summer/winter
+				if (energyModel.p_runStartTime_h + i*energyModel.p_timeStep_h > energyModel.p_startOfSummerWeek_h && energyModel.p_runStartTime_h + i*energyModel.p_timeStep_h<= energyModel.p_startOfSummerWeek_h+24*7) {
+					netLoadArraySummerweek_kW[i_summer]=-netLoadArrayAnnual_kW[i];
+					i_summer++;
+				}
+				if (energyModel.p_runStartTime_h + i*energyModel.p_timeStep_h > energyModel.p_startOfWinterWeek_h && energyModel.p_runStartTime_h + i*energyModel.p_timeStep_h<= energyModel.p_startOfWinterWeek_h+24*7) {
+					netLoadArrayWinterweek_kW[i_winter]=-netLoadArrayAnnual_kW[i];
+					i_winter++;
+				}
+			}
+    		
     		// day/night
     		if (i*energyModel.p_timeStep_h % 24 > 6 && i*energyModel.p_timeStep_h % 24 <= 18) { //daytime
     			netLoadArrayDaytime_kW[i_day]=-netLoadArrayAnnual_kW[i];
diff --git a/_alp/Classes/Class.J_RapidRunData.java b/_alp/Classes/Class.J_RapidRunData.java
index 38353628..9b8b555c 100644
--- a/_alp/Classes/Class.J_RapidRunData.java
+++ b/_alp/Classes/Class.J_RapidRunData.java
@@ -6,7 +6,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreType;
 @JsonIgnoreType
 public class J_RapidRunData {
-	
+	public boolean storesTotalAssetFlows = true;
 	public Agent parentAgent;
 	private double timeStep_h;
 	public EnumSet<OL_EnergyCarriers> activeEnergyCarriers;
@@ -17,36 +17,24 @@ public class J_RapidRunData {
 	public J_ConnectionMetaData connectionMetaData;
 	
 	////Full simulation
-	public J_AccumulatorMap am_totalBalanceAccumulators_kW = new J_AccumulatorMap();
-	
+	public J_AccumulatorMap<OL_EnergyCarriers> am_totalBalanceAccumulators_kW = new J_AccumulatorMap(OL_EnergyCarriers.class);
+
     public ZeroAccumulator acc_totalEnergyCurtailed_kW;
     public ZeroAccumulator acc_totalPrimaryEnergyProductionHeatpumps_kW;
     
-    public J_AccumulatorMap am_dailyAverageConsumptionAccumulators_kW = new J_AccumulatorMap();
-    public J_AccumulatorMap am_dailyAverageProductionAccumulators_kW = new J_AccumulatorMap();
+    public J_AccumulatorMap<OL_EnergyCarriers> am_dailyAverageConsumptionAccumulators_kW = new J_AccumulatorMap(OL_EnergyCarriers.class);
+    public J_AccumulatorMap<OL_EnergyCarriers> am_dailyAverageProductionAccumulators_kW = new J_AccumulatorMap(OL_EnergyCarriers.class);
     
 	public ZeroAccumulator acc_dailyAverageFinalEnergyConsumption_kW;
 	public ZeroAccumulator acc_dailyAverageEnergyProduction_kW;
-	
-	public ZeroAccumulator acc_dailyAverageBaseloadElectricityConsumption_kW;
-    public ZeroAccumulator acc_dailyAverageHeatPumpElectricityConsumption_kW;
-    public ZeroAccumulator acc_dailyAverageElectricVehicleConsumption_kW;
-    public ZeroAccumulator acc_dailyAverageBatteriesConsumption_kW;
-    public ZeroAccumulator acc_dailyAverageElectricCookingConsumption_kW;
-    public ZeroAccumulator acc_dailyAverageElectrolyserElectricityConsumption_kW;
-    public ZeroAccumulator acc_dailyAverageDistrictHeatingConsumption_kW;
-    
-    public ZeroAccumulator acc_dailyAveragePVProduction_kW;
-    public ZeroAccumulator acc_dailyAverageWindProduction_kW;
-    public ZeroAccumulator acc_dailyAveragePTProduction_kW;
-    public ZeroAccumulator acc_dailyAverageV2GProduction_kW;
-    public ZeroAccumulator acc_dailyAverageBatteriesProduction_kW;
-    public ZeroAccumulator acc_dailyAverageCHPElectricityProduction_kW;
+
+	public J_AccumulatorMap<OL_AssetFlowCategories> am_assetFlowsAccumulators_kW = new J_AccumulatorMap(OL_AssetFlowCategories.class);
+
     public ZeroTimeSeries ts_dailyAverageBatteriesStoredEnergy_MWh;
-    public ZeroTimeSeries ts_dailyAverageBatteriesSOC_fr;
+    //public ZeroTimeSeries ts_dailyAverageBatteriesSOC_fr;
     
     ////Summer week
-    public J_AccumulatorMap am_summerWeekBalanceAccumulators_kW = new J_AccumulatorMap();
+    public J_AccumulatorMap am_summerWeekBalanceAccumulators_kW = new J_AccumulatorMap(OL_EnergyCarriers.class);
 
     public ZeroAccumulator acc_summerWeekDeliveryCapacity_kW;
     public ZeroAccumulator acc_summerWeekFeedinCapacity_kW;
@@ -54,29 +42,17 @@ public class J_RapidRunData {
     public ZeroAccumulator acc_summerWeekFinalEnergyConsumption_kW;
     public ZeroAccumulator acc_summerWeekEnergyCurtailed_kW;
     public ZeroAccumulator acc_summerWeekEnergyProduction_kW;
-
-    public J_AccumulatorMap am_summerWeekConsumptionAccumulators_kW = new J_AccumulatorMap();
-    public J_AccumulatorMap am_summerWeekProductionAccumulators_kW = new J_AccumulatorMap();
-
-    public ZeroAccumulator acc_summerWeekBaseloadElectricityConsumption_kW;
-    public ZeroAccumulator acc_summerWeekHeatPumpElectricityConsumption_kW;
-    public ZeroAccumulator acc_summerWeekElectricVehicleConsumption_kW;
-    public ZeroAccumulator acc_summerWeekBatteriesConsumption_kW;
-    public ZeroAccumulator acc_summerWeekElectricCookingConsumption_kW;
-    public ZeroAccumulator acc_summerWeekElectrolyserElectricityConsumption_kW;
-    public ZeroAccumulator acc_summerWeekDistrictHeatingConsumption_kW;
-    public ZeroAccumulator acc_summerWeekPVProduction_kW;
-    public ZeroAccumulator acc_summerWeekWindProduction_kW;
-    public ZeroAccumulator acc_summerWeekPTProduction_kW;
-    public ZeroAccumulator acc_summerWeekV2GProduction_kW;
-    public ZeroAccumulator acc_summerWeekBatteriesProduction_kW;
-    public ZeroAccumulator acc_summerWeekCHPElectricityProduction_kW;
     public ZeroAccumulator acc_summerWeekPrimaryEnergyProductionHeatpumps_kW;
+    
+    public J_AccumulatorMap am_summerWeekConsumptionAccumulators_kW = new J_AccumulatorMap(OL_EnergyCarriers.class);
+    public J_AccumulatorMap am_summerWeekProductionAccumulators_kW = new J_AccumulatorMap(OL_EnergyCarriers.class);
+
+    public J_AccumulatorMap<OL_AssetFlowCategories> am_assetFlowsSummerWeek_kW = new J_AccumulatorMap(OL_AssetFlowCategories.class);
     public ZeroTimeSeries ts_summerWeekBatteriesStoredEnergy_MWh;
     public ZeroTimeSeries ts_summerWeekBatteriesSOC_fr;
     
     ////Winter week
-    public J_AccumulatorMap am_winterWeekBalanceAccumulators_kW = new J_AccumulatorMap();
+    public J_AccumulatorMap am_winterWeekBalanceAccumulators_kW = new J_AccumulatorMap(OL_EnergyCarriers.class);
     
     public ZeroAccumulator acc_winterWeekDeliveryCapacity_kW;
     public ZeroAccumulator acc_winterWeekFeedinCapacity_kW;
@@ -84,31 +60,19 @@ public class J_RapidRunData {
     public ZeroAccumulator acc_winterWeekFinalEnergyConsumption_kW;
     public ZeroAccumulator acc_winterWeekEnergyProduction_kW;
     public ZeroAccumulator acc_winterWeekEnergyCurtailed_kW;
+    public ZeroAccumulator acc_winterWeekPrimaryEnergyProductionHeatpumps_kW;
     
-    public J_AccumulatorMap am_winterWeekConsumptionAccumulators_kW = new J_AccumulatorMap();
-    public J_AccumulatorMap am_winterWeekProductionAccumulators_kW = new J_AccumulatorMap();  
+    public J_AccumulatorMap am_winterWeekConsumptionAccumulators_kW = new J_AccumulatorMap(OL_EnergyCarriers.class);
+    public J_AccumulatorMap am_winterWeekProductionAccumulators_kW = new J_AccumulatorMap(OL_EnergyCarriers.class);  
     
-    public ZeroAccumulator acc_winterWeekBaseloadElectricityConsumption_kW;
-    public ZeroAccumulator acc_winterWeekHeatPumpElectricityConsumption_kW;
-    public ZeroAccumulator acc_winterWeekElectricVehicleConsumption_kW;
-    public ZeroAccumulator acc_winterWeekBatteriesConsumption_kW;
-    public ZeroAccumulator acc_winterWeekElectricCookingConsumption_kW;
-    public ZeroAccumulator acc_winterWeekElectrolyserElectricityConsumption_kW;
-    public ZeroAccumulator acc_winterWeekDistrictHeatingConsumption_kW;
-    public ZeroAccumulator acc_winterWeekPVProduction_kW;
-    public ZeroAccumulator acc_winterWeekWindProduction_kW;
-    public ZeroAccumulator acc_winterWeekPTProduction_kW;
-    public ZeroAccumulator acc_winterWeekV2GProduction_kW;
-    public ZeroAccumulator acc_winterWeekBatteriesProduction_kW;
-    public ZeroAccumulator acc_winterWeekCHPElectricityProduction_kW;
-    public ZeroAccumulator acc_winterWeekPrimaryEnergyProductionHeatpumps_kW;
+    public J_AccumulatorMap<OL_AssetFlowCategories> am_assetFlowsWinterWeek_kW = new J_AccumulatorMap(OL_AssetFlowCategories.class);
     public ZeroTimeSeries ts_winterWeekBatteriesStoredEnergy_MWh;
     public ZeroTimeSeries ts_winterWeekBatteriesSOC_fr;
     
     ////Daytime / Nighttime
-	public J_AccumulatorMap am_daytimeExports_kW = new J_AccumulatorMap();
-    public J_AccumulatorMap am_daytimeImports_kW = new J_AccumulatorMap();
-    
+	public J_AccumulatorMap am_daytimeExports_kW = new J_AccumulatorMap(OL_EnergyCarriers.class);
+    public J_AccumulatorMap am_daytimeImports_kW = new J_AccumulatorMap(OL_EnergyCarriers.class);
+    	
     public ZeroAccumulator acc_daytimeFinalEnergyConsumption_kW;
     public ZeroAccumulator acc_daytimeEnergyProduction_kW;
     public ZeroAccumulator acc_daytimeElectricityConsumption_kW;
@@ -117,8 +81,8 @@ public class J_RapidRunData {
     public ZeroAccumulator acc_daytimePrimaryEnergyProductionHeatpumps_kW;
     
     //Weekend/day
-    public J_AccumulatorMap am_weekendExports_kW = new J_AccumulatorMap();
-    public J_AccumulatorMap am_weekendImports_kW = new J_AccumulatorMap();
+    public J_AccumulatorMap am_weekendExports_kW = new J_AccumulatorMap(OL_EnergyCarriers.class);
+    public J_AccumulatorMap am_weekendImports_kW = new J_AccumulatorMap(OL_EnergyCarriers.class);
     
     public ZeroAccumulator acc_weekendElectricityConsumption_kW;
     public ZeroAccumulator acc_weekendElectricityProduction_kW;
@@ -133,6 +97,11 @@ public class J_RapidRunData {
      */
     public J_RapidRunData(Agent parentAgent) {
     	this.parentAgent = parentAgent;
+    	if (parentAgent instanceof GridConnection) {
+    		if (!((GridConnection)parentAgent).v_hasQuarterHourlyValues ) {
+    			storesTotalAssetFlows = false;
+    		}
+    	}
     }
     
     public void initializeAccumulators(double simDuration_h, double timeStep_h, EnumSet<OL_EnergyCarriers> v_activeEnergyCarriers, EnumSet<OL_EnergyCarriers> v_activeConsumptionEnergyCarriers, EnumSet<OL_EnergyCarriers> v_activeProductionEnergyCarriers) {
@@ -152,23 +121,24 @@ public void initializeAccumulators(double simDuration_h, double timeStep_h, Enum
 	    acc_totalEnergyCurtailed_kW = new ZeroAccumulator(true, 24.0, simDuration_h);
 	    acc_totalPrimaryEnergyProductionHeatpumps_kW = new ZeroAccumulator(true, 24.0, simDuration_h);
 	
-	    acc_dailyAverageBaseloadElectricityConsumption_kW = new ZeroAccumulator(true, 24.0, simDuration_h);
-	    acc_dailyAverageHeatPumpElectricityConsumption_kW = new ZeroAccumulator(true, 24.0, simDuration_h);
-	    acc_dailyAverageElectricVehicleConsumption_kW = new ZeroAccumulator(true, 24.0, simDuration_h);
-	    acc_dailyAverageBatteriesConsumption_kW = new ZeroAccumulator(true, 24.0, simDuration_h);
-	    acc_dailyAverageElectricCookingConsumption_kW = new ZeroAccumulator(true, 24.0, simDuration_h);
-	    acc_dailyAverageElectrolyserElectricityConsumption_kW = new ZeroAccumulator(true, 24.0, simDuration_h);
-	    acc_dailyAverageDistrictHeatingConsumption_kW = new ZeroAccumulator(true, 24.0, simDuration_h);
-	    
-	    acc_dailyAveragePVProduction_kW = new ZeroAccumulator(true, 24.0, simDuration_h);
-	    acc_dailyAverageWindProduction_kW = new ZeroAccumulator(true, 24.0, simDuration_h);
-	    acc_dailyAveragePTProduction_kW = new ZeroAccumulator(true, 24.0, simDuration_h);
-	    acc_dailyAverageV2GProduction_kW = new ZeroAccumulator(true, 24.0, simDuration_h);
-	    acc_dailyAverageBatteriesProduction_kW = new ZeroAccumulator(true, 24.0, simDuration_h);
-	    acc_dailyAverageCHPElectricityProduction_kW = new ZeroAccumulator(true, 24.0, simDuration_h);
-	
-	    ts_dailyAverageBatteriesStoredEnergy_MWh = new ZeroTimeSeries(24.0, simDuration_h);
-	    ts_dailyAverageBatteriesSOC_fr = new ZeroTimeSeries(24.0, simDuration_h);
+	    //========== ASSET FLOWS ==========//
+	    if (storesTotalAssetFlows) {
+	    	am_assetFlowsAccumulators_kW.createEmptyAccumulators( this.assetsMetaData.activeAssetFlows, true, timeStep_h, simDuration_h);
+	    	if (this.assetsMetaData.activeAssetFlows.contains(OL_AssetFlowCategories.batteriesChargingPower_kW)) {
+		    	ts_dailyAverageBatteriesStoredEnergy_MWh = new ZeroTimeSeries(timeStep_h, simDuration_h);
+	    	} else {
+	    		ts_dailyAverageBatteriesStoredEnergy_MWh = new ZeroTimeSeries(simDuration_h, simDuration_h);
+	    	}
+	    } else {
+	    	am_assetFlowsAccumulators_kW.createEmptyAccumulators( this.assetsMetaData.activeAssetFlows, true, 24.0, simDuration_h);
+	    	if (this.assetsMetaData.activeAssetFlows.contains(OL_AssetFlowCategories.batteriesChargingPower_kW)) {
+	    		ts_dailyAverageBatteriesStoredEnergy_MWh = new ZeroTimeSeries(24.0, simDuration_h);
+	    	} else {
+	    		ts_dailyAverageBatteriesStoredEnergy_MWh = new ZeroTimeSeries(simDuration_h, simDuration_h);	    		
+	    	}
+	    }	  
+
+	    //ts_dailyAverageBatteriesSOC_fr = new ZeroTimeSeries(24.0, simDuration_h);
 	    
 	    //========== SUMMER WEEK ACCUMULATORS ==========//
 	    am_summerWeekBalanceAccumulators_kW.createEmptyAccumulators(this.activeEnergyCarriers, true, timeStep_h, 168.0);
@@ -184,22 +154,8 @@ public void initializeAccumulators(double simDuration_h, double timeStep_h, Enum
 	    acc_summerWeekFeedinCapacity_kW = new ZeroAccumulator(true, timeStep_h, 168.0);
 	    acc_summerWeekDeliveryCapacity_kW = new ZeroAccumulator(true, timeStep_h, 168.0);
 	
-	    acc_summerWeekBaseloadElectricityConsumption_kW = new ZeroAccumulator(true, timeStep_h, 168.0);
-	    acc_summerWeekHeatPumpElectricityConsumption_kW = new ZeroAccumulator(true, timeStep_h, 168.0);
-	    acc_summerWeekElectricVehicleConsumption_kW = new ZeroAccumulator(true, timeStep_h, 168.0);
-	    acc_summerWeekBatteriesConsumption_kW = new ZeroAccumulator(true, timeStep_h, 168.0);
-	    acc_summerWeekElectricCookingConsumption_kW = new ZeroAccumulator(true, timeStep_h, 168.0);
-	    acc_summerWeekElectrolyserElectricityConsumption_kW = new ZeroAccumulator(true, timeStep_h, 168.0);
-	    acc_summerWeekDistrictHeatingConsumption_kW = new ZeroAccumulator(true, timeStep_h, 168.0);
-	
-	    acc_summerWeekPVProduction_kW = new ZeroAccumulator(true, timeStep_h, 168.0);
-	    acc_summerWeekWindProduction_kW = new ZeroAccumulator(true, timeStep_h, 168.0);
-	    acc_summerWeekPTProduction_kW = new ZeroAccumulator(true, timeStep_h, 168.0);
-	    acc_summerWeekV2GProduction_kW = new ZeroAccumulator(true, timeStep_h, 168.0);
-	    acc_summerWeekBatteriesProduction_kW = new ZeroAccumulator(true, timeStep_h, 168.0);
-	    acc_summerWeekCHPElectricityProduction_kW = new ZeroAccumulator(true, timeStep_h, 168.0);
-	
-	    ts_summerWeekBatteriesStoredEnergy_MWh = new ZeroTimeSeries(timeStep_h, 168.0);
+    	am_assetFlowsSummerWeek_kW.createEmptyAccumulators( this.assetsMetaData.activeAssetFlows, true, timeStep_h, 7*24);
+    	ts_summerWeekBatteriesStoredEnergy_MWh = new ZeroTimeSeries(timeStep_h, 168.0);
 	    ts_summerWeekBatteriesSOC_fr = new ZeroTimeSeries(timeStep_h, 168.0);
 	    
 	    //========== WINTER WEEK ACCUMULATORS ==========//
@@ -215,22 +171,8 @@ public void initializeAccumulators(double simDuration_h, double timeStep_h, Enum
 	
 	    acc_winterWeekFeedinCapacity_kW = new ZeroAccumulator(true, timeStep_h, 168.0);
 	    acc_winterWeekDeliveryCapacity_kW = new ZeroAccumulator(true, timeStep_h, 168.0);
-	
-	    acc_winterWeekBaseloadElectricityConsumption_kW = new ZeroAccumulator(true, timeStep_h, 168.0);
-	    acc_winterWeekHeatPumpElectricityConsumption_kW = new ZeroAccumulator(true, timeStep_h, 168.0);
-	    acc_winterWeekElectricVehicleConsumption_kW = new ZeroAccumulator(true, timeStep_h, 168.0);
-	    acc_winterWeekBatteriesConsumption_kW = new ZeroAccumulator(true, timeStep_h, 168.0);
-	    acc_winterWeekElectricCookingConsumption_kW = new ZeroAccumulator(true, timeStep_h, 168.0);
-	    acc_winterWeekElectrolyserElectricityConsumption_kW = new ZeroAccumulator(true, timeStep_h, 168.0);
-	    acc_winterWeekDistrictHeatingConsumption_kW = new ZeroAccumulator(true, timeStep_h, 168.0);
-	
-	    acc_winterWeekPVProduction_kW = new ZeroAccumulator(true, timeStep_h, 168.0);
-	    acc_winterWeekWindProduction_kW = new ZeroAccumulator(true, timeStep_h, 168.0);
-	    acc_winterWeekPTProduction_kW = new ZeroAccumulator(true, timeStep_h, 168.0);
-	    acc_winterWeekV2GProduction_kW = new ZeroAccumulator(true, timeStep_h, 168.0);
-	    acc_winterWeekBatteriesProduction_kW = new ZeroAccumulator(true, timeStep_h, 168.0);
-	    acc_winterWeekCHPElectricityProduction_kW = new ZeroAccumulator(true, timeStep_h, 168.0);
-	
+	    
+		am_assetFlowsWinterWeek_kW.createEmptyAccumulators( this.assetsMetaData.activeAssetFlows, true, timeStep_h, 7*24);
 	    ts_winterWeekBatteriesStoredEnergy_MWh = new ZeroTimeSeries(timeStep_h, 168.0);
 	    ts_winterWeekBatteriesSOC_fr = new ZeroTimeSeries(timeStep_h, 168.0);
 	    
@@ -275,23 +217,14 @@ public void resetAccumulators(double simDuration_h, double timeStep_h, EnumSet<O
     	acc_totalEnergyCurtailed_kW.reset();
     	acc_totalPrimaryEnergyProductionHeatpumps_kW.reset();
 
-    	acc_dailyAverageBaseloadElectricityConsumption_kW.reset();
-    	acc_dailyAverageHeatPumpElectricityConsumption_kW.reset();
-    	acc_dailyAverageElectricVehicleConsumption_kW.reset();
-    	acc_dailyAverageBatteriesConsumption_kW.reset();
-    	acc_dailyAverageElectricCookingConsumption_kW.reset();
-    	acc_dailyAverageElectrolyserElectricityConsumption_kW.reset();
-    	acc_dailyAverageDistrictHeatingConsumption_kW.reset();
-    	
-    	acc_dailyAveragePVProduction_kW.reset();
-    	acc_dailyAverageWindProduction_kW.reset();
-    	acc_dailyAveragePTProduction_kW.reset();
-    	acc_dailyAverageV2GProduction_kW.reset();
-    	acc_dailyAverageBatteriesProduction_kW.reset();
-    	acc_dailyAverageCHPElectricityProduction_kW.reset();
+    	if (storesTotalAssetFlows) {
+  	    	am_assetFlowsAccumulators_kW.createEmptyAccumulators( this.assetsMetaData.activeAssetFlows, true, timeStep_h, simDuration_h);
+  	    } else {
+  	    	am_assetFlowsAccumulators_kW.createEmptyAccumulators( this.assetsMetaData.activeAssetFlows, true, 24.0, simDuration_h);	
+  	    }
 
         ts_dailyAverageBatteriesStoredEnergy_MWh.reset();
-        ts_dailyAverageBatteriesSOC_fr.reset();
+        //ts_dailyAverageBatteriesSOC_fr.reset();
         
     	//Summerweek
     	am_summerWeekBalanceAccumulators_kW.createEmptyAccumulators(this.activeEnergyCarriers, true, timeStep_h, 24*7);
@@ -307,21 +240,7 @@ public void resetAccumulators(double simDuration_h, double timeStep_h, EnumSet<O
     	acc_summerWeekFeedinCapacity_kW.reset();
     	acc_summerWeekDeliveryCapacity_kW.reset();
 
-    	acc_summerWeekBaseloadElectricityConsumption_kW.reset();
-    	acc_summerWeekHeatPumpElectricityConsumption_kW.reset();
-    	acc_summerWeekElectricVehicleConsumption_kW.reset();
-    	acc_summerWeekBatteriesConsumption_kW.reset();
-    	acc_summerWeekElectricCookingConsumption_kW.reset();
-    	acc_summerWeekElectrolyserElectricityConsumption_kW.reset();
-    	acc_summerWeekDistrictHeatingConsumption_kW.reset();
-
-    	acc_summerWeekPVProduction_kW.reset();
-    	acc_summerWeekWindProduction_kW.reset();
-    	acc_summerWeekPTProduction_kW.reset();
-    	acc_summerWeekV2GProduction_kW.reset();
-    	acc_summerWeekBatteriesProduction_kW.reset();
-    	acc_summerWeekCHPElectricityProduction_kW.reset();
-
+    	am_assetFlowsSummerWeek_kW.createEmptyAccumulators(this.assetsMetaData.activeAssetFlows, true, timeStep_h, 24*7);
 	    ts_summerWeekBatteriesStoredEnergy_MWh.reset();
 	    ts_summerWeekBatteriesSOC_fr.reset();
 	    
@@ -338,23 +257,9 @@ public void resetAccumulators(double simDuration_h, double timeStep_h, EnumSet<O
 
     	acc_winterWeekFeedinCapacity_kW.reset();
     	acc_winterWeekDeliveryCapacity_kW.reset();
+    	am_assetFlowsWinterWeek_kW.createEmptyAccumulators(this.assetsMetaData.activeAssetFlows, true, timeStep_h, 24*7);    	
 
-    	acc_winterWeekBaseloadElectricityConsumption_kW.reset();
-    	acc_winterWeekHeatPumpElectricityConsumption_kW.reset();
-    	acc_winterWeekElectricVehicleConsumption_kW.reset();
-    	acc_winterWeekBatteriesConsumption_kW.reset();
-    	acc_winterWeekElectricCookingConsumption_kW.reset();
-    	acc_winterWeekElectrolyserElectricityConsumption_kW.reset();
-    	acc_winterWeekDistrictHeatingConsumption_kW.reset();
-
-    	acc_winterWeekPVProduction_kW.reset();
-    	acc_winterWeekWindProduction_kW.reset();
-    	acc_winterWeekPTProduction_kW.reset();
-    	acc_winterWeekV2GProduction_kW.reset();
-    	acc_winterWeekBatteriesProduction_kW.reset();
-    	acc_winterWeekCHPElectricityProduction_kW.reset();
-    	
-	    ts_winterWeekBatteriesStoredEnergy_MWh.reset();
+    	ts_winterWeekBatteriesStoredEnergy_MWh.reset();
 	    ts_winterWeekBatteriesSOC_fr.reset();
 	    
     	// Daytime 
@@ -394,21 +299,11 @@ public J_RapidRunData getClone() {
         clone.am_dailyAverageProductionAccumulators_kW=this.am_dailyAverageProductionAccumulators_kW.getClone();
         clone.acc_dailyAverageFinalEnergyConsumption_kW=this.acc_dailyAverageFinalEnergyConsumption_kW.getClone();
     	clone.acc_dailyAverageEnergyProduction_kW=this.acc_dailyAverageEnergyProduction_kW.getClone();
-    	clone.acc_dailyAverageBaseloadElectricityConsumption_kW=this.acc_dailyAverageBaseloadElectricityConsumption_kW.getClone();
-        clone.acc_dailyAverageHeatPumpElectricityConsumption_kW=this.acc_dailyAverageHeatPumpElectricityConsumption_kW.getClone();
-        clone.acc_dailyAverageElectricVehicleConsumption_kW=this.acc_dailyAverageElectricVehicleConsumption_kW.getClone();
-        clone.acc_dailyAverageBatteriesConsumption_kW=this.acc_dailyAverageBatteriesConsumption_kW.getClone();
-        clone.acc_dailyAverageElectricCookingConsumption_kW=this.acc_dailyAverageElectricCookingConsumption_kW.getClone();
-        clone.acc_dailyAverageElectrolyserElectricityConsumption_kW=this.acc_dailyAverageElectrolyserElectricityConsumption_kW.getClone();
-        clone.acc_dailyAverageDistrictHeatingConsumption_kW=this.acc_dailyAverageDistrictHeatingConsumption_kW.getClone();
-        clone.acc_dailyAveragePVProduction_kW=this.acc_dailyAveragePVProduction_kW.getClone();
-        clone.acc_dailyAverageWindProduction_kW=this.acc_dailyAverageWindProduction_kW.getClone();
-        clone.acc_dailyAveragePTProduction_kW=this.acc_dailyAveragePTProduction_kW.getClone();
-        clone.acc_dailyAverageV2GProduction_kW=this.acc_dailyAverageV2GProduction_kW.getClone();
-        clone.acc_dailyAverageBatteriesProduction_kW=this.acc_dailyAverageBatteriesProduction_kW.getClone();
-        clone.acc_dailyAverageCHPElectricityProduction_kW=this.acc_dailyAverageCHPElectricityProduction_kW.getClone();
-        clone.ts_dailyAverageBatteriesStoredEnergy_MWh=this.ts_dailyAverageBatteriesStoredEnergy_MWh.getClone();
-        clone.ts_dailyAverageBatteriesSOC_fr=this.ts_dailyAverageBatteriesSOC_fr.getClone();
+    	
+    	clone.am_assetFlowsAccumulators_kW = this.am_assetFlowsAccumulators_kW.getClone();
+  	    clone.ts_dailyAverageBatteriesStoredEnergy_MWh=this.ts_dailyAverageBatteriesStoredEnergy_MWh.getClone();
+        //clone.ts_dailyAverageBatteriesSOC_fr=this.ts_dailyAverageBatteriesSOC_fr.getClone();
+        
         ////Summer week
         clone.am_summerWeekBalanceAccumulators_kW=this.am_summerWeekBalanceAccumulators_kW.getClone();
         clone.acc_summerWeekDeliveryCapacity_kW=this.acc_summerWeekDeliveryCapacity_kW.getClone();
@@ -418,19 +313,8 @@ public J_RapidRunData getClone() {
         clone.acc_summerWeekEnergyProduction_kW=this.acc_summerWeekEnergyProduction_kW.getClone();
         clone.am_summerWeekConsumptionAccumulators_kW=this.am_summerWeekConsumptionAccumulators_kW.getClone();
         clone.am_summerWeekProductionAccumulators_kW=this.am_summerWeekProductionAccumulators_kW.getClone();
-        clone.acc_summerWeekBaseloadElectricityConsumption_kW=this.acc_summerWeekBaseloadElectricityConsumption_kW.getClone();
-        clone.acc_summerWeekHeatPumpElectricityConsumption_kW=this.acc_summerWeekHeatPumpElectricityConsumption_kW.getClone();
-        clone.acc_summerWeekElectricVehicleConsumption_kW=this.acc_summerWeekElectricVehicleConsumption_kW.getClone();
-        clone.acc_summerWeekBatteriesConsumption_kW=this.acc_summerWeekBatteriesConsumption_kW.getClone();
-        clone.acc_summerWeekElectricCookingConsumption_kW=this.acc_summerWeekElectricCookingConsumption_kW.getClone();
-        clone.acc_summerWeekElectrolyserElectricityConsumption_kW=this.acc_summerWeekElectrolyserElectricityConsumption_kW.getClone();
-        clone.acc_summerWeekDistrictHeatingConsumption_kW=this.acc_summerWeekDistrictHeatingConsumption_kW.getClone();
-        clone.acc_summerWeekPVProduction_kW=this.acc_summerWeekPVProduction_kW.getClone();
-        clone.acc_summerWeekWindProduction_kW=this.acc_summerWeekWindProduction_kW.getClone();
-        clone.acc_summerWeekPTProduction_kW=this.acc_summerWeekPTProduction_kW.getClone();
-        clone.acc_summerWeekV2GProduction_kW=this.acc_summerWeekV2GProduction_kW.getClone();
-        clone.acc_summerWeekBatteriesProduction_kW=this.acc_summerWeekBatteriesProduction_kW.getClone();
-        clone.acc_summerWeekCHPElectricityProduction_kW=this.acc_summerWeekCHPElectricityProduction_kW.getClone();
+        
+        clone.am_assetFlowsSummerWeek_kW = this.am_assetFlowsSummerWeek_kW.getClone();
         clone.acc_summerWeekPrimaryEnergyProductionHeatpumps_kW=this.acc_summerWeekPrimaryEnergyProductionHeatpumps_kW.getClone();
         clone.ts_summerWeekBatteriesStoredEnergy_MWh=this.ts_summerWeekBatteriesStoredEnergy_MWh.getClone();
         clone.ts_summerWeekBatteriesSOC_fr=this.ts_summerWeekBatteriesSOC_fr.getClone();
@@ -443,19 +327,8 @@ public J_RapidRunData getClone() {
         clone.acc_winterWeekEnergyCurtailed_kW = this.acc_winterWeekEnergyCurtailed_kW.getClone();
         clone.am_winterWeekConsumptionAccumulators_kW = this.am_winterWeekConsumptionAccumulators_kW.getClone();
         clone.am_winterWeekProductionAccumulators_kW = this.am_winterWeekProductionAccumulators_kW.getClone();  
-        clone.acc_winterWeekBaseloadElectricityConsumption_kW = this.acc_winterWeekBaseloadElectricityConsumption_kW.getClone();
-        clone.acc_winterWeekHeatPumpElectricityConsumption_kW = this.acc_winterWeekHeatPumpElectricityConsumption_kW.getClone();
-        clone.acc_winterWeekElectricVehicleConsumption_kW = this.acc_winterWeekElectricVehicleConsumption_kW.getClone();
-        clone.acc_winterWeekBatteriesConsumption_kW = this.acc_winterWeekBatteriesConsumption_kW.getClone();
-        clone.acc_winterWeekElectricCookingConsumption_kW = this.acc_winterWeekElectricCookingConsumption_kW.getClone();
-        clone.acc_winterWeekElectrolyserElectricityConsumption_kW = this.acc_winterWeekElectrolyserElectricityConsumption_kW.getClone();
-        clone.acc_winterWeekDistrictHeatingConsumption_kW = this.acc_winterWeekDistrictHeatingConsumption_kW.getClone();
-        clone.acc_winterWeekPVProduction_kW = this.acc_winterWeekPVProduction_kW.getClone();
-        clone.acc_winterWeekWindProduction_kW = this.acc_winterWeekWindProduction_kW.getClone();
-        clone.acc_winterWeekPTProduction_kW = this.acc_winterWeekPTProduction_kW.getClone();
-        clone.acc_winterWeekV2GProduction_kW = this.acc_winterWeekV2GProduction_kW.getClone();
-        clone.acc_winterWeekBatteriesProduction_kW = this.acc_winterWeekBatteriesProduction_kW.getClone();
-        clone.acc_winterWeekCHPElectricityProduction_kW = this.acc_winterWeekCHPElectricityProduction_kW.getClone();
+
+        clone.am_assetFlowsWinterWeek_kW = this.am_assetFlowsWinterWeek_kW.getClone();
         clone.acc_winterWeekPrimaryEnergyProductionHeatpumps_kW = this.acc_winterWeekPrimaryEnergyProductionHeatpumps_kW.getClone();
         clone.ts_winterWeekBatteriesStoredEnergy_MWh = this.ts_winterWeekBatteriesStoredEnergy_MWh.getClone();
         clone.ts_winterWeekBatteriesSOC_fr = this.ts_winterWeekBatteriesSOC_fr.getClone();
@@ -482,12 +355,20 @@ public J_RapidRunData getClone() {
 
     }
     
-    public void addTimeStep(J_FlowsMap fm_currentBalanceFlows_kW, J_FlowsMap fm_currentConsumptionFlows_kW, J_FlowsMap fm_currentProductionFlows_kW, double v_currentPrimaryEnergyProduction_kW, double v_currentFinalEnergyConsumption_kW, double v_currentPrimaryEnergyProductionHeatpumps_kW, double v_currentEnergyCurtailed_kW, J_AssetFlows assetFlows, EnergyModel energyModel) {
+    public void addTimeStep(J_FlowsMap fm_currentBalanceFlows_kW, J_FlowsMap fm_currentConsumptionFlows_kW, J_FlowsMap fm_currentProductionFlows_kW, J_ValueMap fm_currentAssetFlows_kW, double v_currentPrimaryEnergyProduction_kW, double v_currentFinalEnergyConsumption_kW, double v_currentPrimaryEnergyProductionHeatpumps_kW, double v_currentEnergyCurtailed_kW, double currentStoredEnergyBatteries_MWh, EnergyModel energyModel) {
+    	//J_AssetFlows assetFlows = new J_AssetFlows();
+    	
+    	//EnergyCarrier import/exports
     	for (OL_EnergyCarriers EC : activeEnergyCarriers) {
     		this.am_totalBalanceAccumulators_kW.get(EC).addStep(  fm_currentBalanceFlows_kW.get(EC) );
     	}
-
-    	// Daytime totals. Use overal-total minus daytime total to get nighttime totals.
+    	
+    	//AssetFlows
+	    for (OL_AssetFlowCategories AC : assetsMetaData.activeAssetFlows) {
+	    	this.am_assetFlowsAccumulators_kW.get(AC).addStep ( fm_currentAssetFlows_kW.get(AC) );
+	    }
+    	
+	    // Daytime totals. Use overal-total minus daytime total to get nighttime totals.
     	if(energyModel.b_isDaytime) { 
     		
     		for (OL_EnergyCarriers EC : activeEnergyCarriers) {
@@ -549,24 +430,14 @@ public void addTimeStep(J_FlowsMap fm_currentBalanceFlows_kW, J_FlowsMap fm_curr
     		acc_summerWeekDeliveryCapacity_kW.addStep( connectionMetaData.physicalCapacity_kW );
     		acc_summerWeekFeedinCapacity_kW.addStep( -connectionMetaData.physicalCapacity_kW );
     		
-    		acc_summerWeekBaseloadElectricityConsumption_kW.addStep( assetFlows.fixedConsumptionElectric_kW );
-    		acc_summerWeekHeatPumpElectricityConsumption_kW.addStep( assetFlows.heatPumpElectricityConsumption_kW );
-    		
-    		acc_summerWeekElectricVehicleConsumption_kW.addStep( max(0,assetFlows.evChargingPowerElectric_kW) );
-    		acc_summerWeekBatteriesConsumption_kW.addStep( assetFlows.currentBatteriesConsumption_kW );
-    		acc_summerWeekElectricCookingConsumption_kW.addStep( assetFlows.electricHobConsumption_kW );
-    		acc_summerWeekElectrolyserElectricityConsumption_kW.addStep( max(0, assetFlows.hydrogenElectricityConsumption_kW) );
-    		acc_summerWeekDistrictHeatingConsumption_kW.addStep( assetFlows.districtHeatDelivery_kW );
-    		acc_summerWeekPVProduction_kW.addStep( assetFlows.pvProductionElectric_kW );
-    		acc_summerWeekWindProduction_kW.addStep( assetFlows.windProductionElectric_kW );
-    		acc_summerWeekPTProduction_kW.addStep( assetFlows.ptProductionHeat_kW );	
-    		acc_summerWeekV2GProduction_kW.addStep( max(0, -assetFlows.evChargingPowerElectric_kW) );
-    		acc_summerWeekBatteriesProduction_kW.addStep( assetFlows.currentBatteriesProduction_kW );
-    		acc_summerWeekCHPElectricityProduction_kW.addStep( assetFlows.CHPProductionElectric_kW );
-    		ts_summerWeekBatteriesStoredEnergy_MWh.addStep(assetFlows.currentStoredEnergyBatteries_MWh);
-    		
+    		//AssetFlows
+    	    for (OL_AssetFlowCategories AC : assetsMetaData.activeAssetFlows) {
+    	    	this.am_assetFlowsSummerWeek_kW.get(AC).addStep ( fm_currentAssetFlows_kW.get(AC) );
+    	    }
+    	
+    		ts_summerWeekBatteriesStoredEnergy_MWh.addStep(currentStoredEnergyBatteries_MWh);
     		if(assetsMetaData.totalInstalledBatteryStorageCapacity_MWh > 0){
-    			ts_summerWeekBatteriesSOC_fr.addStep(assetFlows.currentStoredEnergyBatteries_MWh/assetsMetaData.totalInstalledBatteryStorageCapacity_MWh);	
+    			ts_summerWeekBatteriesSOC_fr.addStep(currentStoredEnergyBatteries_MWh/assetsMetaData.totalInstalledBatteryStorageCapacity_MWh);	
     		}
     		else{
     			ts_summerWeekBatteriesSOC_fr.addStep(0);	
@@ -593,25 +464,16 @@ public void addTimeStep(J_FlowsMap fm_currentBalanceFlows_kW, J_FlowsMap fm_curr
 
     		acc_winterWeekDeliveryCapacity_kW.addStep( connectionMetaData.physicalCapacity_kW );
     		acc_winterWeekFeedinCapacity_kW.addStep( -connectionMetaData.physicalCapacity_kW );
-
-    		acc_winterWeekBaseloadElectricityConsumption_kW.addStep( assetFlows.fixedConsumptionElectric_kW );
-    		acc_winterWeekHeatPumpElectricityConsumption_kW.addStep( assetFlows.heatPumpElectricityConsumption_kW );
-
-    		acc_winterWeekElectricVehicleConsumption_kW.addStep( max(0,assetFlows.evChargingPowerElectric_kW) );
-    		acc_winterWeekBatteriesConsumption_kW.addStep( assetFlows.currentBatteriesConsumption_kW );
-    		acc_winterWeekElectricCookingConsumption_kW.addStep( assetFlows.electricHobConsumption_kW );
-    		acc_winterWeekElectrolyserElectricityConsumption_kW.addStep( max(0, assetFlows.hydrogenElectricityConsumption_kW) );
-    		acc_winterWeekDistrictHeatingConsumption_kW.addStep( assetFlows.districtHeatDelivery_kW );
-    		acc_winterWeekPVProduction_kW.addStep( assetFlows.pvProductionElectric_kW );
-    		acc_winterWeekWindProduction_kW.addStep( assetFlows.windProductionElectric_kW );
-    		acc_winterWeekPTProduction_kW.addStep( assetFlows.ptProductionHeat_kW );	
-    		acc_winterWeekV2GProduction_kW.addStep( max(0, -assetFlows.evChargingPowerElectric_kW) );
-    		acc_winterWeekBatteriesProduction_kW.addStep( assetFlows.currentBatteriesProduction_kW );
-    		acc_winterWeekCHPElectricityProduction_kW.addStep( assetFlows.CHPProductionElectric_kW );
-    		ts_winterWeekBatteriesStoredEnergy_MWh.addStep(assetFlows.currentStoredEnergyBatteries_MWh);
+    		//AssetFlows
+    	    for (OL_AssetFlowCategories AC : assetsMetaData.activeAssetFlows) {
+    	    	this.am_assetFlowsWinterWeek_kW.get(AC).addStep ( fm_currentAssetFlows_kW.get(AC)  );
+    	    }
+    	 		
+    		
+    		ts_winterWeekBatteriesStoredEnergy_MWh.addStep(currentStoredEnergyBatteries_MWh);
 
     		if(assetsMetaData.totalInstalledBatteryStorageCapacity_MWh > 0){
-    			ts_winterWeekBatteriesSOC_fr.addStep(assetFlows.currentStoredEnergyBatteries_MWh/assetsMetaData.totalInstalledBatteryStorageCapacity_MWh);	
+    			ts_winterWeekBatteriesSOC_fr.addStep(currentStoredEnergyBatteries_MWh/assetsMetaData.totalInstalledBatteryStorageCapacity_MWh);	
     		}
     		else{
     			ts_winterWeekBatteriesSOC_fr.addStep(0);	
@@ -629,27 +491,15 @@ public void addTimeStep(J_FlowsMap fm_currentBalanceFlows_kW, J_FlowsMap fm_curr
     	acc_dailyAverageFinalEnergyConsumption_kW.addStep(v_currentFinalEnergyConsumption_kW);
     	acc_totalEnergyCurtailed_kW.addStep(v_currentEnergyCurtailed_kW);
     	acc_totalPrimaryEnergyProductionHeatpumps_kW.addStep(v_currentPrimaryEnergyProductionHeatpumps_kW);
-    	acc_dailyAverageBaseloadElectricityConsumption_kW.addStep( assetFlows.fixedConsumptionElectric_kW );
-    	acc_dailyAverageHeatPumpElectricityConsumption_kW.addStep( assetFlows.heatPumpElectricityConsumption_kW );
-    	acc_dailyAverageElectricVehicleConsumption_kW.addStep( max(0,assetFlows.evChargingPowerElectric_kW) );
-    	acc_dailyAverageBatteriesConsumption_kW.addStep( assetFlows.currentBatteriesConsumption_kW );
-    	acc_dailyAverageElectricCookingConsumption_kW.addStep( assetFlows.electricHobConsumption_kW );
-    	acc_dailyAverageElectrolyserElectricityConsumption_kW.addStep( max(0, assetFlows.hydrogenElectricityConsumption_kW) );
-    	acc_dailyAverageDistrictHeatingConsumption_kW.addStep( assetFlows.districtHeatDelivery_kW );
-    	acc_dailyAveragePVProduction_kW.addStep( assetFlows.pvProductionElectric_kW );
-    	acc_dailyAverageWindProduction_kW.addStep( assetFlows.windProductionElectric_kW );
-    	acc_dailyAveragePTProduction_kW.addStep( assetFlows.ptProductionHeat_kW );
-    	acc_dailyAverageV2GProduction_kW.addStep( max(0, -assetFlows.evChargingPowerElectric_kW) );
-    	acc_dailyAverageBatteriesProduction_kW.addStep( assetFlows.currentBatteriesProduction_kW );
-    	acc_dailyAverageCHPElectricityProduction_kW.addStep( assetFlows.CHPProductionElectric_kW );
-    	ts_dailyAverageBatteriesStoredEnergy_MWh.addStep(assetFlows.currentStoredEnergyBatteries_MWh);
     	
-    	if(assetsMetaData.totalInstalledBatteryStorageCapacity_MWh > 0){
-    		ts_dailyAverageBatteriesSOC_fr.addStep(assetFlows.currentStoredEnergyBatteries_MWh/assetsMetaData.totalInstalledBatteryStorageCapacity_MWh);	
+   		ts_dailyAverageBatteriesStoredEnergy_MWh.addStep(currentStoredEnergyBatteries_MWh);
+    	
+   		/*if(assetsMetaData.totalInstalledBatteryStorageCapacity_MWh > 0){
+    		ts_dailyAverageBatteriesSOC_fr.addStep(currentStoredEnergyBatteries_MWh/assetsMetaData.totalInstalledBatteryStorageCapacity_MWh);	
     	}
     	else{
     		ts_dailyAverageBatteriesSOC_fr.addStep(0);	
-    	}	
+    	}*/
     }
     
     public J_LoadDurationCurves getLoadDurationCurves(EnergyModel energyModel) {
@@ -687,13 +537,64 @@ public double getPeakDelivery_kW() {
     }
     
     public double getPeakFeedin_kW() {
-    	double peakFeedin_kW = 0.0;
+    	double peakFeedin_kW = -am_totalBalanceAccumulators_kW.get(OL_EnergyCarriers.ELECTRICITY).getTimeSeries_kW()[0];
     	for (double electricityBalance_kW : am_totalBalanceAccumulators_kW.get(OL_EnergyCarriers.ELECTRICITY).getTimeSeries_kW()) {
     		peakFeedin_kW = max(peakFeedin_kW, -electricityBalance_kW);
     	}
     	return peakFeedin_kW;
     }
     
+    public Double getPeakDeliveryTime_h() {
+    	double[] elecBalance_kW = am_totalBalanceAccumulators_kW.get(OL_EnergyCarriers.ELECTRICITY).getTimeSeries_kW();
+
+    	Integer maxIndex = 0; // index with peak import
+    	for (int i = 1; i < elecBalance_kW.length; i++) {
+    	    if (elecBalance_kW[i] > elecBalance_kW[maxIndex]) {
+    	        maxIndex = i;
+    	    }
+    	}
+    	
+    	return maxIndex*timeStep_h;
+    }
+    
+    public double getPeakDeliveryWeekStart_h() {
+    	double peakTime_h = getPeakDeliveryTime_h();
+    	return getWeekStart_h(peakTime_h);
+    }
+ 
+    public double getPeakFeedinWeekStart_h() {
+    	double peakTime_h = getPeakFeedinTime_h();
+    	return getWeekStart_h(peakTime_h);
+    }
+    
+    public double getWeekStart_h(double peakTime_h) {
+    	double duration_h = am_totalBalanceAccumulators_kW.get(OL_EnergyCarriers.ELECTRICITY).getDuration();
+    	return min(duration_h-7*24,max(0,peakTime_h - 3.5*24)); // return start of week hour, capped between 0 and simDuration_h - 7*24
+    }
+    
+    public Double getPeakFeedinTime_h() {
+    	double[] elecBalance_kW = am_totalBalanceAccumulators_kW.get(OL_EnergyCarriers.ELECTRICITY).getTimeSeries_kW();
+
+    	Integer minIndex = 0; // index with peak export
+    	for (int i = 1; i < elecBalance_kW.length; i++) {
+    	    if (elecBalance_kW[i] < elecBalance_kW[minIndex]) {
+    	        minIndex = i;
+    	    }
+    	}
+    	
+    	return minIndex*timeStep_h;
+    }
+    
+    public ZeroTimeSeries getBatteriesSOCts_fr() {
+    	double[] array = this.ts_dailyAverageBatteriesStoredEnergy_MWh.getTimeSeries();
+    	double factor_fr = 1/assetsMetaData.totalInstalledBatteryStorageCapacity_MWh;
+    	ZeroTimeSeries ts = new ZeroTimeSeries(ts_dailyAverageBatteriesStoredEnergy_MWh.getSignalResolution_h(), ts_dailyAverageBatteriesStoredEnergy_MWh.getDuration());
+    	for (int i=0; i<array.length; i++) {
+    		ts.addStep(array[i]*factor_fr);
+    	}
+    	return ts;
+    }
+    
     public Pair<Double, Double> getFlexPotential() {
     	// Check if capacity is known
     	Double possibleGrowthFactor_fr;
@@ -784,11 +685,19 @@ public double getTotalPrimaryEnergyProductionHeatpumps_MWh() {
         return acc_totalPrimaryEnergyProductionHeatpumps_kW.getIntegral_MWh(); 
     }
     public double getTotalDistrictHeatingConsumption_MWh() {
-    	return acc_dailyAverageDistrictHeatingConsumption_kW.getIntegral_MWh();
+    	if (assetsMetaData.activeAssetFlows.contains(OL_AssetFlowCategories.districtHeatDelivery_kW)) {
+    		return am_assetFlowsAccumulators_kW.get(OL_AssetFlowCategories.districtHeatDelivery_kW).getIntegral_MWh();
+    	} else {
+    		return 0.0;
+    	}
     }
     
     public double getTotalBatteryCycles() { 
-    	return acc_dailyAverageBatteriesConsumption_kW.getIntegral_MWh()/this.assetsMetaData.totalInstalledBatteryStorageCapacity_MWh;
+    	if (assetsMetaData.activeAssetFlows.contains(OL_AssetFlowCategories.batteriesChargingPower_kW)) {
+    		return am_assetFlowsAccumulators_kW.get(OL_AssetFlowCategories.batteriesChargingPower_kW).getIntegral_MWh()/this.assetsMetaData.totalInstalledBatteryStorageCapacity_MWh;
+    	} else {
+    		return 0.0;
+    	}
     }
 
 // Summerweek Getters
@@ -838,7 +747,12 @@ public double getSummerWeekPrimaryEnergyProductionHeatpumps_MWh() {
     }
     
     public double getSummerWeekBatteryCycles() { 
-    	return acc_summerWeekBatteriesConsumption_kW.getIntegral_MWh()/this.assetsMetaData.totalInstalledBatteryStorageCapacity_MWh;
+    	if (am_assetFlowsSummerWeek_kW.keySet().contains(OL_AssetFlowCategories.batteriesChargingPower_kW)) {
+    		return am_assetFlowsSummerWeek_kW.get(OL_AssetFlowCategories.batteriesChargingPower_kW).getIntegral_MWh()/this.assetsMetaData.totalInstalledBatteryStorageCapacity_MWh;
+    	} else {
+    		return 0.0;
+    	}
+    	//return acc_summerWeekBatteriesConsumption_kW.getIntegral_MWh()/this.assetsMetaData.totalInstalledBatteryStorageCapacity_MWh;
     }
     
 // Winterweek Getters
@@ -887,7 +801,12 @@ public double getWinterWeekPrimaryEnergyProductionHeatpumps_MWh() {
     }
     
     public double getWinterWeekBatteryCycles() { 
-    	return acc_winterWeekBatteriesConsumption_kW.getIntegral_MWh()/this.assetsMetaData.totalInstalledBatteryStorageCapacity_MWh;
+    	if (am_assetFlowsWinterWeek_kW.keySet().contains(OL_AssetFlowCategories.batteriesChargingPower_kW)) {
+    		return am_assetFlowsWinterWeek_kW.get(OL_AssetFlowCategories.batteriesChargingPower_kW).getIntegral_MWh()/this.assetsMetaData.totalInstalledBatteryStorageCapacity_MWh;
+    	} else {
+    		return 0.0;
+    	}
+    	//return acc_winterWeekBatteriesConsumption_kW.getIntegral_MWh()/this.assetsMetaData.totalInstalledBatteryStorageCapacity_MWh;
     }
     
 // Daytime getters    
diff --git a/_alp/Classes/Class.J_ValueMap.java b/_alp/Classes/Class.J_ValueMap.java
new file mode 100644
index 00000000..a5735c3e
--- /dev/null
+++ b/_alp/Classes/Class.J_ValueMap.java
@@ -0,0 +1,109 @@
+	/**
+ * J_ValueMap
+ */	
+import zeroPackage.ZeroMath;
+import java.util.EnumSet;
+import com.fasterxml.jackson.annotation.JsonIgnoreType;
+@JsonIgnoreType
+public class J_ValueMap <E extends Enum<E>> implements Serializable {
+	
+	//
+    private final EnumSet<E> enumSet;
+    //private final Class<E> enumClass;
+	private double[] valuesArray;// = new double[OL_AssetFlowCategories.values().length]; // Use array with size of all possible energyCarriers; more than strictly needed but memory footprint is negligable anyway.;
+	  
+    /**
+     * Default constructor
+     */
+    public J_ValueMap(Class<E> enumClass) {
+        //this.enumClass = enumClass;
+        this.enumSet = EnumSet.noneOf(enumClass);
+        this.valuesArray = new double[enumClass.getEnumConstants().length];
+    }
+    
+    public final double get(E key) {
+		return valuesArray[key.ordinal()];
+	}
+    	
+
+	public final void put(E key, double value) {
+		valuesArray[key.ordinal()] = value;
+		enumSet.add(key);
+	}
+	
+	public final void clear() {
+		enumSet.clear();
+		Arrays.fill(valuesArray, 0.0);
+		/*for(int i=0; i<valuesArray.length; i++) {
+			valuesArray[i]=0.0;
+		}*/
+	}
+      
+    //public J_AssetFlowsMap addToExistingFlows( J_AssetFlowsMap f) {
+    public final J_ValueMap addFlows( J_ValueMap f) {
+    	int len = valuesArray.length;
+		for(int i=0; i<len; i++) {
+			//this.valuesArray[i]=this.valuesArray[i]+f.valuesArray[i];
+			this.valuesArray[i]+=f.valuesArray[i];
+		}
+		this.enumSet.addAll(f.enumSet); 
+    	return this;
+    }
+    
+    public final J_ValueMap addFlow( E key, double value) {
+    	enumSet.add(key);
+    	this.valuesArray[key.ordinal()]+=value;
+    	//double currentValue = this.get(key);
+    	//this.put(key, currentValue + value);
+    	return this;
+    }
+    
+    public final J_ValueMap cloneMap(J_ValueMap flowMap) {
+    	//this.clear();
+    	//this.addFlows(flowMap);
+    	
+    	// Custom 'addflows' version that doesn't add, just 'copies'. Might be faster?
+    	int len = valuesArray.length;
+		for(int i=0; i<len; i++) {
+			this.valuesArray[i]=flowMap.valuesArray[i];
+		}
+		
+		//this.flowCategories = flowMap.flowCategories.clone(); // This or first clear list and then addAll? Which is faster?
+		this.enumSet.clear();
+		this.enumSet.addAll(flowMap.enumSet); 
+    	return this;    	
+    }
+    
+    public double totalSum() {
+    	return ZeroMath.arraySum(valuesArray);
+    }
+    
+    public final EnumSet<E> keySet(){
+    	return enumSet;
+    }
+        
+    public String toString() {
+        if (this.enumSet.size() == 0) {
+            return "{}";        	
+        }
+        StringBuilder sb = new StringBuilder();
+        sb.append('{');
+        for (E key : this.enumSet) {
+        	double value = this.get(key);
+            sb.append(key);
+            sb.append(" = ");
+            sb.append(value);
+            sb.append("\n ");
+        }
+        sb.delete(sb.length()-2, sb.length());
+        sb.append('}');
+        return sb.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.ZeroAccumulator.java b/_alp/Classes/Class.ZeroAccumulator.java
index de22a39b..bfab9550 100644
--- a/_alp/Classes/Class.ZeroAccumulator.java
+++ b/_alp/Classes/Class.ZeroAccumulator.java
@@ -110,25 +110,66 @@ public void addStep(double power_kW) {
     }
 
     public double getIntegral_kWh() { // For getting total energy when addSteps was called with power as value
+    	return this.getIntegral_kWh(0, this.duration_h);
+    }
+    public double getIntegral_kWh(double startTime_h, double endTime_h) { // For getting total energy when addSteps was called with power as value
         if (this.hasTimeSeries) {
-        	this.totalEnergy_kWh = ZeroMath.arraySum(this.timeSeries) * this.signalResolution_h;
+        	if (startTime_h < 0 || endTime_h > duration_h || startTime_h > endTime_h) {
+        		throw new IllegalArgumentException("Impossible to get integral of this interval, start or endtime out of range");
+        	}
+        	double[] interval = Arrays.copyOfRange(this.timeSeries, roundToInt(startTime_h/signalResolution_h), roundToInt(endTime_h/signalResolution_h));
+        	return ZeroMath.arraySum(interval) * this.signalResolution_h;
+        } else if (startTime_h == 0 && endTime_h == duration_h) {
+        	return this.totalEnergy_kWh;
+        } else {
+        	throw new IllegalArgumentException("Impossible to get integral of this interval because no timeseries data is available");
         }
-    	return this.totalEnergy_kWh;
     }
     
     public double getIntegralPos_kWh() { // For getting total energy when addSteps was called with power as value
+    	return this.getIntegralPos_kWh(0, this.duration_h);
+    }
+    public double getIntegralPos_kWh(double startTime_h, double endTime_h) { // For getting total energy when addSteps was called with power as value
         if (this.hasTimeSeries) {
-        	this.totalPositiveEnergy_kWh = ZeroMath.arraySumPos(this.timeSeries) * this.signalResolution_h;
+        	if (startTime_h < 0 || endTime_h > duration_h || startTime_h > endTime_h) {
+        		throw new IllegalArgumentException("Impossible to get integral of this interval, start or endtime out of range");
+        	}
+        	double[] interval = Arrays.copyOfRange(this.timeSeries, roundToInt(startTime_h/signalResolution_h), roundToInt(endTime_h/signalResolution_h));
+        	return ZeroMath.arraySumPos(interval) * this.signalResolution_h;
+        } else if (startTime_h == 0 && endTime_h == duration_h) {
+        	return this.totalPositiveEnergy_kWh;
+        } else {
+        	throw new IllegalArgumentException("Impossible to get integral of this interval because no timeseries data is available");
         }
-        return this.totalPositiveEnergy_kWh;
     }
     
-
     public double getIntegralNeg_kWh() { // For getting total energy when addSteps was called with power as value
+    	return this.getIntegralNeg_kWh(0, this.duration_h);
+    }
+    public double getIntegralNeg_kWh(double startTime_h, double endTime_h) { // For getting total energy when addSteps was called with power as value
         if (this.hasTimeSeries) {
-        	this.totalNegativeEnergy_kWh = ZeroMath.arraySumNeg(this.timeSeries) * this.signalResolution_h;
-        }
-        return this.totalNegativeEnergy_kWh;
+        	if (startTime_h < 0 || endTime_h > duration_h || startTime_h > endTime_h) {
+        		throw new IllegalArgumentException("Impossible to get integral of this interval, start or endtime out of range");
+        	}
+        	double[] interval = Arrays.copyOfRange(this.timeSeries, roundToInt(startTime_h/signalResolution_h), roundToInt(endTime_h/signalResolution_h));
+        	return ZeroMath.arraySumNeg(interval) * this.signalResolution_h;
+        } else if (startTime_h == 0 && endTime_h == duration_h) {
+        	return this.totalNegativeEnergy_kWh;
+        } else {
+         	throw new IllegalArgumentException("Impossible to get integral of this interval because no timeseries data is available");
+        }	
+    }
+    
+    public double getIntegral_MWh(double startTime_h, double endTime_h) { // For getting total energy when addSteps was called with power as value
+    	return this.getIntegral_kWh(startTime_h, endTime_h)/1000;
+    }
+    
+    public double getIntegralPos_MWh(double startTime_h, double endTime_h) { // For getting total energy when addSteps was called with power as value
+    	return this.getIntegralPos_kWh(startTime_h, endTime_h)/1000;
+    }
+
+    public double getIntegralNeg_MWh(double startTime_h, double endTime_h) { // For getting total energy when addSteps was called with power as value
+    	return this.getIntegralNeg_kWh(startTime_h, endTime_h)/1000;
     }
     
     public double getIntegral_MWh() { // For getting total energy when addSteps was called with power as value
@@ -143,7 +184,6 @@ public double getIntegralNeg_MWh() { // For getting total energy when addSteps w
     	return this.getIntegralNeg_kWh()/1000;
     }
     
-    
     public double[] getTimeSeries_kW() {
         if (!hasTimeSeries) { // Fill timeseries with constant value
             double[] timeSeriesTemp = new double[arraySize];
@@ -187,6 +227,9 @@ public double getSignalResolution_h() {
     	return this.signalResolution_h;
     }
 
+    public double getDuration() {
+    	return duration_h;
+    }
     public ZeroAccumulator add(ZeroAccumulator acc) {
         if ((this.hasTimeSeries && acc.hasTimeSeries) && (this.duration_h == acc.duration_h)
                 && (this.signalResolution_h == acc.signalResolution_h)) {
@@ -237,7 +280,7 @@ public DataSet getDataSet(double startTime_h) {
     	if (this.hasTimeSeries) {
 			DataSet ds = new DataSet(timeSeries.length);
 			for (int i = 0; i < timeSeries.length; i++) {
-				ds.add(startTime_h + i * this.signalResolution_h, this.timeSeries[i] );
+				ds.add(startTime_h + i * this.signalResolution_h, roundToDecimal(this.timeSeries[i],3) );
 			}
 			return ds;
     	} else {
@@ -245,6 +288,30 @@ public DataSet getDataSet(double startTime_h) {
     	}
     }
 	
+    public DataSet getDataSet(double startTime_h, double accStartTime_h, double accEndTime_h) {
+    	
+    	double dataSetDuration_h = accEndTime_h - accStartTime_h;
+    	if (dataSetDuration_h > duration_h) {    		
+    		throw new RuntimeException("Too long dataSet interval requested from ZeroAccumulator.getDataSet().");    	
+    	}
+    	int startIdx = roundToInt(accStartTime_h / signalResolution_h);
+    	int endIdx = roundToInt(accEndTime_h / signalResolution_h);
+    	startIdx = max(0,startIdx);
+    	//endIdx = max(endIdx, roundToInt(dataSetDuration_h/signalResolution_h));
+    	endIdx = min(endIdx, arraySize);
+    	//startIdx = min(startIdx, endIdx - roundToInt(dataSetDuration_h/signalResolution_h));
+    	
+    	if (this.hasTimeSeries) {
+			DataSet ds = new DataSet(endIdx-startIdx);
+			for (int i = startIdx; i < endIdx; i++) {
+				ds.add(startTime_h + i * this.signalResolution_h, roundToDecimal(this.timeSeries[i],3) );
+			}
+			return ds;
+    	} else {
+    		throw new RuntimeException("Impossible to create DataSet from accumulator without timeSeries.");    		
+    	}
+    }
+    
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
diff --git a/_alp/Classes/Class.ZeroTimeSeries.java b/_alp/Classes/Class.ZeroTimeSeries.java
index 16376ad8..3e747524 100644
--- a/_alp/Classes/Class.ZeroTimeSeries.java
+++ b/_alp/Classes/Class.ZeroTimeSeries.java
@@ -124,6 +124,10 @@ public double getSignalResolution_h() {
 	    	return this.signalResolution_h;
 	    }
 
+	    public double getDuration() {
+	    	return duration_h;
+	    }
+	    
 	    public ZeroTimeSeries add(ZeroTimeSeries zts) {
 	        if ((this.duration_h == zts.duration_h) && (this.signalResolution_h == zts.signalResolution_h)) {
 	            for (int i = 0; i < this.timeSeries.length; i++) {
@@ -155,6 +159,27 @@ public DataSet getDataSet(double startTime_h) {
 			return ds;
 	    }
 	    
+	    public DataSet getDataSet(double startTime_h, double accStartTime_h, double accEndTime_h) {
+	    	
+	    	double dataSetDuration_h = accEndTime_h - accStartTime_h;
+	    	if (dataSetDuration_h > duration_h) {    		
+	    		throw new RuntimeException("Too long dataSet interval requested from ZeroAccumulator.getDataSet().");    	
+	    	}
+	    	int startIdx = roundToInt(accStartTime_h / signalResolution_h);
+	    	int endIdx = roundToInt(accEndTime_h / signalResolution_h);
+	    	startIdx = max(0,startIdx);
+	    	//endIdx = max(endIdx, roundToInt(dataSetDuration_h/signalResolution_h));
+	    	endIdx = min(endIdx, roundToInt(duration_h / signalResolution_h));
+	    	//startIdx = min(startIdx, endIdx - roundToInt(dataSetDuration_h/signalResolution_h));
+	 
+			DataSet ds = new DataSet(endIdx-startIdx);
+			for (int i = startIdx; i < endIdx; i++) {
+				ds.add(startTime_h + i * this.signalResolution_h, roundToDecimal(this.timeSeries[i],3) );
+			}
+			return ds;
+    	
+	    }
+	    
 	    public int getLength() {
 	    	return timeSeries.length;
 	    }