diff --git a/_alp/Agents/A_SubTenant/AOC.A_SubTenant.xml b/_alp/Agents/A_SubTenant/AOC.A_SubTenant.xml
index 42791de0..11daccec 100644
--- a/_alp/Agents/A_SubTenant/AOC.A_SubTenant.xml
+++ b/_alp/Agents/A_SubTenant/AOC.A_SubTenant.xml
@@ -169,25 +169,6 @@
 			<LineArrowPosition>END</LineArrowPosition>
 		</AgentLink>
 	</AgentLinks>
-	<ContainerLinks>
-		<ContainerLink>
-			<Id>1658752707227</Id>
-			<Name><![CDATA[energyModel]]></Name>
-			<X>50</X>
-			<Y>-100</Y>
-			<Label>
-				<X>10</X>
-				<Y>0</Y>
-			</Label>
-			<PublicFlag>false</PublicFlag>
-			<PresentationFlag>true</PresentationFlag>
-			<ShowLabel>true</ShowLabel>
-			<ActiveObjectClass>
-				<PackageName>zero_engine</PackageName>
-				<ClassName>EnergyModel</ClassName>
-			</ActiveObjectClass>
-		</ContainerLink>
-	</ContainerLinks>
 	<Presentation>
 		<Level>
 			<Id>1658752695710</Id>
diff --git a/_alp/Agents/EnergyModel/Code/Functions.java b/_alp/Agents/EnergyModel/Code/Functions.java
index 9504b459..64409467 100644
--- a/_alp/Agents/EnergyModel/Code/Functions.java
+++ b/_alp/Agents/EnergyModel/Code/Functions.java
@@ -42,15 +42,14 @@
 b_isLastTimeStepOfDay = t_h % 24 == (24-p_timeStep_h);
 t_hourOfDay = t_h % 24; // Assumes modelrun starts at midnight.
 
-
-v_currentAmbientTemperature_degC = pp_ambientTemperature_degC.getCurrentValue();
 c_profiles.forEach(p -> p.updateValue(t_h));
-v_currentWindPowerNormalized_r = pp_windProduction_fr.getCurrentValue();
-v_currentSolarPowerNormalized_r = pp_PVProduction35DegSouth_fr.getCurrentValue();
+//v_currentAmbientTemperature_degC = pp_ambientTemperature_degC.getCurrentValue();
+//v_currentWindPowerNormalized_r = pp_windProduction_fr.getCurrentValue();
+//v_currentSolarPowerNormalized_r = pp_PVProduction35DegSouth_fr.getCurrentValue();
 //v_currentCookingDemand_fr = tf_cooking_demand(t_h);
 
 if (b_enableDLR) {
-	v_currentDLRfactor_fr = 1 + max(-0.1,v_currentWindPowerNormalized_r * 0.025*(30-v_currentAmbientTemperature_degC) + 0.5 - v_currentSolarPowerNormalized_r);
+	v_currentDLRfactor_fr = 1 + max(-0.1,pp_windProduction_fr.getCurrentValue() * 0.025*(30-pp_ambientTemperature_degC.getCurrentValue()) + 0.5 - pp_PVProduction35DegSouth_fr.getCurrentValue());
 	//v_currentDLRfactor_fr = 1 + uniform(-0.1, 1.0);
 	v_minDLRfactor_fr = min (v_minDLRfactor_fr, v_currentDLRfactor_fr);
 	v_maxDLRfactor_fr = max (v_maxDLRfactor_fr, v_currentDLRfactor_fr);
@@ -68,14 +67,14 @@
 
 // Update forecasts,  the relevant profile pointers are already updated above
 c_forecasts.forEach(f -> f.updateForecast(t_h));
-v_SolarYieldForecast_fr = pf_PVProduction35DegSouth_fr.getForecast();
-v_WindYieldForecast_fr = pf_windProduction_fr.getForecast();
+//v_SolarYieldForecast_fr = pf_PVProduction35DegSouth_fr.getForecast();
+//v_WindYieldForecast_fr = pf_windProduction_fr.getForecast();
 // The ElectricityYieldForecast assumes solar and wind forecasts have the same forecast time
 if ( v_liveAssetsMetaData.totalInstalledPVPower_kW + v_liveAssetsMetaData.totalInstalledWindPower_kW > 0 ) {
-	v_electricityYieldForecast_fr = (v_SolarYieldForecast_fr * v_liveAssetsMetaData.totalInstalledPVPower_kW + v_WindYieldForecast_fr * v_liveAssetsMetaData.totalInstalledWindPower_kW) / (v_liveAssetsMetaData.totalInstalledPVPower_kW + v_liveAssetsMetaData.totalInstalledWindPower_kW);
+	v_electricityYieldForecast_fr = (pf_PVProduction35DegSouth_fr.getForecast() * v_liveAssetsMetaData.totalInstalledPVPower_kW + pf_windProduction_fr.getForecast() * v_liveAssetsMetaData.totalInstalledWindPower_kW) / (v_liveAssetsMetaData.totalInstalledPVPower_kW + v_liveAssetsMetaData.totalInstalledWindPower_kW);
 }
 // And price forecast! 
-v_epexForecast_eurpkWh = 0.001*pf_dayAheadElectricityPricing_eurpMWh.getForecast();
+//v_epexForecast_eurpkWh = 0.001*pf_dayAheadElectricityPricing_eurpMWh.getForecast();
 
 for (GridNode GN : c_gridNodeExecutionList) {
 	GN.f_updateForecasts();
@@ -883,7 +882,7 @@ EnergyCoop f_addProductionEnergyCarrier(OL_EnergyCarriers EC)
 				//Do nothing, use preset ambient temp
 				break;
 			case AMBIENT_AIR:
-				((J_EAStorageHeat)e).updateAmbientTemperature( v_currentAmbientTemperature_degC );
+				((J_EAStorageHeat)e).updateAmbientTemperature( pp_ambientTemperature_degC.getCurrentValue() );
 				break;
 			case BUILDING:
 				new RuntimeException("AmbientTempType 'BUILDING' is not supported yet for J_EAStorageHeat!");
@@ -912,7 +911,7 @@ EnergyCoop f_addProductionEnergyCarrier(OL_EnergyCarriers EC)
 				//Do nothing, use preset ambient temp
 				break;
 			case AMBIENT_AIR:
-				((J_EAConversionHeatPump)e).updateAmbientTemperature( v_currentAmbientTemperature_degC );
+				((J_EAConversionHeatPump)e).updateAmbientTemperature( pp_ambientTemperature_degC.getCurrentValue() );
 				break;
 			case BUILDING:
 				new RuntimeException("AmbientTempType 'BUILDING' is not supported yet for J_EAConversionHeatPump!");
@@ -936,7 +935,7 @@ EnergyCoop f_addProductionEnergyCarrier(OL_EnergyCarriers EC)
 	}
 	if( e instanceof J_EABuilding ) {
 		//traceln("v_currentSolarPowerNormalized_r: %s", v_currentSolarPowerNormalized_r);
-		((J_EABuilding)e).updateSolarRadiation(v_currentSolarPowerNormalized_r*1000);
+		((J_EABuilding)e).updateSolarRadiation(pp_PVProduction35DegSouth_fr.getCurrentValue()*1000);
 	}
 }
 /*ALCODEEND*/}
diff --git a/_alp/Agents/EnergyModel/Code/Functions.xml b/_alp/Agents/EnergyModel/Code/Functions.xml
index fa4c56a3..a015d1ce 100644
--- a/_alp/Agents/EnergyModel/Code/Functions.xml
+++ b/_alp/Agents/EnergyModel/Code/Functions.xml
@@ -241,8 +241,8 @@
 		<ReturnType>ArrayList&lt;GridConnection&gt;</ReturnType>
 		<Id>1716890117265</Id>
 		<Name><![CDATA[f_getActiveGridConnections]]></Name>
-		<X>1580</X>
-		<Y>730</Y>
+		<X>1640</X>
+		<Y>370</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -273,8 +273,8 @@
 		<ReturnType>ArrayList&lt;ConnectionOwner&gt;</ReturnType>
 		<Id>1716897568717</Id>
 		<Name><![CDATA[f_getConnectionOwners]]></Name>
-		<X>1580</X>
-		<Y>770</Y>
+		<X>1640</X>
+		<Y>410</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -289,8 +289,8 @@
 		<ReturnType>double</ReturnType>
 		<Id>1716899946694</Id>
 		<Name><![CDATA[f_getTopLevelGridCapacity_kW]]></Name>
-		<X>1580</X>
-		<Y>790</Y>
+		<X>1640</X>
+		<Y>430</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -305,8 +305,8 @@
 		<ReturnType>ArrayList&lt;J_EA&gt;</ReturnType>
 		<Id>1717058801652</Id>
 		<Name><![CDATA[f_getEnergyAssets]]></Name>
-		<X>1580</X>
-		<Y>810</Y>
+		<X>1640</X>
+		<Y>450</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -321,8 +321,8 @@
 		<ReturnType>ArrayList&lt;GridNode&gt;</ReturnType>
 		<Id>1718289616227</Id>
 		<Name><![CDATA[f_getGridNodesTopLevel]]></Name>
-		<X>1580</X>
-		<Y>860</Y>
+		<X>1640</X>
+		<Y>500</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -337,8 +337,8 @@
 		<ReturnType>ArrayList&lt;GridNode&gt;</ReturnType>
 		<Id>1718289761647</Id>
 		<Name><![CDATA[f_getGridNodesNotTopLevel]]></Name>
-		<X>1580</X>
-		<Y>880</Y>
+		<X>1640</X>
+		<Y>520</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -407,8 +407,8 @@
 		<ReturnType>ArrayList&lt;GridConnection&gt;</ReturnType>
 		<Id>1727167397666</Id>
 		<Name><![CDATA[f_getPausedGridConnections]]></Name>
-		<X>1580</X>
-		<Y>750</Y>
+		<X>1640</X>
+		<Y>390</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -475,8 +475,8 @@
 		<ReturnType>EnergyCoop</ReturnType>
 		<Id>1739958854535</Id>
 		<Name><![CDATA[f_addEnergyCoop]]></Name>
-		<X>1580</X>
-		<Y>540</Y>
+		<X>1640</X>
+		<Y>180</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -495,8 +495,8 @@
 		<ReturnType>EnergyCoop</ReturnType>
 		<Id>1739972940581</Id>
 		<Name><![CDATA[f_removeEnergyCoop]]></Name>
-		<X>1580</X>
-		<Y>560</Y>
+		<X>1640</X>
+		<Y>200</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -515,8 +515,8 @@
 		<ReturnType>EnergyCoop</ReturnType>
 		<Id>1740056275008</Id>
 		<Name><![CDATA[f_addConsumptionEnergyCarrier]]></Name>
-		<X>1580</X>
-		<Y>600</Y>
+		<X>1640</X>
+		<Y>240</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -535,8 +535,8 @@
 		<ReturnType>double</ReturnType>
 		<Id>1741710906926</Id>
 		<Name><![CDATA[f_updateActiveAssetsMetaData]]></Name>
-		<X>1580</X>
-		<Y>440</Y>
+		<X>1640</X>
+		<Y>80</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -551,8 +551,8 @@
 		<ReturnType>EnergyCoop</ReturnType>
 		<Id>1746021439807</Id>
 		<Name><![CDATA[f_addProductionEnergyCarrier]]></Name>
-		<X>1580</X>
-		<Y>620</Y>
+		<X>1640</X>
+		<Y>260</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -635,8 +635,8 @@
 		<ReturnType>EnergyCoop</ReturnType>
 		<Id>1754379679149</Id>
 		<Name><![CDATA[f_addAssetFlow]]></Name>
-		<X>1580</X>
-		<Y>640</Y>
+		<X>1640</X>
+		<Y>280</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -655,8 +655,8 @@
 		<ReturnType>List&lt;GridConnection&gt;</ReturnType>
 		<Id>1754908171225</Id>
 		<Name><![CDATA[f_getGridConnectionsCollectionPointer]]></Name>
-		<X>1580</X>
-		<Y>920</Y>
+		<X>1640</X>
+		<Y>560</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -671,8 +671,8 @@
 		<ReturnType>List&lt;GridConnection&gt;</ReturnType>
 		<Id>1755014169405</Id>
 		<Name><![CDATA[f_getPausedGridConnectionsCollectionPointer]]></Name>
-		<X>1580</X>
-		<Y>940</Y>
+		<X>1640</X>
+		<Y>580</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
diff --git a/_alp/Agents/EnergyModel/EmbeddedObjects.xml b/_alp/Agents/EnergyModel/EmbeddedObjects.xml
index da40a133..8a3bd0fe 100644
--- a/_alp/Agents/EnergyModel/EmbeddedObjects.xml
+++ b/_alp/Agents/EnergyModel/EmbeddedObjects.xml
@@ -331,88 +331,6 @@
 		<InitializationDatabaseType>ONE_AGENT_PER_DATABASE_RECORD</InitializationDatabaseType>
 		<QuantityColumn/>
 	</EmbeddedObject>
-	<EmbeddedObject>
-		<Id>1658752704931</Id>
-		<Name><![CDATA[pop_subTenants]]></Name>
-		<Description><![CDATA[Optionele visualisatie-agent met eenvoudige visuals voor model inspectie, monitoring en debugging. Kan aangezet worden met de parameter b_addKpiVisuals, maar model draait ook zonder.
-
-@since: Sprint 6
-@author: Jorrit]]></Description>
-		<X>400</X>
-		<Y>550</Y>
-		<Label>
-			<X>15</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<ActiveObjectClass>
-			<PackageName>zero_engine</PackageName>
-			<ClassName>A_SubTenant</ClassName>
-		</ActiveObjectClass>
-		<GenericParameterSubstitute>
-			<GenericParameterSubstituteReference>
-				<PackageName>zero_engine</PackageName>
-				<ClassName>A_SubTenant</ClassName>
-				<ItemName>1658752695709</ItemName>
-			</GenericParameterSubstituteReference>
-		</GenericParameterSubstitute>
-		<Parameters>
-			<Parameter>
-				<Name><![CDATA[p_actorID]]></Name>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_actorType]]></Name>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_actorGroup]]></Name>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_actorSubgroup]]></Name>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_mainTenantID]]></Name>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_connectedGridConnection]]></Name>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_address]]></Name>
-			</Parameter>
-		</Parameters>
-		<ReplicationFlag>true</ReplicationFlag>
-		<Replication Class="CodeValue">
-			<Code><![CDATA[100]]></Code>
-		</Replication>
-		<CollectionType>ARRAY_LIST_BASED</CollectionType>
-		<InitialLocationType>XYZ</InitialLocationType>
-		<XCode Class="CodeValue">
-			<Code><![CDATA[0]]></Code>
-		</XCode>
-		<YCode Class="CodeValue">
-			<Code><![CDATA[0]]></Code>
-		</YCode>
-		<ZCode Class="CodeValue">
-			<Code><![CDATA[0]]></Code>
-		</ZCode>
-		<ColumnCode Class="CodeValue">
-			<Code><![CDATA[0]]></Code>
-		</ColumnCode>
-		<RowCode Class="CodeValue">
-			<Code><![CDATA[0]]></Code>
-		</RowCode>
-		<LocationNameCode Class="CodeValue">
-			<Code><![CDATA[""]]></Code>
-		</LocationNameCode>
-		<InitializationType>EMPTY</InitializationType>
-		<InitializationDatabaseTableQuery>
-			<Id>1658477089983</Id>
-			<TableReference/>
-		</InitializationDatabaseTableQuery>
-		<InitializationDatabaseType>ONE_AGENT_PER_DATABASE_RECORD</InitializationDatabaseType>
-		<QuantityColumn/>
-	</EmbeddedObject>
 	<EmbeddedObject>
 		<Id>1660730126216</Id>
 		<Name><![CDATA[pop_connectionOwners]]></Name>
@@ -1801,150 +1719,6 @@
 		<InitializationDatabaseType>ONE_AGENT_PER_DATABASE_RECORD</InitializationDatabaseType>
 		<QuantityColumn/>
 	</EmbeddedObject>
-	<EmbeddedObject>
-		<Id>1665480562790</Id>
-		<Name><![CDATA[Industries]]></Name>
-		<X>400</X>
-		<Y>530</Y>
-		<Label>
-			<X>15</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<ActiveObjectClass>
-			<PackageName>zero_engine</PackageName>
-			<ClassName>GCIndustry</ClassName>
-		</ActiveObjectClass>
-		<GenericParameterSubstitute>
-			<GenericParameterSubstituteReference>
-				<PackageName>zero_engine</PackageName>
-				<ClassName>GCIndustry</ClassName>
-				<ItemName>1665480522862</ItemName>
-			</GenericParameterSubstituteReference>
-		</GenericParameterSubstitute>
-		<Parameters>
-			<Parameter>
-				<Name><![CDATA[p_parentNodeElectricID]]></Name>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_parentNodeHeatID]]></Name>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_BuildingThermalAsset]]></Name>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_ownerID]]></Name>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_chargingAttitudeVehicles]]></Name>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_batteryAsset]]></Name>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_electrolyserOperationMode]]></Name>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_heatBuffer]]></Name>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_gasBuffer]]></Name>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_cookingTracker]]></Name>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_energyLabel]]></Name>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_DHWAsset]]></Name>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_longitude]]></Name>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_latitude]]></Name>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_gridConnectionID]]></Name>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_floorSurfaceArea_m2]]></Name>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_GISPoint]]></Name>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_owner]]></Name>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_roofSurfaceArea_m2]]></Name>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_purposeBAG]]></Name>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_name]]></Name>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_curtailmentMode]]></Name>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_address]]></Name>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_parentNodeHeat]]></Name>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_parentNodeElectric]]></Name>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_heatingManagement]]></Name>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_batteryAlgorithm]]></Name>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[v_isActive]]></Name>
-			</Parameter>
-			<Parameter>
-				<Name><![CDATA[p_chargingManagement]]></Name>
-			</Parameter>
-		</Parameters>
-		<ReplicationFlag>true</ReplicationFlag>
-		<Replication Class="CodeValue">
-			<Code><![CDATA[100]]></Code>
-		</Replication>
-		<CollectionType>ARRAY_LIST_BASED</CollectionType>
-		<InitialLocationType>XYZ</InitialLocationType>
-		<XCode Class="CodeValue">
-			<Code><![CDATA[0]]></Code>
-		</XCode>
-		<YCode Class="CodeValue">
-			<Code><![CDATA[0]]></Code>
-		</YCode>
-		<ZCode Class="CodeValue">
-			<Code><![CDATA[0]]></Code>
-		</ZCode>
-		<ColumnCode Class="CodeValue">
-			<Code><![CDATA[0]]></Code>
-		</ColumnCode>
-		<RowCode Class="CodeValue">
-			<Code><![CDATA[0]]></Code>
-		</RowCode>
-		<LocationNameCode Class="CodeValue">
-			<Code><![CDATA[""]]></Code>
-		</LocationNameCode>
-		<InitializationType>EMPTY</InitializationType>
-		<InitializationDatabaseTableQuery>
-			<Id>1658477089971</Id>
-			<TableReference/>
-		</InitializationDatabaseTableQuery>
-		<InitializationDatabaseType>ONE_AGENT_PER_DATABASE_RECORD</InitializationDatabaseType>
-		<QuantityColumn/>
-	</EmbeddedObject>
 	<EmbeddedObject>
 		<Id>1666957373353</Id>
 		<Name><![CDATA[GridBatteries]]></Name>
diff --git a/_alp/Agents/EnergyModel/Levels/Level.level.xml b/_alp/Agents/EnergyModel/Levels/Level.level.xml
index 4962ad8e..3070e549 100644
--- a/_alp/Agents/EnergyModel/Levels/Level.level.xml
+++ b/_alp/Agents/EnergyModel/Levels/Level.level.xml
@@ -397,8 +397,8 @@
 	<Line>
 		<Id>1668602513058</Id>
 		<Name><![CDATA[line_variables]]></Name>
-		<X>1544</X>
-		<Y>29</Y>
+		<X>-620</X>
+		<Y>506</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -418,15 +418,15 @@
 		<BeginArrowStyle>0</BeginArrowStyle>
 		<EndArrowSize>1</EndArrowSize>
 		<EndArrowStyle>0</EndArrowStyle>
-		<Dx>256</Dx>
-		<Dy>1</Dy>
+		<Dx>180</Dx>
+		<Dy>0</Dy>
 		<Dz>0</Dz>
 	</Line>
 	<Text>
 		<Id>1668602513060</Id>
 		<Name><![CDATA[txt_variables]]></Name>
-		<X>1625</X>
-		<Y>10</Y>
+		<X>-559</X>
+		<Y>487</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -439,7 +439,7 @@
 		<Z>0</Z>
 		<Rotation>0.0</Rotation>
 		<Color>-16777216</Color>
-		<Text><![CDATA[Variables]]></Text>
+		<Text><![CDATA[DLR factors]]></Text>
 		<Font>
 			<Name><![CDATA[SansSerif]]></Name>
 			<Size>11</Size>
@@ -450,8 +450,8 @@
 	<Text>
 		<Id>1671703651141</Id>
 		<Name><![CDATA[text10]]></Name>
-		<X>1647</X>
-		<Y>222</Y>
+		<X>-533</X>
+		<Y>622</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -464,7 +464,7 @@
 		<Z>0</Z>
 		<Rotation>0.0</Rotation>
 		<Color>-16777216</Color>
-		<Text><![CDATA[Forecasts]]></Text>
+		<Text><![CDATA[Derived Forecasts]]></Text>
 		<Font>
 			<Name><![CDATA[SansSerif]]></Name>
 			<Size>11</Size>
@@ -606,8 +606,8 @@
 	<Line>
 		<Id>1716890105093</Id>
 		<Name><![CDATA[line10]]></Name>
-		<X>1560</X>
-		<Y>710</Y>
+		<X>1620</X>
+		<Y>350</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -634,8 +634,8 @@
 	<Text>
 		<Id>1716890105095</Id>
 		<Name><![CDATA[text12]]></Name>
-		<X>1650</X>
-		<Y>690</Y>
+		<X>1710</X>
+		<Y>330</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -659,8 +659,8 @@
 	<Line>
 		<Id>1729238050157</Id>
 		<Name><![CDATA[line_selectedEnergyCarriers]]></Name>
-		<X>1560</X>
-		<Y>240</Y>
+		<X>-620</X>
+		<Y>640</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -687,8 +687,8 @@
 	<Line>
 		<Id>1739958834681</Id>
 		<Name><![CDATA[line11]]></Name>
-		<X>1560</X>
-		<Y>520</Y>
+		<X>1620</X>
+		<Y>160</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -715,8 +715,8 @@
 	<Text>
 		<Id>1739958834683</Id>
 		<Name><![CDATA[text14]]></Name>
-		<X>1650</X>
-		<Y>500</Y>
+		<X>1710</X>
+		<Y>140</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -788,59 +788,6 @@ energyDataViewer.viewArea.navigateTo();</ActionCode>
 		</Font>
 		<Alignment>LEFT</Alignment>
 	</Text>
-	<Text>
-		<Id>1753349835816</Id>
-		<Name><![CDATA[txt_deprecatedAgents]]></Name>
-		<X>420</X>
-		<Y>490</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[Deprecated Agents]]></Text>
-		<Font>
-			<Name><![CDATA[SansSerif]]></Name>
-			<Size>11</Size>
-			<Style>0</Style>
-		</Font>
-		<Alignment>LEFT</Alignment>
-	</Text>
-	<Line>
-		<Id>1753349859610</Id>
-		<Name><![CDATA[line_deprecatedAgents]]></Name>
-		<X>380</X>
-		<Y>510</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>true</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>false</ShowLabel>
-		<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
-		<EmbeddedIcon>false</EmbeddedIcon>
-		<Z>0</Z>
-		<ZHeight>10</ZHeight>
-		<LineWidth>1</LineWidth>
-		<LineColor>-16777216</LineColor>
-		<LineMaterial>null</LineMaterial>
-		<LineStyle>SOLID</LineStyle>
-		<BeginArrowSize>1</BeginArrowSize>
-		<BeginArrowStyle>0</BeginArrowStyle>
-		<EndArrowSize>1</EndArrowSize>
-		<EndArrowStyle>0</EndArrowStyle>
-		<Dx>190</Dx>
-		<Dy>0</Dy>
-		<Dz>0</Dz>
-	</Line>
 	<Text>
 		<Id>1753352444348</Id>
 		<Name><![CDATA[txt_simulationEngine]]></Name>
@@ -897,8 +844,8 @@ energyDataViewer.viewArea.navigateTo();</ActionCode>
 	<Text>
 		<Id>1753353340150</Id>
 		<Name><![CDATA[txt_updateFunctions]]></Name>
-		<X>1650</X>
-		<Y>400</Y>
+		<X>1710</X>
+		<Y>40</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -922,8 +869,8 @@ energyDataViewer.viewArea.navigateTo();</ActionCode>
 	<Line>
 		<Id>1753353355569</Id>
 		<Name><![CDATA[line_updateFunctions]]></Name>
-		<X>1560</X>
-		<Y>420</Y>
+		<X>1620</X>
+		<Y>60</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
diff --git a/_alp/Agents/EnergyModel/Variables.xml b/_alp/Agents/EnergyModel/Variables.xml
index 3651ee38..5b3a74ab 100644
--- a/_alp/Agents/EnergyModel/Variables.xml
+++ b/_alp/Agents/EnergyModel/Variables.xml
@@ -20,63 +20,6 @@
 			<Type><![CDATA[J_ProfilePointer]]></Type>
 		</Properties>
 	</Variable>
-	<Variable Class="PlainVariable">
-		<Id>1659356201846</Id>
-		<Name><![CDATA[v_currentWindPowerNormalized_r]]></Name>
-		<X>1580</X>
-		<Y>75</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Properties SaveInSnapshot="true"
-              Constant="false"
-              AccessType="public"
-              StaticVariable="false">
-			<Type><![CDATA[double]]></Type>
-		</Properties>
-	</Variable>
-	<Variable Class="PlainVariable">
-		<Id>1659356216131</Id>
-		<Name><![CDATA[v_currentSolarPowerNormalized_r]]></Name>
-		<X>1580</X>
-		<Y>95</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Properties SaveInSnapshot="true"
-              Constant="false"
-              AccessType="public"
-              StaticVariable="false">
-			<Type><![CDATA[double]]></Type>
-		</Properties>
-	</Variable>
-	<Variable Class="PlainVariable">
-		<Id>1659364131698</Id>
-		<Name><![CDATA[v_currentAmbientTemperature_degC]]></Name>
-		<X>1580</X>
-		<Y>55</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Properties SaveInSnapshot="true"
-              Constant="false"
-              AccessType="public"
-              StaticVariable="false">
-			<Type><![CDATA[double]]></Type>
-		</Properties>
-	</Variable>
 	<Variable Class="PlainVariable">
 		<Id>1663238634515</Id>
 		<Name><![CDATA[v_timeStepsElapsed]]></Name>
@@ -156,63 +99,6 @@
 			<Type><![CDATA[double]]></Type>
 		</Properties>
 	</Variable>
-	<Variable Class="PlainVariable">
-		<Id>1671636172718</Id>
-		<Name><![CDATA[v_WindYieldForecast_fr]]></Name>
-		<X>1580</X>
-		<Y>260</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Properties SaveInSnapshot="true"
-              Constant="false"
-              AccessType="public"
-              StaticVariable="false">
-			<Type><![CDATA[double]]></Type>
-		</Properties>
-	</Variable>
-	<Variable Class="PlainVariable">
-		<Id>1671636200983</Id>
-		<Name><![CDATA[v_SolarYieldForecast_fr]]></Name>
-		<X>1580</X>
-		<Y>280</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Properties SaveInSnapshot="true"
-              Constant="false"
-              AccessType="public"
-              StaticVariable="false">
-			<Type><![CDATA[double]]></Type>
-		</Properties>
-	</Variable>
-	<Variable Class="PlainVariable">
-		<Id>1671638019875</Id>
-		<Name><![CDATA[v_epexForecast_eurpkWh]]></Name>
-		<X>1580</X>
-		<Y>320</Y>
-		<Label>
-			<X>10</X>
-			<Y>0</Y>
-		</Label>
-		<PublicFlag>false</PublicFlag>
-		<PresentationFlag>true</PresentationFlag>
-		<ShowLabel>true</ShowLabel>
-		<Properties SaveInSnapshot="true"
-              Constant="false"
-              AccessType="public"
-              StaticVariable="false">
-			<Type><![CDATA[double]]></Type>
-		</Properties>
-	</Variable>
 	<Variable Class="PlainVariable">
 		<Id>1676968233773</Id>
 		<Name><![CDATA[v_totalEnergyCurtailed_MWh]]></Name>
@@ -831,8 +717,8 @@
 	<Variable Class="PlainVariable">
 		<Id>1718883144081</Id>
 		<Name><![CDATA[v_electricityYieldForecast_fr]]></Name>
-		<X>1580</X>
-		<Y>300</Y>
+		<X>-600</X>
+		<Y>660</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -850,8 +736,8 @@
 	<Variable Class="PlainVariable">
 		<Id>1721228298986</Id>
 		<Name><![CDATA[v_currentDLRfactor_fr]]></Name>
-		<X>1580</X>
-		<Y>125</Y>
+		<X>-584</X>
+		<Y>526</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -872,8 +758,8 @@
 	<Variable Class="PlainVariable">
 		<Id>1721228965491</Id>
 		<Name><![CDATA[v_minDLRfactor_fr]]></Name>
-		<X>1580</X>
-		<Y>150</Y>
+		<X>-584</X>
+		<Y>551</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -894,8 +780,8 @@
 	<Variable Class="PlainVariable">
 		<Id>1721228970137</Id>
 		<Name><![CDATA[v_maxDLRfactor_fr]]></Name>
-		<X>1580</X>
-		<Y>170</Y>
+		<X>-584</X>
+		<Y>571</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1661,8 +1547,8 @@
 
 @since: Sprint 6
 @author: Gillis]]></Description>
-		<X>1580</X>
-		<Y>340</Y>
+		<X>-850</X>
+		<Y>770</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
diff --git a/_alp/Agents/GCEnergyConversion/Code/Functions.java b/_alp/Agents/GCEnergyConversion/Code/Functions.java
index 83b2c9e3..aa724f70 100644
--- a/_alp/Agents/GCEnergyConversion/Code/Functions.java
+++ b/_alp/Agents/GCEnergyConversion/Code/Functions.java
@@ -103,10 +103,10 @@
 			double availableDischargePower_kW = currentCoopElectricitySurplus_kW - CoopConnectionCapacity_kW; // Max discharging power within grid capacity
 			double SOC_setp_fr = 0.5;			
 			if (energyModel.v_liveAssetsMetaData.totalInstalledWindPower_kW > 10000) {
-				SOC_setp_fr = 0.95 - 0.95 * energyModel.v_WindYieldForecast_fr - 0.9*energyModel.v_SolarYieldForecast_fr;
+				SOC_setp_fr = 0.95 - 0.95 * energyModel.pf_windProduction_fr.getForecast() - 0.9*energyModel.pf_PVProduction35DegSouth_fr.getForecast();
 				//traceln("Forecast-based SOC setpoint: " + SOC_setp_fr + " %");
 			} else {
-				SOC_setp_fr = (0.5 + 0.35 * Math.sin(2*Math.PI*(energyModel.t_h-10)/24))*(1-0.8*energyModel.v_WindYieldForecast_fr); // Sinusoidal setpoint: aim for low SOC at 6:00h, high SOC at 18:00h. 
+				SOC_setp_fr = (0.5 + 0.35 * Math.sin(2*Math.PI*(energyModel.t_h-10)/24))*(1-0.8*energyModel.pf_windProduction_fr.getForecast()); // Sinusoidal setpoint: aim for low SOC at 6:00h, high SOC at 18:00h. 
 			}
 			double FeedbackGain_kWpSOC = 1.5 * p_batteryAsset.getCapacityElectric_kW(); // How strongly to aim for SOC setpoint
 			double FeedforwardGain_kWpKw = 0.1; // Feedforward based on current surpluss in Coop
@@ -322,7 +322,7 @@
 {/*ALCODESTART::1708448673879*/
 ConnectionOwner ownerActor = p_owner;
 //double currentElectricityPriceCharge_eurpkWh = ownerActor.f_getElectricityPrice(-excessElectricPower_kW); // query price at 1kW
-double currentElectricityPriceEPEX_eurpkWh = energyModel.v_epexForecast_eurpkWh;
+double currentElectricityPriceEPEX_eurpkWh = energyModel.pf_dayAheadElectricityPricing_eurpMWh.getForecast();
 
 switch (ElectrolyserAsset.getState()){
 
diff --git a/_alp/Agents/GCHouse/Code/Functions.java b/_alp/Agents/GCHouse/Code/Functions.java
index 81f11726..db3b5324 100644
--- a/_alp/Agents/GCHouse/Code/Functions.java
+++ b/_alp/Agents/GCHouse/Code/Functions.java
@@ -306,7 +306,7 @@ else if (energyModel.t_h*60 < chargeDeadline_min ){
 if( p_airco != null ) {
 	if (p_airco.remainingONtimesteps == 0){
 		double switchOnProbability = 0;
-		switch (roundToInt(energyModel.v_currentAmbientTemperature_degC)) {
+		switch (roundToInt(energyModel.pp_ambientTemperature_degC.getCurrentValue())) {
 			case 23:
 				switchOnProbability = 0.0025;
 				break;
diff --git a/_alp/Agents/GCIndustry/AOC.GCIndustry.xml b/_alp/Agents/GCIndustry/AOC.GCIndustry.xml
index 4fd8f1b4..00df246c 100644
--- a/_alp/Agents/GCIndustry/AOC.GCIndustry.xml
+++ b/_alp/Agents/GCIndustry/AOC.GCIndustry.xml
@@ -216,26 +216,6 @@
 			<LineArrowPosition>END</LineArrowPosition>
 		</AgentLink>
 	</AgentLinks>
-	<ContainerLinks>
-		<ContainerLink>
-			<Id>1665480565440</Id>
-			<Name><![CDATA[energyModel]]></Name>
-			<ExcludeFromBuild>true</ExcludeFromBuild>
-			<X>40</X>
-			<Y>-50</Y>
-			<Label>
-				<X>10</X>
-				<Y>0</Y>
-			</Label>
-			<PublicFlag>false</PublicFlag>
-			<PresentationFlag>true</PresentationFlag>
-			<ShowLabel>true</ShowLabel>
-			<ActiveObjectClass>
-				<PackageName>zero_engine</PackageName>
-				<ClassName>EnergyModel</ClassName>
-			</ActiveObjectClass>
-		</ContainerLink>
-	</ContainerLinks>
 	<Presentation>
 		<Level>
 			<Id>1665480522863</Id>
diff --git a/_alp/Agents/GCNeighborhood/Code/Functions.java b/_alp/Agents/GCNeighborhood/Code/Functions.java
index 5beb2351..b58f7d3c 100644
--- a/_alp/Agents/GCNeighborhood/Code/Functions.java
+++ b/_alp/Agents/GCNeighborhood/Code/Functions.java
@@ -539,8 +539,8 @@ else if(((J_EAConversionHeatPump)j_ea).getAmbientTempType() == OL_AmbientTempTyp
 	//SOC_setp_fr = 0.6 + 0.25 * Math.cos(2*Math.PI*(energyModel.t_h-18)/24); // Sinusoidal setpoint: aim for low SOC at 6:00h, high SOC at 18:00h. 
 	
 	//TODO forecast keer installed cap per buurt genormaliseerd.
-	double windEnergyExpectedNormalized_fr = energyModel.v_WindYieldForecast_fr * energyModel.p_forecastTime_h * v_liveAssetsMetaData.totalInstalledWindPower_kW / p_batteryAsset.getStorageCapacity_kWh();
-	double solarEnergyExpectedNormalized_fr = energyModel.v_SolarYieldForecast_fr * energyModel.p_forecastTime_h * v_liveAssetsMetaData.totalInstalledPVPower_kW / p_batteryAsset.getStorageCapacity_kWh();
+	double windEnergyExpectedNormalized_fr = energyModel.pf_windProduction_fr.getForecast() * energyModel.p_forecastTime_h * v_liveAssetsMetaData.totalInstalledWindPower_kW / p_batteryAsset.getStorageCapacity_kWh();
+	double solarEnergyExpectedNormalized_fr = energyModel.pf_PVProduction35DegSouth_fr.getForecast() * energyModel.p_forecastTime_h * v_liveAssetsMetaData.totalInstalledPVPower_kW / p_batteryAsset.getStorageCapacity_kWh();
 	//double heatpumpExpectedEnergyDrawNormalized_fr = ...
 	double SOC_setp_fr =  SOC_setp_fr_offset + 0.1 * Math.cos(2*Math.PI*(energyModel.t_h-7)/24) - 0.1 * windEnergyExpectedNormalized_fr - 0.1 * solarEnergyExpectedNormalized_fr;
 	//traceln("Forecast-based SOC setpoint: " + SOC_setp_fr + " %");
diff --git a/_alp/Agents/GridNode/Code/Functions.java b/_alp/Agents/GridNode/Code/Functions.java
index 54842142..179a76c5 100644
--- a/_alp/Agents/GridNode/Code/Functions.java
+++ b/_alp/Agents/GridNode/Code/Functions.java
@@ -434,7 +434,7 @@ ArrayList<GridConnection> f_getConnectedGridConnections()
 {/*ALCODESTART::1719302290904*/
 // The ElectricityYieldForecast assumes solar and wind forecasts have the same forecast time
 if ( v_totalInstalledPVPower_kW + v_totalInstalledWindPower_kW > 0 ) {
-	v_electricityYieldForecast_fr = (energyModel.v_SolarYieldForecast_fr * v_totalInstalledPVPower_kW + energyModel.v_WindYieldForecast_fr * v_totalInstalledWindPower_kW) / (v_totalInstalledPVPower_kW + v_totalInstalledWindPower_kW);
+	v_electricityYieldForecast_fr = (energyModel.pf_PVProduction35DegSouth_fr.getForecast() * v_totalInstalledPVPower_kW + energyModel.pf_windProduction_fr.getForecast() * v_totalInstalledWindPower_kW) / (v_totalInstalledPVPower_kW + v_totalInstalledWindPower_kW);
 }
 
 /*ALCODEEND*/}