diff --git a/Zero_engine.alpx b/Zero_engine.alpx
index 90810d25..4b5ff01c 100644
--- a/Zero_engine.alpx
+++ b/Zero_engine.alpx
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <AnyLogicWorkspace splitVersion="1"
                    WorkspaceVersion="1.9"
-                   AnyLogicVersion="8.9.7.202512121156"
-                   AlpVersion="8.9.7">
+                   AnyLogicVersion="8.9.9.202606170507"
+                   AlpVersion="8.9.9">
 	<Model>
 		<Id>1658477103134</Id>
 		<Name><![CDATA[Zero_engine]]></Name>
@@ -1438,6 +1438,11 @@ LARGE_CONNECTION (grootverbruik, > 3x80)
 				<Name><![CDATA[BackupGeneratorManagement]]></Name>
 				<ParentId>1772100318398</ParentId>
 			</Folder>
+			<Folder>
+				<Id>1781186973946</Id>
+				<Name><![CDATA[FlexProfileManagement]]></Name>
+				<ParentId>1772100318398</ParentId>
+			</Folder>
 		</Folders>
 		<ActiveObjectClasses/>
 		<DifferentialEquationsMethod>EULER</DifferentialEquationsMethod>
@@ -1447,7 +1452,6 @@ LARGE_CONNECTION (grootverbruik, > 3x80)
 		<FixedTimeStep>1.0</FixedTimeStep>
 		<RelativeAccuracy>1.0</RelativeAccuracy>
 		<TimeAccuracy>0.1</TimeAccuracy>
-		<InspectionWindowColorTheme>DEFAULT</InspectionWindowColorTheme>
 		<Frame>
 			<Id>1658477089997</Id>
 			<Width>1920</Width>
@@ -2229,6 +2233,35 @@ LARGE_CONNECTION (grootverbruik, > 3x80)
 				<Name><![CDATA[J_BackupGeneratorManagementExternalSetpoint]]></Name>
 				<Folder>1776078970513</Folder>
 			</JavaClass>
+			<JavaClass>
+				<Id>1781184397108</Id>
+				<Name><![CDATA[J_EAFlexProfile]]></Name>
+				<Folder>1752677832758</Folder>
+			</JavaClass>
+			<JavaClass>
+				<Id>1781187002718</Id>
+				<Name><![CDATA[I_FlexProfileManagement]]></Name>
+				<Folder>1781186973946</Folder>
+			</JavaClass>
+			<JavaClass>
+				<Id>1781269241936</Id>
+				<Name><![CDATA[J_FlexProfileManagementHeatprofileHeatpump]]></Name>
+				<Folder>1781186973946</Folder>
+			</JavaClass>
+			<JavaClass>
+				<Id>1781523461253</Id>
+				<Name><![CDATA[LUXMath]]></Name>
+			</JavaClass>
+			<JavaClass>
+				<Id>1781622084102</Id>
+				<Name><![CDATA[J_FlexProfileManagementDefault]]></Name>
+				<Folder>1781186973946</Folder>
+			</JavaClass>
+			<JavaClass>
+				<Id>1781796838749</Id>
+				<Name><![CDATA[I_ProfileAsset]]></Name>
+				<Folder>1752677832758</Folder>
+			</JavaClass>
 		</JavaClasses>
 		<RequiredLibraryReference>
 			<LibraryName>com.anylogic.libraries.modules.markup_descriptors</LibraryName>
@@ -2251,6 +2284,7 @@ LARGE_CONNECTION (grootverbruik, > 3x80)
 		<Uuid>404652e6-561a-404c-aab2-ab7415f40ef5</Uuid>
 		<Uuid>6fd6cd57-6dfe-4fc6-be0b-c74065351957</Uuid>
 		<Uuid>3325dc48-3ad4-41e3-836f-dfd0e98fe1ed</Uuid>
+		<Uuid>bb27038a-0f3a-48bb-b235-4a44066a14aa</Uuid>
 		<Uuid>3f69ef3d-706e-41a6-8af0-11658c5eef68</Uuid>
 		<Uuid>3f6fe405-e047-4304-91d6-6eee206d1106</Uuid>
 		<Uuid>820d2b51-5b4a-48e7-b0b6-e46418e3c0f2</Uuid>
@@ -2306,5 +2340,9 @@ LARGE_CONNECTION (grootverbruik, > 3x80)
 		<Uuid>1737c8c6-b526-4dd8-589e-ee4e205b06f4</Uuid>
 		<Uuid>6a43bef6-8b70-4253-a828-82c3ab399655</Uuid>
 		<Uuid>0a27038a-0f3a-48bb-b235-4a44066a1402</Uuid>
+		<Uuid>0a9ec2c3-5e18-4c0a-a183-fd86d9d9a08b</Uuid>
+		<Uuid>2216cdd0-177c-5678-9e88-dd8b95313334</Uuid>
+		<Uuid>2216cdd0-177c-5678-9e88-dd8b95313335</Uuid>
+		<Uuid>5b8ebeed-6b58-4c3a-8d5f-0958b1a90ce6</Uuid>
 	</ConvertersApplied>
 </AnyLogicWorkspace>
diff --git a/_alp/Agents/A_SubTenant/AOC.A_SubTenant.xml b/_alp/Agents/A_SubTenant/AOC.A_SubTenant.xml
index 11daccec..788c0150 100644
--- a/_alp/Agents/A_SubTenant/AOC.A_SubTenant.xml
+++ b/_alp/Agents/A_SubTenant/AOC.A_SubTenant.xml
@@ -39,7 +39,12 @@
 	<MakeDefaultViewArea>true</MakeDefaultViewArea>
 	<SceneGridColor/>
 	<SceneBackgroundColor>-4144960</SceneBackgroundColor>
-	<SceneSkybox>null</SceneSkybox>
+	<EnvironmentResourceRef/>
+	<EnvironmentType>NONE</EnvironmentType>
+	<EnvironmentRotationX>0</EnvironmentRotationX>
+	<EnvironmentRotationY>0</EnvironmentRotationY>
+	<EnvironmentRotationZ>0</EnvironmentRotationZ>
+	<EnvironmentIntensity>1</EnvironmentIntensity>
 	<AgentProperties>
 		<EnvironmentDefinesInitialLocation>true</EnvironmentDefinesInitialLocation>
 		<RotateAnimationTowardsMovement>true</RotateAnimationTowardsMovement>
diff --git a/_alp/Agents/Actor/AOC.Actor.xml b/_alp/Agents/Actor/AOC.Actor.xml
index 76f464e0..df7fc326 100644
--- a/_alp/Agents/Actor/AOC.Actor.xml
+++ b/_alp/Agents/Actor/AOC.Actor.xml
@@ -21,7 +21,12 @@
 	<MakeDefaultViewArea>true</MakeDefaultViewArea>
 	<SceneGridColor/>
 	<SceneBackgroundColor>-4144960</SceneBackgroundColor>
-	<SceneSkybox>null</SceneSkybox>
+	<EnvironmentResourceRef/>
+	<EnvironmentType>NONE</EnvironmentType>
+	<EnvironmentRotationX>0</EnvironmentRotationX>
+	<EnvironmentRotationY>0</EnvironmentRotationY>
+	<EnvironmentRotationZ>0</EnvironmentRotationZ>
+	<EnvironmentIntensity>1</EnvironmentIntensity>
 	<AgentProperties>
 		<EnvironmentDefinesInitialLocation>true</EnvironmentDefinesInitialLocation>
 		<RotateAnimationTowardsMovement>true</RotateAnimationTowardsMovement>
diff --git a/_alp/Agents/ConnectionOwner/AOC.ConnectionOwner.xml b/_alp/Agents/ConnectionOwner/AOC.ConnectionOwner.xml
index bbf40b28..b4af0906 100644
--- a/_alp/Agents/ConnectionOwner/AOC.ConnectionOwner.xml
+++ b/_alp/Agents/ConnectionOwner/AOC.ConnectionOwner.xml
@@ -43,7 +43,12 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 	<MakeDefaultViewArea>true</MakeDefaultViewArea>
 	<SceneGridColor/>
 	<SceneBackgroundColor>-4144960</SceneBackgroundColor>
-	<SceneSkybox>null</SceneSkybox>
+	<EnvironmentResourceRef/>
+	<EnvironmentType>NONE</EnvironmentType>
+	<EnvironmentRotationX>0</EnvironmentRotationX>
+	<EnvironmentRotationY>0</EnvironmentRotationY>
+	<EnvironmentRotationZ>0</EnvironmentRotationZ>
+	<EnvironmentIntensity>1</EnvironmentIntensity>
 	<AgentProperties>
 		<EnvironmentDefinesInitialLocation>true</EnvironmentDefinesInitialLocation>
 		<RotateAnimationTowardsMovement>true</RotateAnimationTowardsMovement>
diff --git a/_alp/Agents/EnergyCoop/AOC.EnergyCoop.xml b/_alp/Agents/EnergyCoop/AOC.EnergyCoop.xml
index 22edbfb0..2ae786fa 100644
--- a/_alp/Agents/EnergyCoop/AOC.EnergyCoop.xml
+++ b/_alp/Agents/EnergyCoop/AOC.EnergyCoop.xml
@@ -54,7 +54,12 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 	<MakeDefaultViewArea>true</MakeDefaultViewArea>
 	<SceneGridColor/>
 	<SceneBackgroundColor>-4144960</SceneBackgroundColor>
-	<SceneSkybox>null</SceneSkybox>
+	<EnvironmentResourceRef/>
+	<EnvironmentType>NONE</EnvironmentType>
+	<EnvironmentRotationX>0</EnvironmentRotationX>
+	<EnvironmentRotationY>0</EnvironmentRotationY>
+	<EnvironmentRotationZ>0</EnvironmentRotationZ>
+	<EnvironmentIntensity>1</EnvironmentIntensity>
 	<AgentProperties>
 		<EnvironmentDefinesInitialLocation>true</EnvironmentDefinesInitialLocation>
 		<RotateAnimationTowardsMovement>true</RotateAnimationTowardsMovement>
diff --git a/_alp/Agents/EnergyDataViewer/AOC.EnergyDataViewer.xml b/_alp/Agents/EnergyDataViewer/AOC.EnergyDataViewer.xml
index 525e1ac7..3265cb38 100644
--- a/_alp/Agents/EnergyDataViewer/AOC.EnergyDataViewer.xml
+++ b/_alp/Agents/EnergyDataViewer/AOC.EnergyDataViewer.xml
@@ -19,7 +19,12 @@
 	<MakeDefaultViewArea>true</MakeDefaultViewArea>
 	<SceneGridColor/>
 	<SceneBackgroundColor>-4144960</SceneBackgroundColor>
-	<SceneSkybox>null</SceneSkybox>
+	<EnvironmentResourceRef/>
+	<EnvironmentType>NONE</EnvironmentType>
+	<EnvironmentRotationX>0</EnvironmentRotationX>
+	<EnvironmentRotationY>0</EnvironmentRotationY>
+	<EnvironmentRotationZ>0</EnvironmentRotationZ>
+	<EnvironmentIntensity>1</EnvironmentIntensity>
 	<AgentProperties>
 		<EnvironmentDefinesInitialLocation>true</EnvironmentDefinesInitialLocation>
 		<RotateAnimationTowardsMovement>true</RotateAnimationTowardsMovement>
diff --git a/_alp/Agents/EnergyModel/AOC.EnergyModel.xml b/_alp/Agents/EnergyModel/AOC.EnergyModel.xml
index 625ec08f..9a63138c 100644
--- a/_alp/Agents/EnergyModel/AOC.EnergyModel.xml
+++ b/_alp/Agents/EnergyModel/AOC.EnergyModel.xml
@@ -68,7 +68,12 @@ import com.anylogic.cloud.util.DateUtils;]]></Import>
 	<MakeDefaultViewArea>true</MakeDefaultViewArea>
 	<SceneGridColor/>
 	<SceneBackgroundColor>-4144960</SceneBackgroundColor>
-	<SceneSkybox>null</SceneSkybox>
+	<EnvironmentResourceRef/>
+	<EnvironmentType>NONE</EnvironmentType>
+	<EnvironmentRotationX>0</EnvironmentRotationX>
+	<EnvironmentRotationY>0</EnvironmentRotationY>
+	<EnvironmentRotationZ>0</EnvironmentRotationZ>
+	<EnvironmentIntensity>1</EnvironmentIntensity>
 	<AgentProperties>
 		<EnvironmentDefinesInitialLocation>true</EnvironmentDefinesInitialLocation>
 		<RotateAnimationTowardsMovement>true</RotateAnimationTowardsMovement>
diff --git a/_alp/Agents/EnergyModel/Code/Functions.java b/_alp/Agents/EnergyModel/Code/Functions.java
index 26946658..05f86828 100644
--- a/_alp/Agents/EnergyModel/Code/Functions.java
+++ b/_alp/Agents/EnergyModel/Code/Functions.java
@@ -674,7 +674,7 @@ ArrayList<GridConnection> f_getPausedGridConnections()
 
 J_ProfilePointer f_findProfile(String assetName)
 {/*ALCODESTART::1727193246625*/
-J_ProfilePointer profilePointer = findFirst(c_profiles, p -> p.name.equals(assetName));
+J_ProfilePointer profilePointer = findFirst(c_profiles, p -> p.getName().equals(assetName));
 //traceln("J_EAConsumption with name %s found profile asset: %s", assetName, profilePointer);
 if (profilePointer == null) {
 	traceln("No profilePointer with name %s found", assetName);
diff --git a/_alp/Agents/EnergyModel/EmbeddedObjects.xml b/_alp/Agents/EnergyModel/EmbeddedObjects.xml
index 64b1ef39..4b4d1a2c 100644
--- a/_alp/Agents/EnergyModel/EmbeddedObjects.xml
+++ b/_alp/Agents/EnergyModel/EmbeddedObjects.xml
@@ -2073,12 +2073,6 @@
 			<Parameter>
 				<Name><![CDATA[p_parentNodeElectric]]></Name>
 			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_isChargingCentre]]></Name>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_gisregion]]></Name>
-			</Parameter>
 			<Parameter>
 				<Name><![CDATA[v_isActive]]></Name>
 			</Parameter>
diff --git a/_alp/Agents/EnergySupplier/AOC.EnergySupplier.xml b/_alp/Agents/EnergySupplier/AOC.EnergySupplier.xml
index 252c82c5..8753ce4c 100644
--- a/_alp/Agents/EnergySupplier/AOC.EnergySupplier.xml
+++ b/_alp/Agents/EnergySupplier/AOC.EnergySupplier.xml
@@ -37,7 +37,12 @@
 	<MakeDefaultViewArea>true</MakeDefaultViewArea>
 	<SceneGridColor/>
 	<SceneBackgroundColor>-4144960</SceneBackgroundColor>
-	<SceneSkybox>null</SceneSkybox>
+	<EnvironmentResourceRef/>
+	<EnvironmentType>NONE</EnvironmentType>
+	<EnvironmentRotationX>0</EnvironmentRotationX>
+	<EnvironmentRotationY>0</EnvironmentRotationY>
+	<EnvironmentRotationZ>0</EnvironmentRotationZ>
+	<EnvironmentIntensity>1</EnvironmentIntensity>
 	<AgentProperties>
 		<EnvironmentDefinesInitialLocation>true</EnvironmentDefinesInitialLocation>
 		<RotateAnimationTowardsMovement>true</RotateAnimationTowardsMovement>
diff --git a/_alp/Agents/GCDistrictHeating/AOC.GCDistrictHeating.xml b/_alp/Agents/GCDistrictHeating/AOC.GCDistrictHeating.xml
index c7bbebfb..5526d41e 100644
--- a/_alp/Agents/GCDistrictHeating/AOC.GCDistrictHeating.xml
+++ b/_alp/Agents/GCDistrictHeating/AOC.GCDistrictHeating.xml
@@ -98,7 +98,12 @@
 	<MakeDefaultViewArea>true</MakeDefaultViewArea>
 	<SceneGridColor/>
 	<SceneBackgroundColor>-4144960</SceneBackgroundColor>
-	<SceneSkybox>null</SceneSkybox>
+	<EnvironmentResourceRef/>
+	<EnvironmentType>NONE</EnvironmentType>
+	<EnvironmentRotationX>0</EnvironmentRotationX>
+	<EnvironmentRotationY>0</EnvironmentRotationY>
+	<EnvironmentRotationZ>0</EnvironmentRotationZ>
+	<EnvironmentIntensity>1</EnvironmentIntensity>
 	<AgentProperties>
 		<EnvironmentDefinesInitialLocation>true</EnvironmentDefinesInitialLocation>
 		<RotateAnimationTowardsMovement>true</RotateAnimationTowardsMovement>
diff --git a/_alp/Agents/GCEnergyConversion/AOC.GCEnergyConversion.xml b/_alp/Agents/GCEnergyConversion/AOC.GCEnergyConversion.xml
index 0d6288b0..255547e3 100644
--- a/_alp/Agents/GCEnergyConversion/AOC.GCEnergyConversion.xml
+++ b/_alp/Agents/GCEnergyConversion/AOC.GCEnergyConversion.xml
@@ -98,7 +98,12 @@
 	<MakeDefaultViewArea>true</MakeDefaultViewArea>
 	<SceneGridColor/>
 	<SceneBackgroundColor>-4144960</SceneBackgroundColor>
-	<SceneSkybox>null</SceneSkybox>
+	<EnvironmentResourceRef/>
+	<EnvironmentType>NONE</EnvironmentType>
+	<EnvironmentRotationX>0</EnvironmentRotationX>
+	<EnvironmentRotationY>0</EnvironmentRotationY>
+	<EnvironmentRotationZ>0</EnvironmentRotationZ>
+	<EnvironmentIntensity>1</EnvironmentIntensity>
 	<AgentProperties>
 		<EnvironmentDefinesInitialLocation>true</EnvironmentDefinesInitialLocation>
 		<RotateAnimationTowardsMovement>true</RotateAnimationTowardsMovement>
diff --git a/_alp/Agents/GCEnergyProduction/AOC.GCEnergyProduction.xml b/_alp/Agents/GCEnergyProduction/AOC.GCEnergyProduction.xml
index 757153b4..5a06ccd0 100644
--- a/_alp/Agents/GCEnergyProduction/AOC.GCEnergyProduction.xml
+++ b/_alp/Agents/GCEnergyProduction/AOC.GCEnergyProduction.xml
@@ -97,7 +97,12 @@
 	<MakeDefaultViewArea>true</MakeDefaultViewArea>
 	<SceneGridColor/>
 	<SceneBackgroundColor>-4144960</SceneBackgroundColor>
-	<SceneSkybox>null</SceneSkybox>
+	<EnvironmentResourceRef/>
+	<EnvironmentType>NONE</EnvironmentType>
+	<EnvironmentRotationX>0</EnvironmentRotationX>
+	<EnvironmentRotationY>0</EnvironmentRotationY>
+	<EnvironmentRotationZ>0</EnvironmentRotationZ>
+	<EnvironmentIntensity>1</EnvironmentIntensity>
 	<AgentProperties>
 		<EnvironmentDefinesInitialLocation>true</EnvironmentDefinesInitialLocation>
 		<RotateAnimationTowardsMovement>true</RotateAnimationTowardsMovement>
diff --git a/_alp/Agents/GCGridBattery/AOC.GCGridBattery.xml b/_alp/Agents/GCGridBattery/AOC.GCGridBattery.xml
index bae78a8e..8fab4b72 100644
--- a/_alp/Agents/GCGridBattery/AOC.GCGridBattery.xml
+++ b/_alp/Agents/GCGridBattery/AOC.GCGridBattery.xml
@@ -97,7 +97,12 @@
 	<MakeDefaultViewArea>true</MakeDefaultViewArea>
 	<SceneGridColor/>
 	<SceneBackgroundColor>-4144960</SceneBackgroundColor>
-	<SceneSkybox>null</SceneSkybox>
+	<EnvironmentResourceRef/>
+	<EnvironmentType>NONE</EnvironmentType>
+	<EnvironmentRotationX>0</EnvironmentRotationX>
+	<EnvironmentRotationY>0</EnvironmentRotationY>
+	<EnvironmentRotationZ>0</EnvironmentRotationZ>
+	<EnvironmentIntensity>1</EnvironmentIntensity>
 	<AgentProperties>
 		<EnvironmentDefinesInitialLocation>true</EnvironmentDefinesInitialLocation>
 		<RotateAnimationTowardsMovement>true</RotateAnimationTowardsMovement>
diff --git a/_alp/Agents/GCHouse/AOC.GCHouse.xml b/_alp/Agents/GCHouse/AOC.GCHouse.xml
index aad8015f..6216e76f 100644
--- a/_alp/Agents/GCHouse/AOC.GCHouse.xml
+++ b/_alp/Agents/GCHouse/AOC.GCHouse.xml
@@ -98,7 +98,12 @@
 	<MakeDefaultViewArea>true</MakeDefaultViewArea>
 	<SceneGridColor/>
 	<SceneBackgroundColor>-4144960</SceneBackgroundColor>
-	<SceneSkybox>null</SceneSkybox>
+	<EnvironmentResourceRef/>
+	<EnvironmentType>NONE</EnvironmentType>
+	<EnvironmentRotationX>0</EnvironmentRotationX>
+	<EnvironmentRotationY>0</EnvironmentRotationY>
+	<EnvironmentRotationZ>0</EnvironmentRotationZ>
+	<EnvironmentIntensity>1</EnvironmentIntensity>
 	<AgentProperties>
 		<EnvironmentDefinesInitialLocation>true</EnvironmentDefinesInitialLocation>
 		<RotateAnimationTowardsMovement>true</RotateAnimationTowardsMovement>
diff --git a/_alp/Agents/GCIndustry/AOC.GCIndustry.xml b/_alp/Agents/GCIndustry/AOC.GCIndustry.xml
index dfe2e4d8..2aaf7765 100644
--- a/_alp/Agents/GCIndustry/AOC.GCIndustry.xml
+++ b/_alp/Agents/GCIndustry/AOC.GCIndustry.xml
@@ -99,7 +99,12 @@
 	<MakeDefaultViewArea>true</MakeDefaultViewArea>
 	<SceneGridColor/>
 	<SceneBackgroundColor>-4144960</SceneBackgroundColor>
-	<SceneSkybox>null</SceneSkybox>
+	<EnvironmentResourceRef/>
+	<EnvironmentType>NONE</EnvironmentType>
+	<EnvironmentRotationX>0</EnvironmentRotationX>
+	<EnvironmentRotationY>0</EnvironmentRotationY>
+	<EnvironmentRotationZ>0</EnvironmentRotationZ>
+	<EnvironmentIntensity>1</EnvironmentIntensity>
 	<AgentProperties>
 		<EnvironmentDefinesInitialLocation>true</EnvironmentDefinesInitialLocation>
 		<RotateAnimationTowardsMovement>true</RotateAnimationTowardsMovement>
diff --git a/_alp/Agents/GCNeighborhood/AOC.GCNeighborhood.xml b/_alp/Agents/GCNeighborhood/AOC.GCNeighborhood.xml
index 0e816fe0..0d64b386 100644
--- a/_alp/Agents/GCNeighborhood/AOC.GCNeighborhood.xml
+++ b/_alp/Agents/GCNeighborhood/AOC.GCNeighborhood.xml
@@ -98,7 +98,12 @@
 	<MakeDefaultViewArea>true</MakeDefaultViewArea>
 	<SceneGridColor/>
 	<SceneBackgroundColor>-4144960</SceneBackgroundColor>
-	<SceneSkybox>null</SceneSkybox>
+	<EnvironmentResourceRef/>
+	<EnvironmentType>NONE</EnvironmentType>
+	<EnvironmentRotationX>0</EnvironmentRotationX>
+	<EnvironmentRotationY>0</EnvironmentRotationY>
+	<EnvironmentRotationZ>0</EnvironmentRotationZ>
+	<EnvironmentIntensity>1</EnvironmentIntensity>
 	<AgentProperties>
 		<EnvironmentDefinesInitialLocation>true</EnvironmentDefinesInitialLocation>
 		<RotateAnimationTowardsMovement>true</RotateAnimationTowardsMovement>
diff --git a/_alp/Agents/GCNeighborhood/Code/Functions.xml b/_alp/Agents/GCNeighborhood/Code/Functions.xml
index c85b6bd7..47cbfcf3 100644
--- a/_alp/Agents/GCNeighborhood/Code/Functions.xml
+++ b/_alp/Agents/GCNeighborhood/Code/Functions.xml
@@ -5,8 +5,8 @@
 		<ReturnType>double</ReturnType>
 		<Id>1734716016619</Id>
 		<Name><![CDATA[f_resetSpecificGCStates_override]]></Name>
-		<X>1330</X>
-		<Y>480</Y>
+		<X>980</X>
+		<Y>730</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
diff --git a/_alp/Agents/GCNeighborhood/Variables.xml b/_alp/Agents/GCNeighborhood/Variables.xml
index faa6f99f..6100b733 100644
--- a/_alp/Agents/GCNeighborhood/Variables.xml
+++ b/_alp/Agents/GCNeighborhood/Variables.xml
@@ -111,8 +111,8 @@
 	<Variable Class="PlainVariable">
 		<Id>1734716021367</Id>
 		<Name><![CDATA[v_batteryMoneyMade_euro]]></Name>
-		<X>1330</X>
-		<Y>500</Y>
+		<X>2020</X>
+		<Y>280</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -133,8 +133,8 @@
 	<Variable Class="PlainVariable">
 		<Id>1752589060012</Id>
 		<Name><![CDATA[v_currentLoadLowPassed_kW]]></Name>
-		<X>1330</X>
-		<Y>530</Y>
+		<X>2020</X>
+		<Y>310</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -330,8 +330,8 @@
 	<Variable Class="Parameter">
 		<Id>1736933490243</Id>
 		<Name><![CDATA[p_chpAsset]]></Name>
-		<X>600</X>
-		<Y>720</Y>
+		<X>650</X>
+		<Y>910</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
diff --git a/_alp/Agents/GCPublicCharger/AOC.GCPublicCharger.xml b/_alp/Agents/GCPublicCharger/AOC.GCPublicCharger.xml
index c5614648..dd336fc6 100644
--- a/_alp/Agents/GCPublicCharger/AOC.GCPublicCharger.xml
+++ b/_alp/Agents/GCPublicCharger/AOC.GCPublicCharger.xml
@@ -97,7 +97,12 @@
 	<MakeDefaultViewArea>true</MakeDefaultViewArea>
 	<SceneGridColor/>
 	<SceneBackgroundColor>-4144960</SceneBackgroundColor>
-	<SceneSkybox>null</SceneSkybox>
+	<EnvironmentResourceRef/>
+	<EnvironmentType>NONE</EnvironmentType>
+	<EnvironmentRotationX>0</EnvironmentRotationX>
+	<EnvironmentRotationY>0</EnvironmentRotationY>
+	<EnvironmentRotationZ>0</EnvironmentRotationZ>
+	<EnvironmentIntensity>1</EnvironmentIntensity>
 	<AgentProperties>
 		<EnvironmentDefinesInitialLocation>true</EnvironmentDefinesInitialLocation>
 		<RotateAnimationTowardsMovement>true</RotateAnimationTowardsMovement>
@@ -172,7 +177,6 @@
 	</ScaleRuler>
 	<CurrentLevel>1717956409513</CurrentLevel>
 	<ConnectionsId>1717956409507</ConnectionsId>
-	<Variables xmlns:al="http://anylogic.com"/>
 	<AgentLinks>
 		<AgentLink>
 			<Id>1717956409507</Id>
@@ -234,7 +238,6 @@
 			<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
 			<Z>0</Z>
 			<LevelVisibility>DIM_NON_CURRENT</LevelVisibility>
-			<Presentation xmlns:al="http://anylogic.com"/>
 		</Level>
 	</Presentation>
 </ActiveObjectClass>
diff --git a/_alp/Agents/GCPublicCharger/Levels/Level.level.xml b/_alp/Agents/GCPublicCharger/Levels/Level.level.xml
deleted file mode 100644
index 5fdd5138..00000000
--- a/_alp/Agents/GCPublicCharger/Levels/Level.level.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Presentation>
-	<Rectangle>
-		<Id>1718020159680</Id>
-		<Name><![CDATA[rectangle4]]></Name>
-		<X>1600</X>
-		<Y>100</Y>
-		<Label>
-			<X>10</X>
-			<Y>10</Y>
-		</Label>
-		<PublicFlag>true</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>false</ShowLabel>
-		<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
-		<EmbeddedIcon>false</EmbeddedIcon>
-		<Z>0</Z>
-		<ZHeight>10</ZHeight>
-		<LineWidth>3</LineWidth>
-		<LineColor>-65536</LineColor>
-		<LineMaterial>null</LineMaterial>
-		<LineStyle>SOLID</LineStyle>
-		<Width>300</Width>
-		<Height>160</Height>
-		<Rotation>0.0</Rotation>
-		<FillColor>-1</FillColor>
-		<FillMaterial>null</FillMaterial>
-	</Rectangle>
-	<Text>
-		<Id>1718020176410</Id>
-		<Name><![CDATA[txt_chargingStationFunctions]]></Name>
-		<X>1620</X>
-		<Y>120</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[Charging Station Parameters]]></Text>
-		<Font>
-			<Name><![CDATA[SansSerif]]></Name>
-			<Size>14</Size>
-			<Style>1</Style>
-		</Font>
-		<Alignment>LEFT</Alignment>
-	</Text>
-</Presentation>
diff --git a/_alp/Agents/GCPublicCharger/Variables.xml b/_alp/Agents/GCPublicCharger/Variables.xml
deleted file mode 100644
index 3f867328..00000000
--- a/_alp/Agents/GCPublicCharger/Variables.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Variables>
-	<Variable Class="Parameter">
-		<Id>1717959948784</Id>
-		<Name><![CDATA[p_gisregion]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>50</X>
-		<Y>510</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
-			<Type><![CDATA[GISRegion]]></Type>
-			<UnitType>NONE</UnitType>
-			<SdArray>false</SdArray>
-			<ParameterEditor>
-				<Id>1717959948782</Id>
-				<EditorContolType>TEXT_BOX</EditorContolType>
-				<MinSliderValue>0</MinSliderValue>
-				<MaxSliderValue>100</MaxSliderValue>
-				<DelimeterType>NO_DELIMETER</DelimeterType>
-			</ParameterEditor>
-		</Properties>
-	</Variable>
-	<Variable Class="Parameter">
-		<Id>1750335661857</Id>
-		<Name><![CDATA[p_isChargingCentre]]></Name>
-		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>1630</X>
-		<Y>150</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
-			<Type><![CDATA[boolean]]></Type>
-			<UnitType>NONE</UnitType>
-			<SdArray>false</SdArray>
-			<ParameterEditor>
-				<Id>1750335661855</Id>
-				<EditorContolType>CHECK_BOX</EditorContolType>
-				<MinSliderValue>0</MinSliderValue>
-				<MaxSliderValue>100</MaxSliderValue>
-				<DelimeterType>NO_DELIMETER</DelimeterType>
-			</ParameterEditor>
-		</Properties>
-	</Variable>
-</Variables>
diff --git a/_alp/Agents/GCUtility/AOC.GCUtility.xml b/_alp/Agents/GCUtility/AOC.GCUtility.xml
index d006945e..ba6750fd 100644
--- a/_alp/Agents/GCUtility/AOC.GCUtility.xml
+++ b/_alp/Agents/GCUtility/AOC.GCUtility.xml
@@ -97,7 +97,12 @@
 	<MakeDefaultViewArea>true</MakeDefaultViewArea>
 	<SceneGridColor/>
 	<SceneBackgroundColor>-4144960</SceneBackgroundColor>
-	<SceneSkybox>null</SceneSkybox>
+	<EnvironmentResourceRef/>
+	<EnvironmentType>NONE</EnvironmentType>
+	<EnvironmentRotationX>0</EnvironmentRotationX>
+	<EnvironmentRotationY>0</EnvironmentRotationY>
+	<EnvironmentRotationZ>0</EnvironmentRotationZ>
+	<EnvironmentIntensity>1</EnvironmentIntensity>
 	<AgentProperties>
 		<EnvironmentDefinesInitialLocation>true</EnvironmentDefinesInitialLocation>
 		<RotateAnimationTowardsMovement>true</RotateAnimationTowardsMovement>
diff --git a/_alp/Agents/GIS_Building/AOC.GIS_Building.xml b/_alp/Agents/GIS_Building/AOC.GIS_Building.xml
index 55d9cfac..f22b25ec 100644
--- a/_alp/Agents/GIS_Building/AOC.GIS_Building.xml
+++ b/_alp/Agents/GIS_Building/AOC.GIS_Building.xml
@@ -70,7 +70,12 @@
 	<MakeDefaultViewArea>true</MakeDefaultViewArea>
 	<SceneGridColor/>
 	<SceneBackgroundColor>-4144960</SceneBackgroundColor>
-	<SceneSkybox>null</SceneSkybox>
+	<EnvironmentResourceRef/>
+	<EnvironmentType>NONE</EnvironmentType>
+	<EnvironmentRotationX>0</EnvironmentRotationX>
+	<EnvironmentRotationY>0</EnvironmentRotationY>
+	<EnvironmentRotationZ>0</EnvironmentRotationZ>
+	<EnvironmentIntensity>1</EnvironmentIntensity>
 	<AgentProperties>
 		<EnvironmentDefinesInitialLocation>true</EnvironmentDefinesInitialLocation>
 		<RotateAnimationTowardsMovement>true</RotateAnimationTowardsMovement>
diff --git a/_alp/Agents/GIS_Object/AOC.GIS_Object.xml b/_alp/Agents/GIS_Object/AOC.GIS_Object.xml
index 2a88e9a7..bca50545 100644
--- a/_alp/Agents/GIS_Object/AOC.GIS_Object.xml
+++ b/_alp/Agents/GIS_Object/AOC.GIS_Object.xml
@@ -26,7 +26,12 @@
 	<MakeDefaultViewArea>true</MakeDefaultViewArea>
 	<SceneGridColor/>
 	<SceneBackgroundColor>-4144960</SceneBackgroundColor>
-	<SceneSkybox>null</SceneSkybox>
+	<EnvironmentResourceRef/>
+	<EnvironmentType>NONE</EnvironmentType>
+	<EnvironmentRotationX>0</EnvironmentRotationX>
+	<EnvironmentRotationY>0</EnvironmentRotationY>
+	<EnvironmentRotationZ>0</EnvironmentRotationZ>
+	<EnvironmentIntensity>1</EnvironmentIntensity>
 	<AgentProperties>
 		<EnvironmentDefinesInitialLocation>true</EnvironmentDefinesInitialLocation>
 		<RotateAnimationTowardsMovement>true</RotateAnimationTowardsMovement>
diff --git a/_alp/Agents/GIS_Parcel/AOC.GIS_Parcel.xml b/_alp/Agents/GIS_Parcel/AOC.GIS_Parcel.xml
index be43b035..8b32877e 100644
--- a/_alp/Agents/GIS_Parcel/AOC.GIS_Parcel.xml
+++ b/_alp/Agents/GIS_Parcel/AOC.GIS_Parcel.xml
@@ -68,7 +68,12 @@
 	<MakeDefaultViewArea>true</MakeDefaultViewArea>
 	<SceneGridColor/>
 	<SceneBackgroundColor>-4144960</SceneBackgroundColor>
-	<SceneSkybox>null</SceneSkybox>
+	<EnvironmentResourceRef/>
+	<EnvironmentType>NONE</EnvironmentType>
+	<EnvironmentRotationX>0</EnvironmentRotationX>
+	<EnvironmentRotationY>0</EnvironmentRotationY>
+	<EnvironmentRotationZ>0</EnvironmentRotationZ>
+	<EnvironmentIntensity>1</EnvironmentIntensity>
 	<AgentProperties>
 		<EnvironmentDefinesInitialLocation>true</EnvironmentDefinesInitialLocation>
 		<RotateAnimationTowardsMovement>true</RotateAnimationTowardsMovement>
diff --git a/_alp/Agents/GovernmentLayer/AOC.GovernmentLayer.xml b/_alp/Agents/GovernmentLayer/AOC.GovernmentLayer.xml
index 14435dc5..34e52e1e 100644
--- a/_alp/Agents/GovernmentLayer/AOC.GovernmentLayer.xml
+++ b/_alp/Agents/GovernmentLayer/AOC.GovernmentLayer.xml
@@ -37,7 +37,12 @@
 	<MakeDefaultViewArea>true</MakeDefaultViewArea>
 	<SceneGridColor/>
 	<SceneBackgroundColor>-4144960</SceneBackgroundColor>
-	<SceneSkybox>null</SceneSkybox>
+	<EnvironmentResourceRef/>
+	<EnvironmentType>NONE</EnvironmentType>
+	<EnvironmentRotationX>0</EnvironmentRotationX>
+	<EnvironmentRotationY>0</EnvironmentRotationY>
+	<EnvironmentRotationZ>0</EnvironmentRotationZ>
+	<EnvironmentIntensity>1</EnvironmentIntensity>
 	<AgentProperties>
 		<EnvironmentDefinesInitialLocation>true</EnvironmentDefinesInitialLocation>
 		<RotateAnimationTowardsMovement>true</RotateAnimationTowardsMovement>
diff --git a/_alp/Agents/GridConnection/AOC.GridConnection.xml b/_alp/Agents/GridConnection/AOC.GridConnection.xml
index 9b994c64..cccba66f 100644
--- a/_alp/Agents/GridConnection/AOC.GridConnection.xml
+++ b/_alp/Agents/GridConnection/AOC.GridConnection.xml
@@ -33,7 +33,12 @@ import javax.management.RuntimeErrorException;
 	<MakeDefaultViewArea>true</MakeDefaultViewArea>
 	<SceneGridColor/>
 	<SceneBackgroundColor>-4144960</SceneBackgroundColor>
-	<SceneSkybox>null</SceneSkybox>
+	<EnvironmentResourceRef/>
+	<EnvironmentType>NONE</EnvironmentType>
+	<EnvironmentRotationX>0</EnvironmentRotationX>
+	<EnvironmentRotationY>0</EnvironmentRotationY>
+	<EnvironmentRotationZ>0</EnvironmentRotationZ>
+	<EnvironmentIntensity>1</EnvironmentIntensity>
 	<AgentProperties>
 		<EnvironmentDefinesInitialLocation>true</EnvironmentDefinesInitialLocation>
 		<RotateAnimationTowardsMovement>true</RotateAnimationTowardsMovement>
diff --git a/_alp/Agents/GridConnection/Code/AdditionalClassCode.java b/_alp/Agents/GridConnection/Code/AdditionalClassCode.java
index e00d74bd..59fe4c3c 100644
--- a/_alp/Agents/GridConnection/Code/AdditionalClassCode.java
+++ b/_alp/Agents/GridConnection/Code/AdditionalClassCode.java
@@ -1,5 +1,12 @@
 public final String p_uid = UUID.randomUUID().toString();
 
+@Override
+public String toString(){
+	String shortToString = super.toString();
+	shortToString = shortToString.replace("root.main[0].energyModel.", "");
+	return shortToString;
+}
+
 public OL_ResultScope getScope(){return OL_ResultScope.GRIDCONNECTION;}
 public J_RapidRunData getRapidRunData(){return v_rapidRunData;}
 public J_LiveData getLiveData(){return v_liveData;}
diff --git a/_alp/Agents/GridConnection/Code/Functions.java b/_alp/Agents/GridConnection/Code/Functions.java
index 40c98443..16e97b35 100644
--- a/_alp/Agents/GridConnection/Code/Functions.java
+++ b/_alp/Agents/GridConnection/Code/Functions.java
@@ -944,7 +944,11 @@ else if (storageAsset instanceof J_EAStorageElectric battery) {
 		c_parentCoops.forEach( coop -> coop.v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh += capacity_MWh);
 		energyModel.v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh += capacity_MWh;
 	}
-} else {
+} 
+else if(j_ea instanceof J_EAFlexProfile flexProfileAsset){
+	c_flexProfileAssets.add(flexProfileAsset);
+}
+else {
 	throw new RuntimeException("Trying to connect GC with unrecognized J_EAFlex asset!");
 }
 /*ALCODEEND*/}
@@ -977,13 +981,6 @@ J_ActivityTrackerTrips f_getNewTripTracker(OL_EnergyAssetType assetType,I_Vehicl
 {/*ALCODESTART::1772106633559*/
 c_fixedAssets.add(j_ea);
 
-if (j_ea instanceof J_EAProfile profileAsset) {
-	c_profileAssets.add(profileAsset);
-	if (j_ea.getAssetFlowCategory() == OL_AssetFlowCategories.hotWaterConsumption_kW) {
-		p_DHWAsset = profileAsset;	
-	}
-}
-
 if (j_ea instanceof J_EAFuelVehicle fuelVehicle) {
 	c_vehicleAssets.add(fuelVehicle);
 	
@@ -1000,40 +997,43 @@ else if (fuelVehicle.getEnergyCarrierConsumed() == OL_EnergyCarriers.HYDROGEN) {
 	//Connect triptracker that belongs to the vehicle
 	f_connectTripTracker(fuelVehicle, timeParameters);
 }
-else if (j_ea instanceof J_EAConsumption consumptionAsset) {
-	c_consumptionAssets.add(consumptionAsset);	
-} 
-else if (j_ea instanceof J_EAProduction productionAsset) {
-	c_productionAssets.add(productionAsset);
-
-	if (j_ea.energyAssetType == OL_EnergyAssetType.PHOTOVOLTAIC) {
-		double capacity_kW = productionAsset.getCapacityElectric_kW();
-		v_liveAssetsMetaData.totalInstalledPVPower_kW += capacity_kW;
-		if ( p_parentNodeElectric != null ) {
-			p_parentNodeElectric.f_updateTotalInstalledProductionAssets(OL_EnergyAssetType.PHOTOVOLTAIC, capacity_kW, true);
-		}
-		c_parentCoops.forEach( coop -> coop.v_liveAssetsMetaData.totalInstalledPVPower_kW += capacity_kW);
-		energyModel.v_liveAssetsMetaData.totalInstalledPVPower_kW += capacity_kW;
+else if (j_ea instanceof J_EAProfile profileAsset) {
+	c_profileAssets.add(profileAsset);
+	if (profileAsset.getAssetFlowCategory() == OL_AssetFlowCategories.hotWaterConsumption_kW) {
+		p_DHWAsset = profileAsset;	
 	}
-	else if (productionAsset.energyAssetType == OL_EnergyAssetType.WINDMILL) {
-		double capacity_kW = productionAsset.getCapacityElectric_kW();
-		v_liveAssetsMetaData.totalInstalledWindPower_kW += capacity_kW;
-		if ( p_parentNodeElectric != null ) {
-			p_parentNodeElectric.f_updateTotalInstalledProductionAssets(OL_EnergyAssetType.WINDMILL, capacity_kW, true);
+	if (profileAsset instanceof J_EAConsumption consumptionAsset) {
+		c_consumptionAssets.add(consumptionAsset);	
+	} 
+	else if (profileAsset instanceof J_EAProduction productionAsset) {
+		c_productionAssets.add(productionAsset);
+	
+		if (j_ea.energyAssetType == OL_EnergyAssetType.PHOTOVOLTAIC) {
+			double capacity_kW = productionAsset.getCapacityElectric_kW();
+			v_liveAssetsMetaData.totalInstalledPVPower_kW += capacity_kW;
+			if ( p_parentNodeElectric != null ) {
+				p_parentNodeElectric.f_updateTotalInstalledProductionAssets(OL_EnergyAssetType.PHOTOVOLTAIC, capacity_kW, true);
+			}
+			c_parentCoops.forEach( coop -> coop.v_liveAssetsMetaData.totalInstalledPVPower_kW += capacity_kW);
+			energyModel.v_liveAssetsMetaData.totalInstalledPVPower_kW += capacity_kW;
+		}
+		else if (productionAsset.energyAssetType == OL_EnergyAssetType.WINDMILL) {
+			double capacity_kW = productionAsset.getCapacityElectric_kW();
+			v_liveAssetsMetaData.totalInstalledWindPower_kW += capacity_kW;
+			if ( p_parentNodeElectric != null ) {
+				p_parentNodeElectric.f_updateTotalInstalledProductionAssets(OL_EnergyAssetType.WINDMILL, capacity_kW, true);
+			}
+			c_parentCoops.forEach( coop -> coop.v_liveAssetsMetaData.totalInstalledWindPower_kW += capacity_kW);
+			energyModel.v_liveAssetsMetaData.totalInstalledWindPower_kW += capacity_kW;
+		}
+		else if (productionAsset.energyAssetType == OL_EnergyAssetType.PHOTOTHERMAL){
+	
 		}
-		c_parentCoops.forEach( coop -> coop.v_liveAssetsMetaData.totalInstalledWindPower_kW += capacity_kW);
-		energyModel.v_liveAssetsMetaData.totalInstalledWindPower_kW += capacity_kW;
 	}
-	else if (productionAsset.energyAssetType == OL_EnergyAssetType.PHOTOTHERMAL){
+	else if (profileAsset instanceof J_EAPetroleumFuelTractor tractor) {
 
 	}
 }
-else if (j_ea instanceof J_EAPetroleumFuelTractor tractor) {
-	c_profileAssets.add(tractor);
-}
-else if (j_ea instanceof J_EAProfile) {
-	return;
-}
 else{
 	throw new RuntimeException("Trying to connect GC with unrecognized J_EAFixed asset!");
 }
@@ -1056,13 +1056,6 @@ else if (j_ea instanceof J_EAProfile) {
 {/*ALCODESTART::1772110066396*/
 c_fixedAssets.remove(j_ea);
 
-if (j_ea instanceof J_EAProfile profileAsset) {
-	c_profileAssets.remove(profileAsset);
-	if (j_ea.getAssetFlowCategory() == OL_AssetFlowCategories.hotWaterConsumption_kW) {
-		p_DHWAsset = null;	
-	}
-}
-
 if (j_ea instanceof J_EAFuelVehicle fuelVehicle) {
 	c_vehicleAssets.remove(fuelVehicle);
 	
@@ -1080,39 +1073,36 @@ else if (fuelVehicle.getEnergyCarrierConsumed() == OL_EnergyCarriers.HYDROGEN) {
 	c_tripTrackers.remove( tripTracker );
 	fuelVehicle.setTripTracker(null);
 }
-else if (j_ea instanceof J_EAConsumption) {
-	c_consumptionAssets.remove((J_EAConsumption)j_ea);	
-	if( j_ea.energyAssetType == OL_EnergyAssetType.ELECTRICITY_DEMAND ) {
-	
+else if (j_ea instanceof J_EAProfile profileAsset) {
+	c_profileAssets.remove(profileAsset);
+	if (profileAsset.getAssetFlowCategory() == OL_AssetFlowCategories.hotWaterConsumption_kW) {
+		p_DHWAsset = null;	
 	}
-	if( j_ea.energyAssetType == OL_EnergyAssetType.ELECTRIC_HOB ) {
-	
+	if (profileAsset instanceof J_EAConsumption consumptionAsset) {
+		c_consumptionAssets.remove(consumptionAsset);
 	}
-}
-else if (j_ea instanceof J_EAProduction) {
-	c_productionAssets.remove((J_EAProduction)j_ea);
-
-	if (j_ea.energyAssetType == OL_EnergyAssetType.PHOTOVOLTAIC) {
-		J_EAProduction otherPV = findFirst(c_productionAssets, x -> x.getEAType() == OL_EnergyAssetType.PHOTOVOLTAIC);
-		double capacity_kW = ((J_EAProduction)j_ea).getCapacityElectric_kW();
-		v_liveAssetsMetaData.totalInstalledPVPower_kW -= capacity_kW;
-		if ( p_parentNodeElectric != null ) {
-			p_parentNodeElectric.f_updateTotalInstalledProductionAssets(OL_EnergyAssetType.PHOTOVOLTAIC, capacity_kW, false);
+	else if (profileAsset instanceof J_EAProduction productionAsset) {
+		c_productionAssets.remove(productionAsset);
+	
+		if (j_ea.energyAssetType == OL_EnergyAssetType.PHOTOVOLTAIC) {
+			J_EAProduction otherPV = findFirst(c_productionAssets, x -> x.getEAType() == OL_EnergyAssetType.PHOTOVOLTAIC);
+			double capacity_kW = ((J_EAProduction)j_ea).getCapacityElectric_kW();
+			v_liveAssetsMetaData.totalInstalledPVPower_kW -= capacity_kW;
+			if ( p_parentNodeElectric != null ) {
+				p_parentNodeElectric.f_updateTotalInstalledProductionAssets(OL_EnergyAssetType.PHOTOVOLTAIC, capacity_kW, false);
+			}
+			c_parentCoops.forEach( coop -> coop.v_liveAssetsMetaData.totalInstalledPVPower_kW -= capacity_kW);		
+			energyModel.v_liveAssetsMetaData.totalInstalledPVPower_kW -= capacity_kW;
 		}
-		c_parentCoops.forEach( coop -> coop.v_liveAssetsMetaData.totalInstalledPVPower_kW -= capacity_kW);		
-		energyModel.v_liveAssetsMetaData.totalInstalledPVPower_kW -= capacity_kW;
-	}
-	else if (j_ea.energyAssetType == OL_EnergyAssetType.WINDMILL) {
-		double capacity_kW = ((J_EAProduction)j_ea).getCapacityElectric_kW();
-		v_liveAssetsMetaData.totalInstalledWindPower_kW -= capacity_kW;
-		if ( p_parentNodeElectric != null ) {
-			p_parentNodeElectric.f_updateTotalInstalledProductionAssets(OL_EnergyAssetType.WINDMILL, capacity_kW, false);
+		else if (j_ea.energyAssetType == OL_EnergyAssetType.WINDMILL) {
+			double capacity_kW = ((J_EAProduction)j_ea).getCapacityElectric_kW();
+			v_liveAssetsMetaData.totalInstalledWindPower_kW -= capacity_kW;
+			if ( p_parentNodeElectric != null ) {
+				p_parentNodeElectric.f_updateTotalInstalledProductionAssets(OL_EnergyAssetType.WINDMILL, capacity_kW, false);
+			}
+			c_parentCoops.forEach( coop -> coop.v_liveAssetsMetaData.totalInstalledPVPower_kW -= capacity_kW);		
+			energyModel.v_liveAssetsMetaData.totalInstalledWindPower_kW -= capacity_kW;
 		}
-		c_parentCoops.forEach( coop -> coop.v_liveAssetsMetaData.totalInstalledPVPower_kW -= capacity_kW);		
-		energyModel.v_liveAssetsMetaData.totalInstalledWindPower_kW -= capacity_kW;
-	}
-	else if (j_ea.energyAssetType == OL_EnergyAssetType.PHOTOTHERMAL){
-	
 	}
 }
 /*ALCODEEND*/}
@@ -1185,8 +1175,8 @@ else if (j_ea instanceof J_EAStorageElectric) {
 		energyModel.v_liveAssetsMetaData.totalInstalledBatteryStorageCapacity_MWh -= ((J_EAStorageElectric)j_ea).getStorageCapacity_kWh()/1000;
 	}
 }
-else if (j_ea instanceof J_EAConversionAirConditioner) {
-	p_airco = null;
+else if(j_ea instanceof J_EAFlexProfile flexProfileAsset){
+	c_flexProfileAssets.remove(flexProfileAsset);
 }
 /*ALCODEEND*/}
 
@@ -1223,3 +1213,98 @@ boolean f_isAssetManagementActive(Class<? extends I_AssetManagement>  assetManag
 }
 /*ALCODEEND*/}
 
+double[] f_getFixedAssetForecast(double timeOfIntervalStart,double timeOfIntervalEnd,OL_EnergyCarriers energyCarrier,J_TimeParameters timeParameters)
+{/*ALCODESTART::1781519426247*/
+switch(energyCarrier){
+	case ELECTRICITY:
+		return f_getFixedAssetForecast_Electricity(timeOfIntervalStart, timeOfIntervalEnd, timeParameters);
+	case HEAT:
+		return f_getFixedAssetForecast_Heat(timeOfIntervalStart, timeOfIntervalEnd, timeParameters);
+	default:
+		throw new RuntimeException("Trying to get the fixed asset balance interval for an unsupported energy carrier!");
+}
+/*ALCODEEND*/}
+
+double[] f_getFixedAssetForecast_Electricity(double forecastStartTime_h,double forecastEndTime_h,J_TimeParameters timeParameters)
+{/*ALCODESTART::1781525344609*/
+double timeWindow_h = forecastEndTime_h-forecastStartTime_h;
+int numberOfTimeSteps = roundToInt(timeWindow_h/timeParameters.getTimeStep_h());
+double[] nettoBalance_kW = new double[numberOfTimeSteps];
+
+if(!v_isActive) {
+	return nettoBalance_kW;
+}
+
+//Default profiles
+for(J_EAProfile electricityProfile : findAll(c_profileAssets, profile -> profile.getEnergyCarrier() == OL_EnergyCarriers.ELECTRICITY)) {
+	nettoBalance_kW = LUXMath.addArrays(nettoBalance_kW, electricityProfile.getForecast_kW(forecastStartTime_h, forecastEndTime_h));
+}
+
+//Find the default controlled flex profiles (Maybe add this to flex asset forecasting?)
+List<J_EAFlexProfile> defaultControlledHeatFlexProfiles = new ArrayList<>();
+if(f_getExternalAssetManagement(I_FlexProfileManagement.class) instanceof J_FlexProfileManagementDefault){
+	for(J_EAFlexProfile electricityFlexProfile : findAll(c_flexProfileAssets, flexProfile -> flexProfile.getEnergyCarrier() == OL_EnergyCarriers.ELECTRICITY)) {
+		nettoBalance_kW = LUXMath.addArrays(nettoBalance_kW, electricityFlexProfile.getForecast_kW(forecastStartTime_h, forecastEndTime_h));
+	}
+	defaultControlledHeatFlexProfiles = findAll(c_flexProfileAssets, flexProfile -> flexProfile.getEnergyCarrier() == OL_EnergyCarriers.HEAT && flexProfile.getEAType() != PHOTOTHERMAL);
+}
+
+List<J_EAProfile> heatProfiles = findAll(c_profileAssets, profile -> profile.getEnergyCarrier() == OL_EnergyCarriers.HEAT && profile.getEAType() != PHOTOTHERMAL);
+
+// -> Need to subtract photo thermal from hot water demand and throw away the remaining pt (?), and what about a (hot water) buffer ? 
+// -> May need a seperate 'hotwater' electricity consumption forecaster, that keeps buffer and pt in mind.
+//if(heatProfiles.size() > 0 && (f_getCurrentHeatingType() == OL_GridConnectionHeatingType.ELECTRIC_HEATPUMP || f_getCurrentHeatingType() == OL_GridConnectionHeatingType.ELECTRIC_HEATER) && !f_getHeatingTypeIsGhost()) {
+if(heatProfiles.size() > 0 && (f_getCurrentHeatingType() == OL_GridConnectionHeatingType.ELECTRIC_HEATPUMP || c_heatingAssets.get(0) instanceof J_EAConversionElectricHeater) && !f_getHeatingTypeIsGhost()) {
+	
+	double[] heatPower_kW = new double[numberOfTimeSteps];
+	//Calculate heat profile
+	for(J_EAProfile heatProfile : heatProfiles){
+		heatPower_kW = LUXMath.addArrays(heatPower_kW, heatProfile.getForecast_kW(forecastStartTime_h, forecastEndTime_h));
+	}
+	for(J_EAFlexProfile defaultControlledHeatFlexProfile : defaultControlledHeatFlexProfiles){
+		heatPower_kW = LUXMath.addArrays(heatPower_kW, defaultControlledHeatFlexProfile.getForecast_kW(forecastStartTime_h, forecastEndTime_h));
+	}
+
+	//Calculate the actual power the heating asset would use (by calculating the efficiency) and add to nettoBalance_kW
+	J_EAConversion heatingAsset = c_heatingAssets.get(0);
+	double[] invEfficiency = new double[numberOfTimeSteps];
+	if (heatingAsset instanceof J_EAConversionElectricHeater electricHeater) {
+		Arrays.fill(invEfficiency, 1.0 / electricHeater.getEta_r());
+	}
+	else if (heatingAsset instanceof J_EAConversionHeatPump heatPump) {
+		//Todo -> Make work for other ambient temp types!
+		J_ProfilePointer ambientTemperatures = this.energyModel.pp_ambientTemperature_degC;
+		for (int i = 0; i < numberOfTimeSteps; i++) {
+			invEfficiency[i] = 1.0/heatPump.calculateCOP(heatPump.getOutputTemperature_degC(), ambientTemperatures.getValue(forecastStartTime_h + i * timeParameters.getTimeStep_h()));
+		}
+	}
+	nettoBalance_kW = LUXMath.addArrays(nettoBalance_kW, LUXMath.multiplyArrays(heatPower_kW, invEfficiency));
+}
+return nettoBalance_kW;
+/*ALCODEEND*/}
+
+double[] f_getFixedAssetForecast_Heat(double forecastStartTime_h,double forecastEndTime_h,J_TimeParameters timeParameters)
+{/*ALCODESTART::1781525346198*/
+double timeWindow_h = forecastEndTime_h-forecastStartTime_h;
+int numberOfTimeSteps = roundToInt(timeWindow_h/timeParameters.getTimeStep_h());
+double[] nettoBalance_kW = new double[numberOfTimeSteps];
+
+if(!v_isActive) {
+	return nettoBalance_kW;
+}
+
+//Default profiles
+for(J_EAProfile heatProfile : findAll(c_profileAssets, profile -> profile.getEnergyCarrier() == OL_EnergyCarriers.HEAT)){
+	nettoBalance_kW = LUXMath.addArrays(nettoBalance_kW, heatProfile.getForecast_kW(forecastStartTime_h, forecastEndTime_h));
+}
+
+//Default controlled flexprofiles
+if(f_getExternalAssetManagement(I_FlexProfileManagement.class) instanceof J_FlexProfileManagementDefault){
+	for(J_EAFlexProfile heatFlexProfile : findAll(c_flexProfileAssets, flexProfile -> flexProfile.getEnergyCarrier() == OL_EnergyCarriers.HEAT)) {
+		nettoBalance_kW = LUXMath.addArrays(nettoBalance_kW, heatFlexProfile.getForecast_kW(forecastStartTime_h, forecastEndTime_h));
+	}
+}
+
+return nettoBalance_kW;
+/*ALCODEEND*/}
+
diff --git a/_alp/Agents/GridConnection/Code/Functions.xml b/_alp/Agents/GridConnection/Code/Functions.xml
index 2d6e6631..bd3ccc41 100644
--- a/_alp/Agents/GridConnection/Code/Functions.xml
+++ b/_alp/Agents/GridConnection/Code/Functions.xml
@@ -415,7 +415,7 @@
 		<Id>1753969724598</Id>
 		<Name><![CDATA[f_removeAllHeatingAssets]]></Name>
 		<X>645</X>
-		<Y>360</Y>
+		<Y>380</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -431,7 +431,7 @@
 		<Id>1754051705071</Id>
 		<Name><![CDATA[f_getCurrentHeatingType]]></Name>
 		<X>645</X>
-		<Y>320</Y>
+		<Y>340</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -448,7 +448,7 @@
 		<Name><![CDATA[f_addHeatManagement]]></Name>
 		<Description><![CDATA[This function takes heatingType as an argument and adds the default heating management class to the GridConnection]]></Description>
 		<X>645</X>
-		<Y>280</Y>
+		<Y>300</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -556,7 +556,7 @@
 		<Id>1754582754934</Id>
 		<Name><![CDATA[f_activateV2GChargingMode]]></Name>
 		<X>675</X>
-		<Y>580</Y>
+		<Y>600</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -585,7 +585,7 @@
 		<Name><![CDATA[f_addChargingManagement]]></Name>
 		<Description><![CDATA[This function takes heatingType as an argument and adds the default heating management class to the GridConnection]]></Description>
 		<X>666</X>
-		<Y>541</Y>
+		<Y>561</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -633,7 +633,7 @@
 		<Id>1762851936576</Id>
 		<Name><![CDATA[f_setChargingManagement]]></Name>
 		<X>666</X>
-		<Y>521</Y>
+		<Y>541</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -653,7 +653,7 @@
 		<Id>1762852865038</Id>
 		<Name><![CDATA[f_getHeatingTypeIsGhost]]></Name>
 		<X>645</X>
-		<Y>340</Y>
+		<Y>360</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -669,7 +669,7 @@
 		<Id>1762853013265</Id>
 		<Name><![CDATA[f_setHeatingPreferences]]></Name>
 		<X>655</X>
-		<Y>300</Y>
+		<Y>320</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -689,7 +689,7 @@
 		<Id>1762853347370</Id>
 		<Name><![CDATA[f_getCurrentChargingType]]></Name>
 		<X>676</X>
-		<Y>561</Y>
+		<Y>581</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -705,7 +705,7 @@
 		<Id>1762853561122</Id>
 		<Name><![CDATA[f_getV2GActive]]></Name>
 		<X>676</X>
-		<Y>601</Y>
+		<Y>621</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -721,7 +721,7 @@
 		<Id>1762853894937</Id>
 		<Name><![CDATA[f_getBatteryManagement]]></Name>
 		<X>676</X>
-		<Y>831</Y>
+		<Y>851</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -737,7 +737,7 @@
 		<Id>1762855655470</Id>
 		<Name><![CDATA[f_setHeatingManagement]]></Name>
 		<X>645</X>
-		<Y>260</Y>
+		<Y>280</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -757,7 +757,7 @@
 		<Id>1762855733010</Id>
 		<Name><![CDATA[f_setBatteryManagement]]></Name>
 		<X>676</X>
-		<Y>811</Y>
+		<Y>831</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -777,7 +777,7 @@
 		<Id>1762940915048</Id>
 		<Name><![CDATA[f_getChargingManagement]]></Name>
 		<X>676</X>
-		<Y>621</Y>
+		<Y>641</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -793,7 +793,7 @@
 		<Id>1762940962079</Id>
 		<Name><![CDATA[f_getHeatingManagement]]></Name>
 		<X>645</X>
-		<Y>380</Y>
+		<Y>400</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -809,7 +809,7 @@
 		<Id>1765551413839</Id>
 		<Name><![CDATA[f_getChargePoint]]></Name>
 		<X>686</X>
-		<Y>681</Y>
+		<Y>701</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -825,7 +825,7 @@
 		<Id>1765551488579</Id>
 		<Name><![CDATA[f_setChargePoint]]></Name>
 		<X>686</X>
-		<Y>661</Y>
+		<Y>681</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1156,4 +1156,92 @@
 		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
+	<Function AccessType="public" StaticFunction="false">
+		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
+		<ReturnType>double[]</ReturnType>
+		<Id>1781519426247</Id>
+		<Name><![CDATA[f_getFixedAssetForecast]]></Name>
+		<X>1470</X>
+		<Y>580</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[timeOfIntervalStart]]></Name>
+			<Type><![CDATA[double]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[timeOfIntervalEnd]]></Name>
+			<Type><![CDATA[double]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[energyCarrier]]></Name>
+			<Type><![CDATA[OL_EnergyCarriers]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[timeParameters]]></Name>
+			<Type><![CDATA[J_TimeParameters]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="private" StaticFunction="false">
+		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
+		<ReturnType>double[]</ReturnType>
+		<Id>1781525344609</Id>
+		<Name><![CDATA[f_getFixedAssetForecast_Electricity]]></Name>
+		<X>1490</X>
+		<Y>600</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[forecastStartTime_h]]></Name>
+			<Type><![CDATA[double]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[forecastEndTime_h]]></Name>
+			<Type><![CDATA[double]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[timeParameters]]></Name>
+			<Type><![CDATA[J_TimeParameters]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="private" StaticFunction="false">
+		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
+		<ReturnType>double[]</ReturnType>
+		<Id>1781525346198</Id>
+		<Name><![CDATA[f_getFixedAssetForecast_Heat]]></Name>
+		<X>1490</X>
+		<Y>620</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[forecastStartTime_h]]></Name>
+			<Type><![CDATA[double]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[forecastEndTime_h]]></Name>
+			<Type><![CDATA[double]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[timeParameters]]></Name>
+			<Type><![CDATA[J_TimeParameters]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
 </Functions>
diff --git a/_alp/Agents/GridConnection/Variables.xml b/_alp/Agents/GridConnection/Variables.xml
index d9b8e90f..8e091fed 100644
--- a/_alp/Agents/GridConnection/Variables.xml
+++ b/_alp/Agents/GridConnection/Variables.xml
@@ -418,7 +418,7 @@
 		<Id>1765551371538</Id>
 		<Name><![CDATA[p_chargePoint]]></Name>
 		<X>666</X>
-		<Y>641</Y>
+		<Y>661</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -532,7 +532,7 @@
 		<Id>1660115328584</Id>
 		<Name><![CDATA[p_BuildingThermalAsset]]></Name>
 		<X>625</X>
-		<Y>220</Y>
+		<Y>240</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -585,7 +585,7 @@
 		<Id>1668695364192</Id>
 		<Name><![CDATA[p_batteryAsset]]></Name>
 		<X>646</X>
-		<Y>791</Y>
+		<Y>811</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -610,7 +610,7 @@
 		<Id>1676449763319</Id>
 		<Name><![CDATA[p_heatBuffer]]></Name>
 		<X>646</X>
-		<Y>771</Y>
+		<Y>791</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -635,7 +635,7 @@
 		<Id>1684919785784</Id>
 		<Name><![CDATA[p_gasBuffer]]></Name>
 		<X>646</X>
-		<Y>851</Y>
+		<Y>871</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -660,7 +660,7 @@
 		<Id>1692878211840</Id>
 		<Name><![CDATA[p_cookingTracker]]></Name>
 		<X>646</X>
-		<Y>421</Y>
+		<Y>441</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -709,7 +709,7 @@
 	<Variable Class="Parameter">
 		<Id>1692973005119</Id>
 		<Name><![CDATA[p_DHWAsset]]></Name>
-		<X>645</X>
+		<X>655</X>
 		<Y>130</Y>
 		<Label>
 			<X>10</X>
@@ -1043,7 +1043,7 @@
 		<Id>1772107658602</Id>
 		<Name><![CDATA[p_airco]]></Name>
 		<X>625</X>
-		<Y>200</Y>
+		<Y>220</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1086,7 +1086,7 @@
 		<Id>1659962626907</Id>
 		<Name><![CDATA[c_storageAssets]]></Name>
 		<X>626</X>
-		<Y>751</Y>
+		<Y>771</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1103,7 +1103,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1659962626909</Id>
 		<Name><![CDATA[c_consumptionAssets]]></Name>
-		<X>625</X>
+		<X>635</X>
 		<Y>110</Y>
 		<Label>
 			<X>10</X>
@@ -1121,7 +1121,7 @@
 	<Variable Class="CollectionVariable">
 		<Id>1659962626911</Id>
 		<Name><![CDATA[c_productionAssets]]></Name>
-		<X>625</X>
+		<X>635</X>
 		<Y>150</Y>
 		<Label>
 			<X>10</X>
@@ -1140,7 +1140,7 @@
 		<Id>1659962626913</Id>
 		<Name><![CDATA[c_conversionAssets]]></Name>
 		<X>626</X>
-		<Y>401</Y>
+		<Y>421</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1158,7 +1158,7 @@
 		<Id>1667746389220</Id>
 		<Name><![CDATA[c_vehicleAssets]]></Name>
 		<X>626</X>
-		<Y>461</Y>
+		<Y>481</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1176,7 +1176,7 @@
 		<Id>1669115948280</Id>
 		<Name><![CDATA[c_petroleumFuelVehicles]]></Name>
 		<X>646</X>
-		<Y>711</Y>
+		<Y>731</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1194,7 +1194,7 @@
 		<Id>1692864624612</Id>
 		<Name><![CDATA[c_tripTrackers]]></Name>
 		<X>646</X>
-		<Y>481</Y>
+		<Y>501</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1248,7 +1248,7 @@
 		<Id>1711012701187</Id>
 		<Name><![CDATA[c_hydrogenVehicles]]></Name>
 		<X>646</X>
-		<Y>731</Y>
+		<Y>751</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1284,7 +1284,7 @@
 		<Id>1750258408126</Id>
 		<Name><![CDATA[c_chargingSessions]]></Name>
 		<X>626</X>
-		<Y>441</Y>
+		<Y>461</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1303,7 +1303,7 @@
 		<Name><![CDATA[c_heatingAssets]]></Name>
 		<Description><![CDATA[A collection of assets that can deliver heat. This collection does not include the heat buffer or thermal building.]]></Description>
 		<X>625</X>
-		<Y>240</Y>
+		<Y>260</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1321,7 +1321,7 @@
 		<Id>1754581015887</Id>
 		<Name><![CDATA[c_electricVehicles]]></Name>
 		<X>646</X>
-		<Y>501</Y>
+		<Y>521</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1371,4 +1371,22 @@
 			<ValueElementClass>String</ValueElementClass>
 		</Properties>
 	</Variable>
+	<Variable Class="CollectionVariable">
+		<Id>1781186589311</Id>
+		<Name><![CDATA[c_flexProfileAssets]]></Name>
+		<X>625</X>
+		<Y>195</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" AccessType="public" StaticVariable="false">
+			<CollectionClass>ArrayList</CollectionClass>
+			<ElementClass>J_EAFlexProfile</ElementClass>
+			<ValueElementClass>String</ValueElementClass>
+		</Properties>
+	</Variable>
 </Variables>
diff --git a/_alp/Agents/GridNode/AOC.GridNode.xml b/_alp/Agents/GridNode/AOC.GridNode.xml
index 3ab0b8eb..849a0ec4 100644
--- a/_alp/Agents/GridNode/AOC.GridNode.xml
+++ b/_alp/Agents/GridNode/AOC.GridNode.xml
@@ -33,7 +33,12 @@ if (p_energyType.equals(OL_EnergyCarriers.HEAT)) {
 	<MakeDefaultViewArea>true</MakeDefaultViewArea>
 	<SceneGridColor/>
 	<SceneBackgroundColor>-4144960</SceneBackgroundColor>
-	<SceneSkybox>null</SceneSkybox>
+	<EnvironmentResourceRef/>
+	<EnvironmentType>NONE</EnvironmentType>
+	<EnvironmentRotationX>0</EnvironmentRotationX>
+	<EnvironmentRotationY>0</EnvironmentRotationY>
+	<EnvironmentRotationZ>0</EnvironmentRotationZ>
+	<EnvironmentIntensity>1</EnvironmentIntensity>
 	<AgentProperties>
 		<EnvironmentDefinesInitialLocation>true</EnvironmentDefinesInitialLocation>
 		<RotateAnimationTowardsMovement>true</RotateAnimationTowardsMovement>
diff --git a/_alp/Agents/GridOperator/AOC.GridOperator.xml b/_alp/Agents/GridOperator/AOC.GridOperator.xml
index 79869c91..ce3c4703 100644
--- a/_alp/Agents/GridOperator/AOC.GridOperator.xml
+++ b/_alp/Agents/GridOperator/AOC.GridOperator.xml
@@ -38,7 +38,12 @@
 	<MakeDefaultViewArea>true</MakeDefaultViewArea>
 	<SceneGridColor/>
 	<SceneBackgroundColor>-4144960</SceneBackgroundColor>
-	<SceneSkybox>null</SceneSkybox>
+	<EnvironmentResourceRef/>
+	<EnvironmentType>NONE</EnvironmentType>
+	<EnvironmentRotationX>0</EnvironmentRotationX>
+	<EnvironmentRotationY>0</EnvironmentRotationY>
+	<EnvironmentRotationZ>0</EnvironmentRotationZ>
+	<EnvironmentIntensity>1</EnvironmentIntensity>
 	<AgentProperties>
 		<EnvironmentDefinesInitialLocation>true</EnvironmentDefinesInitialLocation>
 		<RotateAnimationTowardsMovement>true</RotateAnimationTowardsMovement>
diff --git a/_alp/Agents/NationalEnergyMarket/AOC.NationalEnergyMarket.xml b/_alp/Agents/NationalEnergyMarket/AOC.NationalEnergyMarket.xml
index 993b3bf6..c138207c 100644
--- a/_alp/Agents/NationalEnergyMarket/AOC.NationalEnergyMarket.xml
+++ b/_alp/Agents/NationalEnergyMarket/AOC.NationalEnergyMarket.xml
@@ -37,7 +37,12 @@
 	<MakeDefaultViewArea>true</MakeDefaultViewArea>
 	<SceneGridColor/>
 	<SceneBackgroundColor>-4144960</SceneBackgroundColor>
-	<SceneSkybox>null</SceneSkybox>
+	<EnvironmentResourceRef/>
+	<EnvironmentType>NONE</EnvironmentType>
+	<EnvironmentRotationX>0</EnvironmentRotationX>
+	<EnvironmentRotationY>0</EnvironmentRotationY>
+	<EnvironmentRotationZ>0</EnvironmentRotationZ>
+	<EnvironmentIntensity>1</EnvironmentIntensity>
 	<AgentProperties>
 		<EnvironmentDefinesInitialLocation>true</EnvironmentDefinesInitialLocation>
 		<RotateAnimationTowardsMovement>true</RotateAnimationTowardsMovement>
diff --git a/_alp/Agents/UI_EnergyAsset/AOC.UI_EnergyAsset.xml b/_alp/Agents/UI_EnergyAsset/AOC.UI_EnergyAsset.xml
index f509c720..1cb4d4c4 100644
--- a/_alp/Agents/UI_EnergyAsset/AOC.UI_EnergyAsset.xml
+++ b/_alp/Agents/UI_EnergyAsset/AOC.UI_EnergyAsset.xml
@@ -28,7 +28,12 @@ f_setCoordinatesUIElements();
 	<MakeDefaultViewArea>true</MakeDefaultViewArea>
 	<SceneGridColor/>
 	<SceneBackgroundColor>-4144960</SceneBackgroundColor>
-	<SceneSkybox>null</SceneSkybox>
+	<EnvironmentResourceRef/>
+	<EnvironmentType>NONE</EnvironmentType>
+	<EnvironmentRotationX>0</EnvironmentRotationX>
+	<EnvironmentRotationY>0</EnvironmentRotationY>
+	<EnvironmentRotationZ>0</EnvironmentRotationZ>
+	<EnvironmentIntensity>1</EnvironmentIntensity>
 	<AgentProperties>
 		<EnvironmentDefinesInitialLocation>true</EnvironmentDefinesInitialLocation>
 		<RotateAnimationTowardsMovement>true</RotateAnimationTowardsMovement>
diff --git a/_alp/Agents/UI_GridNode/AOC.UI_GridNode.xml b/_alp/Agents/UI_GridNode/AOC.UI_GridNode.xml
index 83d49904..9007058b 100644
--- a/_alp/Agents/UI_GridNode/AOC.UI_GridNode.xml
+++ b/_alp/Agents/UI_GridNode/AOC.UI_GridNode.xml
@@ -21,7 +21,12 @@
 	<MakeDefaultViewArea>true</MakeDefaultViewArea>
 	<SceneGridColor/>
 	<SceneBackgroundColor>-4144960</SceneBackgroundColor>
-	<SceneSkybox>null</SceneSkybox>
+	<EnvironmentResourceRef/>
+	<EnvironmentType>NONE</EnvironmentType>
+	<EnvironmentRotationX>0</EnvironmentRotationX>
+	<EnvironmentRotationY>0</EnvironmentRotationY>
+	<EnvironmentRotationZ>0</EnvironmentRotationZ>
+	<EnvironmentIntensity>1</EnvironmentIntensity>
 	<AgentProperties>
 		<EnvironmentDefinesInitialLocation>true</EnvironmentDefinesInitialLocation>
 		<RotateAnimationTowardsMovement>true</RotateAnimationTowardsMovement>
diff --git a/_alp/Classes/Class.I_EnergyManagement.java b/_alp/Classes/Class.I_EnergyManagement.java
index a56ef770..1906faf9 100644
--- a/_alp/Classes/Class.I_EnergyManagement.java
+++ b/_alp/Classes/Class.I_EnergyManagement.java
@@ -30,14 +30,16 @@ default void setExternalAssetManagement(I_AssetManagement assetManagementInstanc
     		throw new RuntimeException("Can't call setExternalAssetManagement() with input 'null'. -> If you are trying to remove something, use removeExternalAssetManagement() instead.");
     	}
     	
-    	//Get the assetmanagement (interface) type (I_ChargingManagement, I_HeatingManagement, etc.)
-    	Class<? extends I_AssetManagement> assetManagementType = assetManagementInstance.getAssetManagementInterfaceType();
-    	
+    	//Get the assetmanagement class
+    	Class<?> assetManagementClass = assetManagementInstance.getClass();
+
     	//Check if setAssetManagement is actually supported by this EnergyManagement class
-    	if (getSupportedExternalAssetManagements().stream().noneMatch(supported -> supported.isAssignableFrom(assetManagementType))) {
+    	if (getSupportedExternalAssetManagements().stream().noneMatch(supported -> supported.isAssignableFrom(assetManagementClass))) {
     	    throw new RuntimeException("Trying to set an unsupported sub asset management type for an EMS.");
     	}
-    	getActiveExternalAssetManagements().put(assetManagementType, assetManagementInstance);
+    	
+    	//Set assetManagementInstance as value of the assetManagementInterfaceType key.
+    	getActiveExternalAssetManagements().put(assetManagementInstance.getAssetManagementInterfaceType(), assetManagementInstance);
     	
     	//Recheck configuration
     	setChecked(false); 
@@ -120,6 +122,13 @@ else if(asset.getEAType() == OL_EnergyAssetType.DIESEL_GENERATOR || asset.getEAT
 					flexAssets.removeAll(findAll(flexAssets, generator -> generator.getEAType() == OL_EnergyAssetType.DIESEL_GENERATOR || generator.getEAType() == OL_EnergyAssetType.METHANE_GENERATOR || generator.getEAType() == OL_EnergyAssetType.FUEL_CELL));
 					break;
 				}
+				else if(asset instanceof J_EAFlexProfile) {
+					if(!isAssetManagementActive(I_FlexProfileManagement.class)) {
+						throw new RuntimeException("A J_EAFlexProfile is found at a GC that has an EMS that does not have an active FlexProfileManagement.");
+					}
+					flexAssets.removeAll(findAll(flexAssets, flexProfile -> flexProfile instanceof J_EAFlexProfile));
+					break;
+				}
 				else {
 					throw new RuntimeException("Asset found that is not managed by I_AssetManagement, can not be checked.");
 					//If you create a custom EMS, who does support other assets, override this method!
diff --git a/_alp/Classes/Class.I_FlexProfileManagement.java b/_alp/Classes/Class.I_FlexProfileManagement.java
new file mode 100644
index 00000000..f69076ae
--- /dev/null
+++ b/_alp/Classes/Class.I_FlexProfileManagement.java
@@ -0,0 +1,13 @@
+/**
+ * I_FlexProfileManagement: Interface for management classes that control the J_EAFlexProfile Assets.
+ */
+
+public interface I_FlexProfileManagement extends I_AssetManagement {
+	//Get the subManagementInterface type
+	default Class<? extends I_AssetManagement> getAssetManagementInterfaceType(){
+		return I_FlexProfileManagement.class;
+	}
+	
+	//Manage heating (flex) assets
+	void manageFlexProfiles(J_TimeVariables timeVariables);
+}
\ No newline at end of file
diff --git a/_alp/Classes/Class.I_ProfileAsset.java b/_alp/Classes/Class.I_ProfileAsset.java
new file mode 100644
index 00000000..b426280b
--- /dev/null
+++ b/_alp/Classes/Class.I_ProfileAsset.java
@@ -0,0 +1,32 @@
+public interface I_ProfileAsset
+{
+	//Setters
+    public void setProfileScaling_fr( double scaling_fr );
+    
+
+	public void setEnergyAssetName(String name);
+	 
+	public void setEnergyAssetType(OL_EnergyAssetType assetType);
+	 
+	public void setAssetFlowCategory(OL_AssetFlowCategories assetFlowCat);
+	 
+    //Getters
+	public I_AssetOwner getOwner();
+    public J_ProfilePointer getProfilePointer();
+    
+    public double getProfileUnitScaler_fr();
+    public double getProfileScaling_fr();
+
+    public double getPeakConsumptionPower_kW();
+    public double getPeakProductionPower_kW();
+    public double getBaseConsumption_kWh();
+    public double getTotalConsumption_kWh();
+    
+    public J_FlowsMap getLastFlows();
+	public OL_EnergyAssetType getEAType();
+	public OL_AssetFlowCategories getAssetFlowCategory();
+	
+    public OL_EnergyCarriers getEnergyCarrier();
+    
+    public double[] getForecast_kW(double forecastStartTime_h, double forecastEndTime_h);
+}
\ No newline at end of file
diff --git a/_alp/Classes/Class.J_EAConsumption.java b/_alp/Classes/Class.J_EAConsumption.java
index 10485fab..9a2ad343 100644
--- a/_alp/Classes/Class.J_EAConsumption.java
+++ b/_alp/Classes/Class.J_EAConsumption.java
@@ -1,10 +1,9 @@
 /**
  * J_EAConsumption
  */
-public class J_EAConsumption extends zero_engine.J_EAProfile{
+public class J_EAConsumption extends J_EAProfile{
 
 	private double yearlyDemand_kWh;
-
 	/**
      * Empty constructor for serialization
      */
@@ -55,69 +54,27 @@ else if (this.energyCarrier == OL_EnergyCarriers.HEAT) {
 
 		registerEnergyAsset(timeParameters);
     }
-
+    
+    //Getters
     public String getAssetName() {
     	return this.energyAssetName;
     }
-    
-    public void setConsumptionScaling_fr(double consumptionScaling_fr) {
-    	this.profileScaling_fr = consumptionScaling_fr;
-    }
-    
-    public double getConsumptionScaling_fr() {
-    	return this.profileScaling_fr;
-    }
-    
-    
-    /*@Override
-    public void f_updateAllFlows(double v_powerFraction_fr) {
-		throw new RuntimeException("J_EAConsumption.f_updateAllFlows() should be called without arguments!");
-	}
-	
-	public void f_updateAllFlows() {
-		double ratioOfCapacity = profilePointer.getCurrentValue();		
-		this.operate(ratioOfCapacity);
-		if (ratioOfCapacity>0.0) { // Skip when there is no consumption -> saves time?
-			if (parentAgent instanceof GridConnection) {    		
-	    		//((GridConnection)parentAgent).f_addFlows(arr, this);
-	    		((GridConnection)parentAgent).f_addFlows(flowsMap, this.energyUse_kW, assetFlowsMap, this);
-	    	}
-
-		}
-		this.lastFlowsMap.cloneMap(this.flowsMap);
-    	this.lastEnergyUse_kW = this.energyUse_kW;
-    	this.clear();
-    }
-    
-	@Override
-	public void operate(double ratioOfCapacity) {
-
-    	double consumption_kW = ratioOfCapacity * this.yearlyDemand_kWh * this.consumptionScaling_fr;
-		
-    	this.energyUse_kW = consumption_kW;
-    	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 J_ProfilePointer getProfilePointer() {
     	return this.profilePointer;
     }
-    
     @Override
     public double getBaseConsumption_kWh() {
     	return yearlyDemand_kWh;
     }
-    
+
 	@Override
 	public String toString() {
-		return
-			"type = " + this.getClass().toString() + " " +
-			"owner = " + this.getOwner() +" " +
-			"energyCarrier = " + this.energyCarrier + " " + 
-			"yearlyDemand_kWh = " + this.yearlyDemand_kWh;
+		return	"J_EAConsumption: " + 
+				"Owner: " + this.getOwner() + ", " + 
+				"EC: " + this.energyCarrier + ", " +
+				"AFC: " + this.assetFlowCategory + ", " +
+				"YearlyDemand_kWh: " + this.yearlyDemand_kWh + ", " +
+				"CurrentPower_kW: " + this.lastEnergyUse_kW + ", " +
+				"ProfScaling_fr = " + this.profileScaling_fr;
 	}
 }
diff --git a/_alp/Classes/Class.J_EAConversionHeatPump.java b/_alp/Classes/Class.J_EAConversionHeatPump.java
index 3e04f7aa..b5ce9646 100644
--- a/_alp/Classes/Class.J_EAConversionHeatPump.java
+++ b/_alp/Classes/Class.J_EAConversionHeatPump.java
@@ -144,13 +144,12 @@ public double getOutputTemperature_degC() {
 	@Override
 	public String toString() {
 		return
-			"J_EAConversionHeatPump: \n" +
-			"capacityElectricity_kW = " + inputCapacity_kW + "\n"+
-			"capacityHeat_kW = " + outputCapacity_kW +"\n"+
-			"baseTemperature_degC = " + baseTemperature_degC + "\n"+
-			"ambientTempType = " + ambientTempType + "\n"+
-			"sourceAssetHeatPower_kW = " + sourceAssetHeatPower_kW + "\n"+
-			"outputTemperature_degC = " + outputTemperature_degC +" \n"+
-			"energyUsed_kWh = " + energyUsed_kWh;
+			"J_EAConversionHeatPump: " +
+			"capElec_kW = " + inputCapacity_kW + "," +
+			"capHeat_kW = " + outputCapacity_kW + "," +
+			"baseT_degC = " + baseTemperature_degC + "," +
+			"ambTempType = " + ambientTempType + "," +
+			"sourceAssetHeatPower_kW = " + sourceAssetHeatPower_kW + "," +
+			"outT_degC = " + outputTemperature_degC;
 	}	
 }
diff --git a/_alp/Classes/Class.J_EAFlexProfile.java b/_alp/Classes/Class.J_EAFlexProfile.java
new file mode 100644
index 00000000..bdd6ff5e
--- /dev/null
+++ b/_alp/Classes/Class.J_EAFlexProfile.java
@@ -0,0 +1,145 @@
+import zeroPackage.ZeroMath;
+/**
+ * J_EAFlexProfile: Profile asset where the profile can be manipulated by setting the power fraction: 
+ * Example: Original value 10 kW? -> With power fraction of 0.8 it will end up being 8 kW instead. Or with power fraction of 1.5, it will become 15 kW!
+ * -> Not allowed to change the direction of the flow (i.e. negative power fraction is not allowed).
+ */	
+public class J_EAFlexProfile extends J_EAFlex implements I_ProfileAsset{
+	protected J_ProfilePointer profilePointer;
+	protected double profileUnitScaler_r = 4.0; // This factor translates tablefunction data in kWh/qh, normalized power or consumption-fraction into power [kW]. To go from kWh/qh to kW, that is a factor 4.
+	protected OL_EnergyCarriers energyCarrier; //
+	protected double lostLoad_kWh = 0;
+	protected double profileScaling_fr = 1.0; // This factor can be used to change the magnitude of the profile in this asset, for example when an energy-saving slider is operated.
+	protected double signScaler_r = 1.0;
+
+    /**
+     * Empty constructor for serialization
+     */
+    public J_EAFlexProfile() {
+    }
+
+    /**
+     * Constructor initializing the fields
+     */
+    public J_EAFlexProfile(I_AssetOwner owner, OL_EnergyCarriers energyCarrier, J_ProfilePointer profile, OL_AssetFlowCategories assetCategory, J_TimeParameters timeParameters) {
+	    this.setOwner(owner);
+	    this.timeParameters = timeParameters;
+	    this.energyCarrier = energyCarrier;
+		if (profile == null) {
+			throw new RuntimeException("Cannot create J_EAProfile without a valid ProfilePointer!");
+		} else {
+			profilePointer = profile;
+			if (profilePointer.getProfileUnits() == OL_ProfileUnits.KWHPQUARTERHOUR) {
+				profileUnitScaler_r = 4.0;
+			} else if (profilePointer.getProfileUnits() == OL_ProfileUnits.KW) {
+				profileUnitScaler_r = 1.0;				
+			} else {
+				throw new RuntimeException("Unsupported ProfileUnits of profilePointer for J_EAProfile!");
+			}
+		}	
+	    this.assetFlowCategory = assetCategory;
+	    
+	    this.activeConsumptionEnergyCarriers.add(this.energyCarrier);
+	    
+		registerEnergyAsset(timeParameters);
+	}
+    
+    @Override
+    public J_FlowPacket f_updateAllFlows(double powerFraction_fr, J_TimeVariables timeVariables) {
+     	operate(powerFraction_fr, timeVariables); // Don't cap the power fraction limit!
+     	J_FlowsMap flowsMapCopy = new J_FlowsMap();
+     	J_ValueMap assetFlowsMapCopy = new J_ValueMap(OL_AssetFlowCategories.class);
+     	J_FlowPacket flowPacket = new J_FlowPacket(flowsMapCopy.cloneMap(this.flowsMap), this.energyUse_kW, assetFlowsMapCopy.cloneMap(this.assetFlowsMap));
+    	this.lastFlowsMap.cloneMap(this.flowsMap);
+    	this.lastEnergyUse_kW = this.energyUse_kW;
+    	this.clear();
+    	return flowPacket;
+    }
+    
+	@Override
+	public void operate(double powerFraction_fr, J_TimeVariables timeVariables) {
+    	if(DoubleCompare.lessThanZero(powerFraction_fr)) {
+			throw new RuntimeException("Impossible to operate J_EAFlexProfile asset with negative powerfraction.");    		
+    	}
+    	double profileValue = profilePointer.getCurrentValue();		
+    	double currentPower_kW = profileValue * this.profileUnitScaler_r * this.profileScaling_fr * this.signScaler_r * powerFraction_fr;
+    	this.energyUse_kW = currentPower_kW;
+    	this.energyUsed_kWh += this.energyUse_kW * this.timeParameters.getTimeStep_h();
+    	flowsMap.put(this.energyCarrier, currentPower_kW);		
+		if (this.assetFlowCategory != null) {
+			assetFlowsMap.put(this.assetFlowCategory, Math.abs(currentPower_kW));
+		}
+   	}
+    
+    public J_ProfilePointer getProfilePointer() {
+    	return this.profilePointer;
+    }
+    
+    public double getProfileUnitScaler_fr() {
+    	return this.profileUnitScaler_r;
+    }
+    
+    public double getProfileScaling_fr() {
+    	return this.profileScaling_fr;
+    }
+    
+    public void setProfileScaling_fr( double scaling_fr ) {
+    	this.profileScaling_fr = scaling_fr;
+    }
+    
+    public double getPeakConsumptionPower_kW() {
+    	if (this.signScaler_r < 0) {
+    		return 0.0;
+	    } else {
+	    	return max(profilePointer.getAllValues()) * this.profileUnitScaler_r * this.profileScaling_fr;
+	    }
+    }
+    
+    public double getPeakProductionPower_kW() {
+    	if (this.signScaler_r > 0) {
+    		return 0.0;
+	    } else {
+	    	return max(profilePointer.getAllValues()) * this.profileUnitScaler_r * this.profileScaling_fr;
+	    }
+    }
+    
+    public double getBaseConsumption_kWh() {
+    	if (this.signScaler_r < 0) {
+    		return 0.0;
+	    } else {
+	    	double[] values = profilePointer.getAllValues();
+	    	double dataTimeStep_h = profilePointer.getDataTimeStep_h(); 
+	    	double baseConsumption_kWh = ZeroMath.arraySumPos(values) * dataTimeStep_h * this.profileUnitScaler_r;
+	    	return baseConsumption_kWh;
+	    }
+    }
+    
+    public double getTotalConsumption_kWh() {
+    	return this.getBaseConsumption_kWh() * this.profileScaling_fr;
+    }
+    
+    public OL_EnergyCarriers getEnergyCarrier() {
+    	return this.energyCarrier;
+    }
+    
+    public double[] getForecast_kW(double forecastStartTime_h, double forecastEndTime_h) {
+    	double timeWindow_h = forecastEndTime_h-forecastStartTime_h;
+    	int numberOfTimeSteps = roundToInt(timeWindow_h/timeParameters.getTimeStep_h());
+    	double[] forecast_kW = new double[numberOfTimeSteps];
+		double scalar = this.signScaler_r * getProfileUnitScaler_fr() * getProfileScaling_fr();
+		for (int i = 0; i < numberOfTimeSteps; i++) {
+			forecast_kW[i] += scalar * profilePointer.getValue(forecastStartTime_h + i*timeParameters.getTimeStep_h());
+		}
+    	return forecast_kW;
+    }
+    
+	@Override
+	public String toString() {
+		return	"J_EAFlexProfile: " + 
+				"Owner: " + this.getOwner() + ", " + 
+				"EC: " + this.energyCarrier + ", " +
+				"AFC: " + this.assetFlowCategory + ", " +
+				"CurrentPower_kW: " + this.lastEnergyUse_kW + ", " +
+				"ProfScaling_fr: " + this.profileScaling_fr;
+	}
+}
\ No newline at end of file
diff --git a/_alp/Classes/Class.J_EAProduction.java b/_alp/Classes/Class.J_EAProduction.java
index 2df84c3e..e22ba8cd 100644
--- a/_alp/Classes/Class.J_EAProduction.java
+++ b/_alp/Classes/Class.J_EAProduction.java
@@ -19,7 +19,6 @@ public J_EAProduction(I_AssetOwner owner, OL_EnergyAssetType type, String name,
 	    this.energyAssetType = type;
 	    this.energyAssetName = name;
 	    this.energyCarrier = energyCarrier;
-	    //this.capacity_kW = capacity_kW;
 	    this.signScaler_r = -1.0;
 		if (profile.getProfileUnits() == OL_ProfileUnits.NORMALIZEDPOWER) {
 			this.profileUnitScaler_r = capacity_kW;
@@ -44,6 +43,8 @@ public J_EAProduction(I_AssetOwner owner, OL_EnergyAssetType type, String name,
 		registerEnergyAsset(timeParameters);
 	}
 	
+	
+	//Setters
 	public void setCapacityElectric_kW(double capacityElectric_kW, GridConnection gc) {
 		// Calculate the difference with the set and the previous capacity to update totals in GC, GN and EnergyModel
 		if (energyCarrier == OL_EnergyCarriers.ELECTRICITY) {
@@ -72,6 +73,9 @@ else if (this.energyAssetType == OL_EnergyAssetType.PHOTOVOLTAIC) {
 		}
 	}
 	
+	
+	
+	//Getters
 	public double getCapacityElectric_kW() {
 		if (energyCarrier == OL_EnergyCarriers.ELECTRICITY) {
 			return this.profileUnitScaler_r;
@@ -91,50 +95,15 @@ public double getCapacityHeat_kW() {
 	public String getName() {
 		return this.energyAssetName;
 	}
-	
-	@Override
-    public void operate(J_TimeVariables timeVariables) {	
-		/*
-		ratioOfCapacity = profilePointer.getCurrentValue();
-		
-		//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
-	public void f_updateAllFlows(double v_powerFraction_fr) {
-		throw new RuntimeException("J_EAProduction.f_updateAllFlows() should be called without arguments!");
-	}
-	
-	public void f_updateAllFlows() {
-		double ratioOfCapacity = profilePointer.getCurrentValue();
-		
-		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);
-	       	if (parentAgent instanceof GridConnection) {    		
-	    		//((GridConnection)parentAgent).f_addFlows(arr, this);
-	    		((GridConnection)parentAgent).f_addFlows(flowsMap, this.energyUse_kW, assetFlowsMap, this);
-	    	}
-
-		}
-		this.lastFlowsMap.cloneMap(this.flowsMap);
-    	this.lastEnergyUse_kW = this.energyUse_kW;
-    	this.clear();
-    }*/
+    public double getEnergyCurtailed_kWh() {
+    	return this.totalEnergyCurtailed_kWh;
+    }
+    
+    public J_ProfilePointer getProfilePointer() {
+    	return this.profilePointer;
+    }
+    
+    
     
     public J_FlowPacket curtailEnergyCarrierProduction(OL_EnergyCarriers curtailedEnergyCarrier, double curtailmentAmount_kW) {  // The curtailment setpoint is the requested amount of curtailment; requested reduction of production. (which may or may not be provided, depending on what the current production is)
     	
@@ -155,18 +124,11 @@ public void f_updateAllFlows() {
     	this.lastFlowsMap.addFlow(curtailedEnergyCarrier, curtailmentPower_kW); // production is a negative flow, so to remove production, a positive value must be added to lastFlows.
     	this.lastEnergyUse_kW += curtailmentPower_kW; // production is a negative flow, so to remove production, a positive value must be added to lastEnergyUse_kW.
     	
-		//gc.f_removeFlows(curtailmentFlow, curtailedEnergyUse_kW, assetFlows_kW, this);
      	J_FlowPacket flowPacket = new J_FlowPacket(curtailmentFlow, curtailedEnergyUse_kW, assetFlows_kW);
      	return flowPacket;
     }
     
-    public double getEnergyCurtailed_kWh() {
-    	return this.totalEnergyCurtailed_kWh;
-    }
-    
-    public J_ProfilePointer getProfilePointer() {
-    	return this.profilePointer;
-    }
+
     
     @Override
     public void storeStatesAndReset() {
@@ -176,12 +138,11 @@ public void storeStatesAndReset() {
 	
 	@Override
 	public String toString() {
-		return
-			"type = " + this.getClass().toString() + " " +
-			"owner = " + this.getOwner() +" " +
-			"capacity_kW = " + profileUnitScaler_r +" "+
-			"energyCarrier = " + energyCarrier +" "+
-			"assetFlowCategory = " + this.assetFlowCategory + " " +
-			"energyProduced_kWh = " + (-this.energyUsed_kWh) +  " ";
+		return  "J_EAProduction: " +
+				"Owner: " + this.getOwner() + ", " +
+				"Capacity_kW: " + profileUnitScaler_r + ", " +
+				"EC: " + this.energyCarrier + ", " +
+				"AFC: " + this.assetFlowCategory + ", " +
+				"CurrentProd_kW: " + (-this.lastEnergyUse_kW);
 	}
 }
diff --git a/_alp/Classes/Class.J_EAProfile.java b/_alp/Classes/Class.J_EAProfile.java
index c0aaa0a8..ea89440f 100644
--- a/_alp/Classes/Class.J_EAProfile.java
+++ b/_alp/Classes/Class.J_EAProfile.java
@@ -2,7 +2,7 @@
 /**
  * J_EAProfile
  */
-public class J_EAProfile extends zero_engine.J_EAFixed{
+public class J_EAProfile extends J_EAFixed implements I_ProfileAsset{
 	protected J_ProfilePointer profilePointer;
 	protected double profileUnitScaler_r = 4.0; // This factor translates tablefunction data in kWh/qh, normalized power or consumption-fraction into power [kW]. To go from kWh/qh to kW, that is a factor 4.
 	protected OL_EnergyCarriers energyCarrier; // = OL_EnergyCarriers.ELECTRICITY;
@@ -88,6 +88,12 @@ public J_FlowPacket curtailElectricityConsumption(double curtailmentSetpoint_kW)
 
     }    
     
+    //Setters
+    public void setProfileScaling_fr( double scaling_fr ) {
+    	this.profileScaling_fr = scaling_fr;
+    }    
+    
+    //Getters
     public J_ProfilePointer getProfilePointer() {
     	return this.profilePointer;
     }
@@ -99,11 +105,7 @@ public double getProfileUnitScaler_fr() {
     public double getProfileScaling_fr() {
     	return this.profileScaling_fr;
     }
-    
-    public void setProfileScaling_fr( double scaling_fr ) {
-    	this.profileScaling_fr = scaling_fr;
-    }
-    
+        
     public double getPeakConsumptionPower_kW() {
     	if (this.signScaler_r < 0) {
     		return 0.0;
@@ -139,10 +141,24 @@ public OL_EnergyCarriers getEnergyCarrier() {
     	return this.energyCarrier;
     }
     
+    public double[] getForecast_kW(double forecastStartTime_h, double forecastEndTime_h) {
+    	double timeWindow_h = forecastEndTime_h-forecastStartTime_h;
+    	int numberOfTimeSteps = roundToInt(timeWindow_h/timeParameters.getTimeStep_h());
+    	double[] forecast_kW = new double[numberOfTimeSteps];
+		double scalar = this.signScaler_r * getProfileUnitScaler_fr() * getProfileScaling_fr();
+		for (int i = 0; i < numberOfTimeSteps; i++) {
+			forecast_kW[i] += scalar * profilePointer.getValue(forecastStartTime_h + i*timeParameters.getTimeStep_h());
+		}
+    	return forecast_kW;
+    }
+    
 	@Override
 	public String toString() {
-		return
-			"owner = " + this.getOwner() +", Energy consumed = " + this.energyUsed_kWh +
-			"assetFlowCategory = " + this.assetFlowCategory + " ";
+		return	"J_EAProfile: " + 
+				"Owner: " + this.getOwner() + ", " + 
+				"EC: " + this.energyCarrier + ", " +
+				"AFC: " + this.assetFlowCategory + ", " +
+				"CurrentPower_kW: " + this.lastEnergyUse_kW + ", " +
+				"ProfScaling_fr: " + this.profileScaling_fr;
 	}
 }
diff --git a/_alp/Classes/Class.J_EnergyManagementDefault.java b/_alp/Classes/Class.J_EnergyManagementDefault.java
index 27dac74d..11a6b021 100644
--- a/_alp/Classes/Class.J_EnergyManagementDefault.java
+++ b/_alp/Classes/Class.J_EnergyManagementDefault.java
@@ -26,7 +26,8 @@ public class J_EnergyManagementDefault implements I_EnergyManagement{
 													I_ChargingManagement.class, 
 													I_BatteryManagement.class,
 													I_BackupGeneratorManagement.class,
-													I_CurtailManagement.class
+													I_CurtailManagement.class,
+													J_FlexProfileManagementDefault.class
 												));
 	Map<Class<? extends I_AssetManagement>, I_AssetManagement> activeExternalAssetManagements = new HashMap();			
 	
@@ -52,27 +53,32 @@ public void manageFlexAssets(J_TimeVariables timeVariables) {
     		this.checkConfiguration(GC.c_flexAssets);
     	}
     	
-    	//1. Call Heating management
+    	//1. Flex profile management (only default)
+    	if(this.getExternalAssetManagement(I_FlexProfileManagement.class) != null) {
+    		this.getExternalAssetManagement(I_FlexProfileManagement.class).manageFlexProfiles(timeVariables);
+    	}
+    	
+    	//2. Call Heating management
     	if(this.getExternalAssetManagement(I_HeatingManagement.class) != null) {
     		this.getExternalAssetManagement(I_HeatingManagement.class).manageHeating(timeVariables);
     	}
     	
-    	//2. Call Charging management
+    	//3. Call Charging management
     	if(this.getExternalAssetManagement(I_ChargingManagement.class) != null) {
     		this.getExternalAssetManagement(I_ChargingManagement.class).manageCharging(GC.f_getChargePoint(), timeVariables);
     	}
     	
-    	//3. Call Battery management
+    	//4. Call Battery management
     	if(this.getExternalAssetManagement(I_BatteryManagement.class) != null) {
     		this.getExternalAssetManagement(I_BatteryManagement.class).manageBattery(timeVariables);
     	}
     	
-    	//4. Call BackupGenerator management
+    	//5. Call BackupGenerator management
     	if(this.getExternalAssetManagement(I_BackupGeneratorManagement.class) != null) {
     		this.getExternalAssetManagement(I_BackupGeneratorManagement.class).manageBackupGenerator(timeVariables);
     	}
     	
-    	//5. Call curtailment management
+    	//6. Call curtailment management
     	if(this.getExternalAssetManagement(I_CurtailManagement.class) != null) {
     		this.getExternalAssetManagement(I_CurtailManagement.class).manageCurtailment(timeVariables);
     	}
diff --git a/_alp/Classes/Class.J_FlexProfileManagementDefault.java b/_alp/Classes/Class.J_FlexProfileManagementDefault.java
new file mode 100644
index 00000000..88cdf05e
--- /dev/null
+++ b/_alp/Classes/Class.J_FlexProfileManagementDefault.java
@@ -0,0 +1,46 @@
+/**
+ * J_FlexProfileManagementDefault: Does not shift profiles, just plays them as normal.
+ */	
+public class J_FlexProfileManagementDefault implements I_FlexProfileManagement{
+	private GridConnection gc;
+	private J_TimeParameters timeParameters;
+    /**
+     * Empty constructor for serialization
+     */
+    public J_FlexProfileManagementDefault() {
+    }
+    
+    /**
+     * Default constructor
+     */
+    public J_FlexProfileManagementDefault(GridConnection gc, J_TimeParameters timeParameters) {
+    	this.gc = gc;
+    	this.timeParameters = timeParameters;
+    }
+    
+    public void manageFlexProfiles(J_TimeVariables timeVariables) {   	
+    	gc.c_flexProfileAssets.forEach(flexProfile -> gc.f_updateFlexAssetFlows(flexProfile, 1.0, timeVariables));
+    }
+    
+    ////Store and reset states
+	public void storeStatesAndReset() {
+		//Nothing to store and reset
+	}
+	public void restoreStates() {
+		//Nothing to restore
+	}
+	
+	@Override
+	public String toString() {
+		List<J_EAFlexProfile> flexProfiles = gc.c_flexProfileAssets;
+		StringBuilder flexProfilesString = new StringBuilder();
+		for(J_EAFlexProfile flexProfile : flexProfiles) {
+			flexProfilesString.append(System.lineSeparator());
+			flexProfilesString.append(flexProfile.toString());
+		}
+		
+		return "J_FlexProfileManagementDefault: " + System.lineSeparator() +
+				"Currently controlling J_EAFlexProfiles: " + 
+				flexProfilesString.toString();
+	}
+}
\ No newline at end of file
diff --git a/_alp/Classes/Class.J_FlexProfileManagementHeatprofileHeatpump.java b/_alp/Classes/Class.J_FlexProfileManagementHeatprofileHeatpump.java
new file mode 100644
index 00000000..b4738f86
--- /dev/null
+++ b/_alp/Classes/Class.J_FlexProfileManagementHeatprofileHeatpump.java
@@ -0,0 +1,173 @@
+/**
+ * J_FlexProfileManagementHeatprofileHeatpump
+ */	
+public class J_FlexProfileManagementHeatprofileHeatpump implements I_FlexProfileManagement{
+
+	private GridConnection gc;
+	private J_TimeParameters timeParameters;
+	private double[] flexProfileSetpointArray_fr;
+	private int currentFlexProfileSetpointArrayIndex;
+	private double forecastingDuration_h = 24;
+	private double maxFlexProfileShift_fr = 0.3;// maximum shift per timestep.
+	
+    /**
+     * Empty constructor for serialization
+     */
+    public J_FlexProfileManagementHeatprofileHeatpump() {
+    }
+    
+    /**
+     * Default constructor
+     */
+    public J_FlexProfileManagementHeatprofileHeatpump(GridConnection gc, J_TimeParameters timeParameters) {
+    	this.gc = gc;
+    	this.timeParameters = timeParameters;
+    	this.flexProfileSetpointArray_fr = new double[roundToInt(forecastingDuration_h/timeParameters.getTimeStep_h())];
+    	Arrays.fill(flexProfileSetpointArray_fr, 1.0);
+    	this.currentFlexProfileSetpointArrayIndex = 0; // Is not in sync with real t_h, but doesnt matter, forecast will reset at right time and override.
+    }
+    
+    public void manageFlexProfiles(J_TimeVariables timeVariables) {
+    	if(timeVariables.getT_h() % forecastingDuration_h == 0) {
+    		createNewFlexProfileSetpointArray(timeVariables);
+    	}
+    	
+    	List<J_EAFlexProfile> flexibleHeatProfiles = findAll(gc.c_flexProfileAssets, flexProfile -> flexProfile.getEnergyCarrier() == OL_EnergyCarriers.HEAT);
+    	
+    	gc.f_updateFlexAssetFlows(flexibleHeatProfiles.get(0), flexProfileSetpointArray_fr[currentFlexProfileSetpointArrayIndex], timeVariables);
+    	currentFlexProfileSetpointArrayIndex++;
+    }
+    
+    
+    
+    private void createNewFlexProfileSetpointArray(J_TimeVariables timeVariables) {
+    	int numberOfTimeSteps = roundToInt(forecastingDuration_h/timeParameters.getTimeStep_h());
+    	
+    	//Get fixed nettobalance forecast
+    	double[] nettoBalanceForecastElectricity_kW = gc.f_getFixedAssetForecast(timeVariables.getT_h(), timeVariables.getT_h() + forecastingDuration_h, OL_EnergyCarriers.ELECTRICITY, timeParameters);
+    	
+    	//Get flexprofile netto Heat balance forecast
+    	double[] originalFlexprofileNettoHeatBalance_kW = new double[numberOfTimeSteps];
+    	List<J_EAFlexProfile> flexibleHeatProfiles = findAll(gc.c_flexProfileAssets, flexProfile -> flexProfile.getEnergyCarrier() == OL_EnergyCarriers.HEAT);
+    	
+    	if(flexibleHeatProfiles.size() == 0 || flexibleHeatProfiles.size() > 1 || gc.f_getCurrentHeatingType() != OL_GridConnectionHeatingType.ELECTRIC_HEATPUMP || gc.f_getHeatingTypeIsGhost()) {
+    		throw new RuntimeException("Flex profile management heatprofile heatpump active with multiple, or without a heat flex profile or (non ghost) heatpump being present!");
+    	}
+    	
+    	originalFlexprofileNettoHeatBalance_kW = LUXMath.addArrays(originalFlexprofileNettoHeatBalance_kW, flexibleHeatProfiles.get(0).getForecast_kW(timeVariables.getT_h(), timeVariables.getT_h() + forecastingDuration_h));
+    	
+    	//Convert flexprofile to (forecasted) electricity profile
+		double[] originalFlexprofileNettoElectricityBalance_kW = new double[numberOfTimeSteps];
+		
+		//Calculate the actual power the heating asset would use (by calculating the efficiency) and add to nettoBalance_kW
+		J_EAConversionHeatPump heatPump = (J_EAConversionHeatPump)gc.c_heatingAssets.get(0);
+		double[] invCOP = new double[numberOfTimeSteps];
+		//Todo -> Make work for other ambient temp types!
+		J_ProfilePointer ambientTemperatures = gc.energyModel.pp_ambientTemperature_degC;
+		for (int i = 0; i < numberOfTimeSteps; i++) {
+			invCOP[i] = 1.0/heatPump.calculateCOP(heatPump.getOutputTemperature_degC(), ambientTemperatures.getValue(timeVariables.getT_h() + i * timeParameters.getTimeStep_h()));
+		}
+		originalFlexprofileNettoElectricityBalance_kW = LUXMath.multiplyArrays(originalFlexprofileNettoHeatBalance_kW, invCOP);
+		
+		
+		//Calculate total
+		double[] totalElectricityBalanceForecast_kW = LUXMath.addArrays(nettoBalanceForecastElectricity_kW, originalFlexprofileNettoElectricityBalance_kW);
+    	
+		////Determine power fraction of flex profile, and store!
+		double[] newFlexProfileSetpointArray = new double[numberOfTimeSteps];
+		
+		
+		// --- Peak shaving + self-consumption via water-filling, total heat is conserved ---
+		// One "water level" W on the total electricity curve does everything:
+		// total[i] = base[i] + flexElec[i] * f[i]
+		// Steps that can reach W settle at total[i] = W; steps that can't are pinned
+		// at their shift limit (f = L or f = U). Raising W pours the fixed heat budget
+		// into the lowest valleys first -> (a) minimises the peak and (b) fills the
+		// deepest (export) valleys first = maximises self-consumption.
+		// f stays in [L, U]; heat is conserved.
+		
+		final double L = 1.0 - maxFlexProfileShift_fr;
+		final double U = 1.0 + maxFlexProfileShift_fr;
+
+		final double[] base     = nettoBalanceForecastElectricity_kW;
+		final double[] flexElec = originalFlexprofileNettoElectricityBalance_kW;
+		final double[] heat     = originalFlexprofileNettoHeatBalance_kW;
+
+		// Heat to preserve over the horizon (== the sum at f == 1 everywhere).
+		double totalHeatTarget = 0.0;
+		for (int i = 0; i < numberOfTimeSteps; i++) totalHeatTarget += heat[i];
+
+		// Bracket the water level by the totals reachable within the shift band.
+		double wLow = Double.POSITIVE_INFINITY, wHigh = Double.NEGATIVE_INFINITY;
+		for (int i = 0; i < numberOfTimeSteps; i++) {
+		    if (flexElec[i] == 0.0) continue;       // no electricity coupling, no heat
+		    double tA = base[i] + flexElec[i] * L;
+		    double tB = base[i] + flexElec[i] * U;
+		    wLow  = min(wLow,  min(tA, tB));
+		    wHigh = max(wHigh, max(tA, tB));
+		}
+
+		double level = 1.0; // fallback only if there is no flex at all
+		if (wLow <= wHigh) {
+		    // sum_i heat[i]*f(W) is monotonically increasing in W (per-step slope is
+		    // heat[i]/flexElec[i] == COP[i] > 0), so binary-search the W that conserves heat.
+		    double lo = wLow, hi = wHigh;
+		    for (int iter = 0; iter < 200 && (hi - lo) > 1e-9; iter++) {
+		        double mid = 0.5 * (lo + hi);
+		        double heatSum = 0.0;
+		        for (int i = 0; i < numberOfTimeSteps; i++) {
+		            if (flexElec[i] == 0.0) continue;
+		            double f = (mid - base[i]) / flexElec[i];
+		            f = max(L, min(U, f));
+		            heatSum += heat[i] * f;
+		        }
+		        if (heatSum >= totalHeatTarget) hi = mid; else lo = mid;
+		    }
+		    level = 0.5 * (lo + hi);
+		}
+
+		// Materialise the power fractions at the solved level.
+		for (int i = 0; i < numberOfTimeSteps; i++) {
+		    if (flexElec[i] == 0.0) {               // nothing to shift here
+		        newFlexProfileSetpointArray[i] = 1.0;
+		        continue;
+		    }
+		    double f = (level - base[i]) / flexElec[i];
+		    newFlexProfileSetpointArray[i] = max(L, min(U, f));
+		}
+    	
+		//Store new array
+		this.currentFlexProfileSetpointArrayIndex = 0;
+		this.flexProfileSetpointArray_fr = newFlexProfileSetpointArray;
+    }
+    
+    //Setters
+    public void setMaxFlexProfileShift_fr(double maxFlexProfileShift_fr) {
+    	if(maxFlexProfileShift_fr<0) {
+    		throw new RuntimeException("Trying to set the max flex profile shift of J_EMS_NBH_LocalBalance_Internal to a negative value, not allowed!");
+    	}
+    	this.maxFlexProfileShift_fr = maxFlexProfileShift_fr;
+    }
+    
+    ////Store and reset states
+	public void storeStatesAndReset() {
+		//Nothing to store and reset
+	}
+	public void restoreStates() {
+		//Nothing to restore
+	}
+	
+	@Override
+	public String toString() {
+		List<J_EAFlexProfile> flexProfiles = gc.c_flexProfileAssets;
+		StringBuilder flexProfilesString = new StringBuilder();
+		for(J_EAFlexProfile flexProfile : flexProfiles) {
+			flexProfilesString.append(System.lineSeparator());
+			flexProfilesString.append(flexProfile.toString());
+		}
+		
+		return "J_FlexProfileManagementHeatprofileHeatpump: " + System.lineSeparator() +
+				"Currently controlling J_EAFlexProfiles: " + 
+				flexProfilesString.toString();
+	}
+}
\ No newline at end of file
diff --git a/_alp/Classes/Class.J_HeatingManagementNeighborhood.java b/_alp/Classes/Class.J_HeatingManagementNeighborhood.java
index 200e0966..93b50c8a 100644
--- a/_alp/Classes/Class.J_HeatingManagementNeighborhood.java
+++ b/_alp/Classes/Class.J_HeatingManagementNeighborhood.java
@@ -31,7 +31,7 @@ public class J_HeatingManagementNeighborhood implements I_HeatingManagement {
   
 	private J_HeatingPreferences heatingPreferences = null; // Not needed for neighbourhoods
 	
-    private HashMap<String, J_EAConsumption> heatDemandProfiles = new HashMap<String, J_EAConsumption>();
+    private HashMap<String, I_ProfileAsset> heatDemandProfiles = new HashMap<>();
 
     private double thresholdCOP_hybridHeatpump = 3.5;
 
@@ -306,7 +306,7 @@ public void setHeatingMethodPct_agriculture( double[] pctArray ) {
     	amountOfDistrictHeating_agriculture_fr = pctArray[3]/100;
     }
     
-    public void addHeatDemandProfile(String name, J_EAConsumption profile) {
+    public void addHeatDemandProfile(String name, I_ProfileAsset profile) {
     	heatDemandProfiles.put(name, profile);
     }
     
@@ -318,6 +318,9 @@ public J_HeatingPreferences getHeatingPreferences() {
     	return this.heatingPreferences;
     }
     
+    public I_ProfileAsset getHeatDemandProfile(String name) {
+    	return heatDemandProfiles.get(name);
+    }
     
     
     //Get parentagent
diff --git a/_alp/Classes/Class.J_HeatingManagementSimple.java b/_alp/Classes/Class.J_HeatingManagementSimple.java
index 61c50b9f..ef791085 100644
--- a/_alp/Classes/Class.J_HeatingManagementSimple.java
+++ b/_alp/Classes/Class.J_HeatingManagementSimple.java
@@ -174,7 +174,8 @@ public void initializeAssets() {
         	}
     	}
     	J_EAProfile heatProfile = findFirst(gc.c_profileAssets, x -> x.getEnergyCarrier() == OL_EnergyCarriers.HEAT);
-    	if (heatProfile == null && this.building == null) {
+    	J_EAFlexProfile heatFlexProfile = findFirst(gc.c_flexProfileAssets, x -> x.getEnergyCarrier() == OL_EnergyCarriers.HEAT);
+    	if (heatProfile == null && heatFlexProfile == null && this.building == null) {
     		throw new RuntimeException(this.getClass() + " requires a heat demand asset.");
     	}
     	if (gc.c_heatingAssets.size() == 0) {
diff --git a/_alp/Classes/Class.J_ProfileForecaster.java b/_alp/Classes/Class.J_ProfileForecaster.java
index fea49452..0aaac4bb 100644
--- a/_alp/Classes/Class.J_ProfileForecaster.java
+++ b/_alp/Classes/Class.J_ProfileForecaster.java
@@ -3,10 +3,10 @@
  */	
 public class J_ProfileForecaster{
 	
-	public String name = "";
-	public J_ProfilePointer profilePointer;
-	public double forecastTime_h = 0;
-	public double timeStep_h = 0;
+	private String name = "";
+	private J_ProfilePointer profilePointer;
+	private double forecastTime_h = 0;
+	private double timeStep_h = 0;
 	private double currentForecast = 0;
 	
     /**
@@ -18,7 +18,7 @@ public J_ProfileForecaster() {
 	
     public J_ProfileForecaster(String forecastName, J_ProfilePointer pp, double forecastTime_h, double currentTime_h, double timeStep_h) {
     	if (forecastName == null) {
-    		this.name = pp.name + " " + forecastTime_h + " h";
+    		this.name = pp.getName() + " " + forecastTime_h + " h";
     	}
     	else {
     		this.name = forecastName;
diff --git a/_alp/Classes/Class.J_ProfilePointer.java b/_alp/Classes/Class.J_ProfilePointer.java
index 92e6b3b8..b22f8e6b 100644
--- a/_alp/Classes/Class.J_ProfilePointer.java
+++ b/_alp/Classes/Class.J_ProfilePointer.java
@@ -16,7 +16,7 @@
 @JsonIdentityInfo(generator = ObjectIdGenerators.UUIDGenerator.class, property = "@id")
 
 public class J_ProfilePointer{
-	public String name = "";
+	private String name = "";
 	private double currentValue = 0;
 	private OL_ProfileUnits profileUnits;
 	
@@ -53,13 +53,11 @@ public double getCurrentValue() {
     }
     
     public double getValue(double time_h) {
-    	//return this.tableFunction.get(t_h);
     	int index_n = (int)((time_h-dataStartTime_h)/dataTimeStep_h);
     	if (enableProfileLooping && index_n >= a_profile.length) {
     		index_n = index_n % a_profile.length;
     	} else if ( index_n >= a_profile.length ) {
     		traceln("Time out of upper bound for evaluating J_EAProfile power in profile %s!", this.name);
-//    		time_h = a_energyProfile_kWh.length * profileTimestep_h - 1;
     		throw new RuntimeException(String.format("Time out of upper bound for evaluating J_EAProfile power! Time is: %s", time_h));
     	}
     	if ( index_n < 0 ) {
@@ -71,7 +69,6 @@ public double getValue(double time_h) {
     }
        
     public double[] getAllValues() {
-    	//return this.tableFunction.getValues();
     	return this.a_profile.clone();
     }
     
@@ -100,6 +97,10 @@ public OL_ProfileUnits getProfileUnits() {
     	return profileUnits;
     }
     
+    public String getName() {
+    	return this.name;
+    }
+    
 	@Override
 	public String toString() {
 		return "profile: " + this.name + " current value: " + this.currentValue; 
diff --git a/_alp/Classes/Class.LUXMath.java b/_alp/Classes/Class.LUXMath.java
new file mode 100644
index 00000000..a48b9e27
--- /dev/null
+++ b/_alp/Classes/Class.LUXMath.java
@@ -0,0 +1,82 @@
+/**
+ * LUXMath
+ */	
+public class LUXMath {
+	
+	public static double[] addArrays(double[] array1, double[] array2) {
+		double[] result = new double[array1.length];
+		for (int i = 0; i < array1.length; i++) {
+		    result[i] = array1[i] + array2[i];
+		}
+		return result;
+	}
+	
+	public static int[] addArrays(int[] array1, int[] array2) {
+		int[] result = new int[array1.length];
+
+		for (int i = 0; i < array1.length; i++) {
+		    result[i] = array1[i] + array2[i];
+		}
+		return result;
+	}
+	
+	public static double sumArray(double[] array) {
+		double sum = 0;
+	    for (double n : array) {
+	    	sum += n;
+	    }
+	    return sum;
+	}
+	
+	public static int sumArray(int[] array) {
+	    int sum = 0;
+	    for (int n : array) {
+	    	sum += n;
+	    }
+	    return sum;
+	}
+	
+	public static double sumArrayPos(double[] array) {
+		double sum = 0;
+	    for (double n : array) {
+	    	if (n > 0) {
+	    		sum += n;
+	    	}
+	    }
+	    return sum;
+	}
+	
+	public static double sumArrayNeg(double[] array) {
+		double sum = 0;
+	    for (double n : array) {
+	    	if (n < 0) {
+	    		sum += n;
+	    	}
+	    }
+	    return sum;
+	}
+	
+	public static double[] multiplyArray(double[] array, double value) {
+		double[] result = new double[array.length];
+	    for (int i = 0; i < array.length; i++) {
+	        result[i] = array[i] * value;
+	    }
+	    return result;
+	}
+	
+	public static double[] multiplyArrays(double[] array1, double[] array2) {
+		double[] result = new double[array1.length];
+	    for (int i = 0; i < array1.length; i++) {
+	        result[i] = array1[i] * array2[i];
+	    }
+	    return result;
+	}
+	
+	public static double[] reciprocal(double[] array) {
+	    double[] result = new double[array.length];
+	    for (int i = 0; i < array.length; i++) {
+	        result[i] = 1.0 / array[i];
+	    }
+	    return result;
+	}
+}
\ No newline at end of file