diff --git a/_alp/Agents/Zero_Interface/Code/AdditionalClassCode.java b/_alp/Agents/Zero_Interface/Code/AdditionalClassCode.java
index 514a2787..467d0a60 100644
--- a/_alp/Agents/Zero_Interface/Code/AdditionalClassCode.java
+++ b/_alp/Agents/Zero_Interface/Code/AdditionalClassCode.java
@@ -9,4 +9,4 @@ public ShapeCheckBox getCb_showFilterInterface(){
 }
 public ShapeComboBox getCb_filterOptions(){
 	return this.cb_filterOptions;
-}
\ No newline at end of file
+}
diff --git a/_alp/Agents/Zero_Interface/Code/Functions.java b/_alp/Agents/Zero_Interface/Code/Functions.java
index 13acb8af..66e5731c 100644
--- a/_alp/Agents/Zero_Interface/Code/Functions.java
+++ b/_alp/Agents/Zero_Interface/Code/Functions.java
@@ -2091,6 +2091,8 @@ else if(c_manualFilterDeselectedGC.contains(clickedGC)){
 
 double f_setStartView()
 {/*ALCODESTART::1743518032245*/
+//traceln("f_setStartView() reached!");
+
 if(map_centre_latitude != null && map_centre_longitude != null && map_centre_latitude != 0 && map_centre_longitude != 0){
 	map.setCenterLatitude(map_centre_latitude);
 	map.setCenterLongitude(map_centre_longitude);
@@ -3128,7 +3130,7 @@ else if(maxLoad_fr_gc_feedin > maxLoad_fr_gc_delivery && gc.v_rapidRunData.conne
 String[] RadioButtonOptions = RadioButtonOptions_list.toArray(String[]::new);
 
 //Create the radiobutton and set the correct action.
-rb_mapOverlay = new ShapeRadioButtonGroup(presentable, ispublic, x ,y, width, height, textColor, enabled, font, vertical, RadioButtonOptions){
+rb_mapOverlay = new ShapeRadioButtonGroup(group_legenda.getPresentable(), ispublic, x ,y, width, height, textColor, enabled, font, vertical, RadioButtonOptions){
 	@Override
 	public void action() {
 		f_setMapOverlay();
@@ -3288,3 +3290,55 @@ public void action() {
 }
 /*ALCODEEND*/}
 
+double f_updateOrderedListsAfterDeserialising(EnergyModel newEnergyModel)
+{/*ALCODESTART::1753713001191*/
+// Update references of GClists
+for (int i=0; i< c_orderedPVSystemsHouses.size(); i++) {
+	String GCid = c_orderedPVSystemsHouses.get(i).p_gridConnectionID;
+	c_orderedPVSystemsHouses.set(i,findFirst(newEnergyModel.Houses, x->x.p_gridConnectionID == GCid));
+}
+
+for (int i=0; i< c_orderedPVSystemsCompanies.size(); i++) {
+	String GCid = c_orderedPVSystemsCompanies.get(i).p_gridConnectionID;
+	c_orderedPVSystemsCompanies.set(i,findFirst(newEnergyModel.UtilityConnections, x->x.p_gridConnectionID == GCid));
+}
+
+for (int i=0; i< c_orderedHeatingSystemsCompanies.size(); i++) {
+	String GCid = c_orderedHeatingSystemsCompanies.get(i).p_gridConnectionID;
+	c_orderedHeatingSystemsCompanies.set(i,findFirst(newEnergyModel.UtilityConnections, x->x.p_gridConnectionID == GCid));
+}
+
+for (int i=0; i< c_orderedHeatingSystemsHouses.size(); i++) {
+	String GCid = c_orderedHeatingSystemsHouses.get(i).p_gridConnectionID;
+	c_orderedHeatingSystemsHouses.set(i,findFirst(newEnergyModel.Houses, x->x.p_gridConnectionID == GCid));
+}
+
+for (int i=0; i< c_orderedPublicChargers.size(); i++) {
+	String GCid = c_orderedPublicChargers.get(i).p_gridConnectionID;
+	c_orderedPublicChargers.set(i,findFirst(newEnergyModel.PublicChargers, x->x.p_gridConnectionID == GCid));
+}
+
+// TODO: Update references of J_EAlists 
+
+/*ALCODEEND*/}
+
+ArrayList<GridConnection> f_updateGClistAfterDeserialisation(ArrayList<? extends GridConnection> GClist,EnergyModel newEnergyModel)
+{/*ALCODESTART::1753713085487*/
+for (int i=0; i< GClist.size(); i++) {
+	String GCid = GClist.get(i).p_gridConnectionID;
+	GClist.set(i,findFirst(newEnergyModel.c_gridConnections, x->x.p_gridConnectionID == GCid));
+}
+
+
+/*ALCODEEND*/}
+
+ArrayList<GridConnection> f_updateJ_EAlistAfterDeserialisation(ArrayList<J_EA> EAlist,EnergyModel newEnergyModel)
+{/*ALCODESTART::1753713662613*/
+for (int i=0; i< EAlist.size(); i++) {
+	String GCid = EAlist.get(i).getParentAgent();p_gridConnectionID;
+	EAlist.set(i,findFirst(newEnergyModel.c_gridConnections, x->x.p_gridConnectionID == GCid));
+}
+
+
+/*ALCODEEND*/}
+
diff --git a/_alp/Agents/Zero_Interface/Code/Functions.xml b/_alp/Agents/Zero_Interface/Code/Functions.xml
index 2cf472bb..9355b3db 100644
--- a/_alp/Agents/Zero_Interface/Code/Functions.xml
+++ b/_alp/Agents/Zero_Interface/Code/Functions.xml
@@ -277,7 +277,7 @@
 		<Id>1714130288661</Id>
 		<Name><![CDATA[f_initialPVSystemsOrder]]></Name>
 		<X>85</X>
-		<Y>-680</Y>
+		<Y>-710</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -293,7 +293,7 @@
 		<Id>1714130342440</Id>
 		<Name><![CDATA[f_initialElectricVehiclesOrder]]></Name>
 		<X>85</X>
-		<Y>-660</Y>
+		<Y>-690</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -309,7 +309,7 @@
 		<Id>1714131269202</Id>
 		<Name><![CDATA[f_initialHeatingSystemsOrder]]></Name>
 		<X>85</X>
-		<Y>-640</Y>
+		<Y>-670</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -325,7 +325,7 @@
 		<Id>1714135623471</Id>
 		<Name><![CDATA[f_initalAssetOrdering]]></Name>
 		<X>70</X>
-		<Y>-700</Y>
+		<Y>-730</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -814,7 +814,7 @@
 		<Id>1729685968993</Id>
 		<Name><![CDATA[f_projectSpecificOrderedCollectionAdjustments]]></Name>
 		<X>420</X>
-		<Y>-650</Y>
+		<Y>-680</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1578,7 +1578,7 @@
 		<Id>1749741185117</Id>
 		<Name><![CDATA[f_initialParkingSpacesOrder]]></Name>
 		<X>420</X>
-		<Y>-690</Y>
+		<Y>-720</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1594,7 +1594,7 @@
 		<Id>1750247111856</Id>
 		<Name><![CDATA[f_initialChargerOrder]]></Name>
 		<X>420</X>
-		<Y>-670</Y>
+		<Y>-700</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1798,7 +1798,7 @@
 		<Id>1750333147816</Id>
 		<Name><![CDATA[f_initialHouseholdOrder]]></Name>
 		<X>85</X>
-		<Y>-620</Y>
+		<Y>-650</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -1868,7 +1868,7 @@
 		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
-	<Function AccessType="default" StaticFunction="false">
+	<Function AccessType="public" StaticFunction="false">
 		<ReturnModificator>VOID</ReturnModificator>
 		<ReturnType>double</ReturnType>
 		<Id>1752836715726</Id>
@@ -2033,4 +2033,74 @@
 		<ShowLabel>true</ShowLabel>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1753713001191</Id>
+		<Name><![CDATA[f_updateOrderedListsAfterDeserialising]]></Name>
+		<X>70</X>
+		<Y>-630</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[newEnergyModel]]></Name>
+			<Type><![CDATA[EnergyModel]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>ArrayList&lt;GridConnection&gt;</ReturnType>
+		<Id>1753713085487</Id>
+		<Name><![CDATA[f_updateGClistAfterDeserialisation]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>85</X>
+		<Y>-610</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[GClist]]></Name>
+			<Type><![CDATA[ArrayList<? extends GridConnection>]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[newEnergyModel]]></Name>
+			<Type><![CDATA[EnergyModel]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>ArrayList&lt;GridConnection&gt;</ReturnType>
+		<Id>1753713662613</Id>
+		<Name><![CDATA[f_updateJ_EAlistAfterDeserialisation]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>100</X>
+		<Y>-590</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[EAlist]]></Name>
+			<Type><![CDATA[ArrayList<J_EA>]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[newEnergyModel]]></Name>
+			<Type><![CDATA[EnergyModel]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
 </Functions>
diff --git a/_alp/Agents/Zero_Interface/Levels/Level.level.xml b/_alp/Agents/Zero_Interface/Levels/Level.level.xml
index 2abe1e2c..cc831e0c 100644
--- a/_alp/Agents/Zero_Interface/Levels/Level.level.xml
+++ b/_alp/Agents/Zero_Interface/Levels/Level.level.xml
@@ -917,835 +917,6 @@ traceln("gr_compareResultsButton is not functional!");</OnClickCode>
 		</Font>
 		<Alignment>LEFT</Alignment>
 	</Text>
-	<Group>
-		<Id>1701951640330</Id>
-		<Name><![CDATA[group_legenda]]></Name>
-		<X>910</X>
-		<Y>880</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>
-		<Rotation>0.0</Rotation>
-		<Presentation>
-			<Rectangle>
-				<Id>1701951640332</Id>
-				<Name><![CDATA[rect_legendaBackground]]></Name>
-				<X>-510</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>1</LineWidth>
-				<LineColor/>
-				<LineMaterial>null</LineMaterial>
-				<LineStyle>SOLID</LineStyle>
-				<Width>1020</Width>
-				<Height>200</Height>
-				<Rotation>0.0</Rotation>
-				<FillColor>-3092235</FillColor>
-				<FillColorCode>v_themeColor</FillColorCode>
-				<FillMaterial>null</FillMaterial>
-			</Rectangle>
-			<Rectangle>
-				<Id>1701951640336</Id>
-				<Name><![CDATA[rect_legenda]]></Name>
-				<X>-500</X>
-				<Y>-84</Y>
-				<Label>
-					<X>10</X>
-					<Y>10</Y>
-				</Label>
-				<PublicFlag>true</PublicFlag>
-				<PresentationFlag>true</PresentationFlag>
-				<ShowLabel>false</ShowLabel>
-				<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
-				<EmbeddedIcon>false</EmbeddedIcon>
-				<Z>0</Z>
-				<ZHeight>10</ZHeight>
-				<LineWidth>1</LineWidth>
-				<LineColor>-1644806</LineColor>
-				<LineMaterial>null</LineMaterial>
-				<LineStyle>DOTTED</LineStyle>
-				<Width>1000</Width>
-				<Height>172</Height>
-				<Rotation>0.0</Rotation>
-				<FillColor>-1</FillColor>
-				<FillMaterial>null</FillMaterial>
-			</Rectangle>
-			<Text>
-				<Id>1701951640338</Id>
-				<Name><![CDATA[t_legenda]]></Name>
-				<X>-470</X>
-				<Y>-100</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>-1</Color>
-				<Text><![CDATA[Legenda]]></Text>
-				<Font>
-					<Name><![CDATA[Calibri]]></Name>
-					<Size>18</Size>
-					<Style>0</Style>
-				</Font>
-				<Alignment>LEFT</Alignment>
-			</Text>
-			<Line>
-				<Id>1701951640396</Id>
-				<Name><![CDATA[line_legendaSeperator1]]></Name>
-				<X>-165</X>
-				<Y>-70</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>-1644806</LineColor>
-				<LineMaterial>null</LineMaterial>
-				<LineStyle>SOLID</LineStyle>
-				<BeginArrowSize>1</BeginArrowSize>
-				<BeginArrowStyle>0</BeginArrowStyle>
-				<EndArrowSize>1</EndArrowSize>
-				<EndArrowStyle>0</EndArrowStyle>
-				<Dx>0</Dx>
-				<Dy>140</Dy>
-				<Dz>0</Dz>
-			</Line>
-			<Line>
-				<Id>1724074247375</Id>
-				<Name><![CDATA[line_legendaSeperator2]]></Name>
-				<X>-10</X>
-				<Y>-70</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>-1644806</LineColor>
-				<LineMaterial>null</LineMaterial>
-				<LineStyle>SOLID</LineStyle>
-				<BeginArrowSize>1</BeginArrowSize>
-				<BeginArrowStyle>0</BeginArrowStyle>
-				<EndArrowSize>1</EndArrowSize>
-				<EndArrowStyle>0</EndArrowStyle>
-				<Dx>0</Dx>
-				<Dy>140</Dy>
-				<Dz>0</Dz>
-			</Line>
-			<Group>
-				<Id>1724074154126</Id>
-				<Name><![CDATA[gr_infrastructure]]></Name>
-				<X>-340</X>
-				<Y>5</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>
-				<Rotation>0.0</Rotation>
-				<Presentation>
-					<Text>
-						<Id>1724074154148</Id>
-						<Name><![CDATA[t_infrastructure]]></Name>
-						<X>-60</X>
-						<Y>-79</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[Infrastructuur]]></Text>
-						<Font>
-							<Name><![CDATA[Calibri]]></Name>
-							<Size>16</Size>
-							<Style>1</Style>
-						</Font>
-						<Alignment>LEFT</Alignment>
-					</Text>
-					<Line>
-						<Id>1724074154158</Id>
-						<Name><![CDATA[line_infrastructure]]></Name>
-						<X>-120</X>
-						<Y>-59</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>-1644806</LineColor>
-						<LineMaterial>null</LineMaterial>
-						<LineStyle>SOLID</LineStyle>
-						<BeginArrowSize>1</BeginArrowSize>
-						<BeginArrowStyle>0</BeginArrowStyle>
-						<EndArrowSize>1</EndArrowSize>
-						<EndArrowStyle>0</EndArrowStyle>
-						<Dx>271</Dx>
-						<Dy>0</Dy>
-						<Dz>0</Dz>
-					</Line>
-					<Group>
-						<Id>1724074839746</Id>
-						<Name><![CDATA[gr_gridnodes]]></Name>
-						<X>-75</X>
-						<Y>-19</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>
-						<Rotation>0.0</Rotation>
-						<Presentation>
-							<Polyline>
-								<Id>1724074853961</Id>
-								<Name><![CDATA[polyline_congestedGridnode]]></Name>
-								<X>-55</X>
-								<Y>40</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>
-								<LineColorCode>v_gridLineColorCongested</LineColorCode>
-								<LineMaterial>null</LineMaterial>
-								<LineStyle>SOLID</LineStyle>
-								<BeginArrowSize>1</BeginArrowSize>
-								<BeginArrowStyle>0</BeginArrowStyle>
-								<EndArrowSize>1</EndArrowSize>
-								<EndArrowStyle>0</EndArrowStyle>
-								<FillColor/>
-								<FillColorCode>v_gridNodeColorCongested</FillColorCode>
-								<FillMaterial>null</FillMaterial>
-								<Points>
-									<Point>
-										<X>0</X>
-										<Y>0</Y>
-										<Z>0</Z>
-									</Point>
-									<Point>
-										<X>10</X>
-										<Y>-14</Y>
-										<Z>0</Z>
-									</Point>
-									<Point>
-										<X>20</X>
-										<Y>0</Y>
-										<Z>0</Z>
-									</Point>
-									<Point>
-										<X>0</X>
-										<Y>0</Y>
-										<Z>0</Z>
-									</Point>
-								</Points>
-								<Closed>false</Closed>
-							</Polyline>
-							<Text>
-								<Id>1724074853963</Id>
-								<Name><![CDATA[txt_congestedGridnode]]></Name>
-								<X>-25</X>
-								<Y>25</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[Trafo overbelast]]></Text>
-								<Font>
-									<Name><![CDATA[SansSerif]]></Name>
-									<Size>12</Size>
-									<Style>0</Style>
-								</Font>
-								<Alignment>LEFT</Alignment>
-							</Text>
-							<Polyline>
-								<Id>1724074853967</Id>
-								<Name><![CDATA[polyline_gridnode]]></Name>
-								<X>-55</X>
-								<Y>-7</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>
-								<LineColorCode>v_MVLVLineColor</LineColorCode>
-								<LineMaterial>null</LineMaterial>
-								<LineStyle>SOLID</LineStyle>
-								<BeginArrowSize>1</BeginArrowSize>
-								<BeginArrowStyle>0</BeginArrowStyle>
-								<EndArrowSize>1</EndArrowSize>
-								<EndArrowStyle>0</EndArrowStyle>
-								<FillColor/>
-								<FillColorCode>v_MVLVNodeColor</FillColorCode>
-								<FillMaterial>null</FillMaterial>
-								<Points>
-									<Point>
-										<X>0</X>
-										<Y>0</Y>
-										<Z>0</Z>
-									</Point>
-									<Point>
-										<X>10</X>
-										<Y>-14</Y>
-										<Z>0</Z>
-									</Point>
-									<Point>
-										<X>20</X>
-										<Y>0</Y>
-										<Z>0</Z>
-									</Point>
-									<Point>
-										<X>0</X>
-										<Y>0</Y>
-										<Z>0</Z>
-									</Point>
-								</Points>
-								<Closed>false</Closed>
-							</Polyline>
-							<Text>
-								<Id>1724074853969</Id>
-								<Name><![CDATA[txt_gridnode]]></Name>
-								<X>-25</X>
-								<Y>-21</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[Trafo stabiel]]></Text>
-								<Font>
-									<Name><![CDATA[SansSerif]]></Name>
-									<Size>12</Size>
-									<Style>0</Style>
-								</Font>
-								<Alignment>LEFT</Alignment>
-							</Text>
-							<Polyline>
-								<Id>1724074853971</Id>
-								<Name><![CDATA[polyline_strainedGridnode]]></Name>
-								<X>-55</X>
-								<Y>15</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>
-								<LineColorCode>v_gridNodeLineColorStrained</LineColorCode>
-								<LineMaterial>null</LineMaterial>
-								<LineStyle>SOLID</LineStyle>
-								<BeginArrowSize>1</BeginArrowSize>
-								<BeginArrowStyle>0</BeginArrowStyle>
-								<EndArrowSize>1</EndArrowSize>
-								<EndArrowStyle>0</EndArrowStyle>
-								<FillColor/>
-								<FillColorCode>v_gridNodeColorStrained</FillColorCode>
-								<FillMaterial>null</FillMaterial>
-								<Points>
-									<Point>
-										<X>0</X>
-										<Y>0</Y>
-										<Z>0</Z>
-									</Point>
-									<Point>
-										<X>10</X>
-										<Y>-14</Y>
-										<Z>0</Z>
-									</Point>
-									<Point>
-										<X>20</X>
-										<Y>0</Y>
-										<Z>0</Z>
-									</Point>
-									<Point>
-										<X>0</X>
-										<Y>0</Y>
-										<Z>0</Z>
-									</Point>
-								</Points>
-								<Closed>false</Closed>
-							</Polyline>
-							<Text>
-								<Id>1724074853973</Id>
-								<Name><![CDATA[txt_strainedGridnode]]></Name>
-								<X>-25</X>
-								<Y>2</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[Trafo belast]]></Text>
-								<Font>
-									<Name><![CDATA[SansSerif]]></Name>
-									<Size>12</Size>
-									<Style>0</Style>
-								</Font>
-								<Alignment>LEFT</Alignment>
-							</Text>
-						</Presentation>
-					</Group>
-					<Group>
-						<Id>1724074839748</Id>
-						<Name><![CDATA[gr_cables]]></Name>
-						<X>75</X>
-						<Y>5</Y>
-						<Label>
-							<X>10</X>
-							<Y>0</Y>
-						</Label>
-						<PublicFlag>true</PublicFlag>
-						<PresentationFlag>true</PresentationFlag>
-						<ShowLabel>false</ShowLabel>
-						<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
-						<VisibleCode>b_showCables</VisibleCode>
-						<EmbeddedIcon>false</EmbeddedIcon>
-						<Z>0</Z>
-						<Rotation>0.0</Rotation>
-						<Presentation>
-							<Text>
-								<Id>1724074864095</Id>
-								<Name><![CDATA[t_HV]]></Name>
-								<ExcludeFromBuild>true</ExcludeFromBuild>
-								<X>-15</X>
-								<Y>15</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[HS-net (150kV)]]></Text>
-								<Font>
-									<Name><![CDATA[SansSerif]]></Name>
-									<Size>12</Size>
-									<Style>0</Style>
-								</Font>
-								<Alignment>LEFT</Alignment>
-							</Text>
-							<Line>
-								<Id>1724074864097</Id>
-								<Name><![CDATA[line_HV]]></Name>
-								<ExcludeFromBuild>true</ExcludeFromBuild>
-								<X>-40</X>
-								<Y>25</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>2.5</LineWidth>
-								<LineColor>-16776961</LineColor>
-								<LineColorCode>v_HVGridColor</LineColorCode>
-								<LineMaterial>null</LineMaterial>
-								<LineStyle>SOLID</LineStyle>
-								<BeginArrowSize>1</BeginArrowSize>
-								<BeginArrowStyle>0</BeginArrowStyle>
-								<EndArrowSize>1</EndArrowSize>
-								<EndArrowStyle>0</EndArrowStyle>
-								<Dx>10</Dx>
-								<Dy>0</Dy>
-								<Dz>0</Dz>
-							</Line>
-							<Text>
-								<Id>1724074870571</Id>
-								<Name><![CDATA[t_MV]]></Name>
-								<X>-15</X>
-								<Y>-50</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[MS-net]]></Text>
-								<Font>
-									<Name><![CDATA[SansSerif]]></Name>
-									<Size>12</Size>
-									<Style>0</Style>
-								</Font>
-								<Alignment>LEFT</Alignment>
-							</Text>
-							<Text>
-								<Id>1724074870573</Id>
-								<Name><![CDATA[t_LV]]></Name>
-								<X>-15</X>
-								<Y>-25</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[LS-net]]></Text>
-								<Font>
-									<Name><![CDATA[SansSerif]]></Name>
-									<Size>12</Size>
-									<Style>0</Style>
-								</Font>
-								<Alignment>LEFT</Alignment>
-							</Text>
-							<Line>
-								<Id>1724074870575</Id>
-								<Name><![CDATA[line_LV]]></Name>
-								<X>-40</X>
-								<Y>-15</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>2.5</LineWidth>
-								<LineColor>-6737204</LineColor>
-								<LineColorCode>v_LVGridColor</LineColorCode>
-								<LineMaterial>null</LineMaterial>
-								<LineStyle>SOLID</LineStyle>
-								<BeginArrowSize>1</BeginArrowSize>
-								<BeginArrowStyle>0</BeginArrowStyle>
-								<EndArrowSize>1</EndArrowSize>
-								<EndArrowStyle>0</EndArrowStyle>
-								<Dx>10</Dx>
-								<Dy>0</Dy>
-								<Dz>0</Dz>
-							</Line>
-							<Line>
-								<Id>1724074870577</Id>
-								<Name><![CDATA[line_MV]]></Name>
-								<X>-40</X>
-								<Y>-40</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>2.5</LineWidth>
-								<LineColor>-12156236</LineColor>
-								<LineColorCode>v_MVGridColor</LineColorCode>
-								<LineMaterial>null</LineMaterial>
-								<LineStyle>SOLID</LineStyle>
-								<BeginArrowSize>1</BeginArrowSize>
-								<BeginArrowStyle>0</BeginArrowStyle>
-								<EndArrowSize>1</EndArrowSize>
-								<EndArrowStyle>0</EndArrowStyle>
-								<Dx>10</Dx>
-								<Dy>0</Dy>
-								<Dz>0</Dz>
-							</Line>
-							<Text>
-								<Id>1724074875518</Id>
-								<Name><![CDATA[t_gasNetwork]]></Name>
-								<ExcludeFromBuild>true</ExcludeFromBuild>
-								<X>-15</X>
-								<Y>-2.5</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[Gasnet]]></Text>
-								<Font>
-									<Name><![CDATA[SansSerif]]></Name>
-									<Size>12</Size>
-									<Style>0</Style>
-								</Font>
-								<Alignment>LEFT</Alignment>
-							</Text>
-							<Oval>
-								<Id>1724074875520</Id>
-								<Name><![CDATA[oval_gasNetwork]]></Name>
-								<ExcludeFromBuild>true</ExcludeFromBuild>
-								<X>-35</X>
-								<Y>5</Y>
-								<Label>
-									<X>0</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>
-								<RadiusX>5.75</RadiusX>
-								<RadiusY>40</RadiusY>
-								<Rotation>0.0</Rotation>
-								<FillColor>-1</FillColor>
-								<FillColorCode>v_gasGridColor</FillColorCode>
-								<FillMaterial>null</FillMaterial>
-							</Oval>
-						</Presentation>
-					</Group>
-				</Presentation>
-			</Group>
-			<Group>
-				<Id>1724074493431</Id>
-				<Name><![CDATA[gr_buildings]]></Name>
-				<X>80</X>
-				<Y>10</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>
-				<Rotation>0.0</Rotation>
-				<Presentation>
-					<Text>
-						<Id>1724074500599</Id>
-						<Name><![CDATA[t_buildings]]></Name>
-						<X>50</X>
-						<Y>-84</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[Gebouwen]]></Text>
-						<Font>
-							<Name><![CDATA[Calibri]]></Name>
-							<Size>16</Size>
-							<Style>1</Style>
-						</Font>
-						<Alignment>LEFT</Alignment>
-					</Text>
-					<Line>
-						<Id>1724074502826</Id>
-						<Name><![CDATA[line_buildings]]></Name>
-						<X>380</X>
-						<Y>-64</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>-1644806</LineColor>
-						<LineMaterial>null</LineMaterial>
-						<LineStyle>SOLID</LineStyle>
-						<BeginArrowSize>1</BeginArrowSize>
-						<BeginArrowStyle>0</BeginArrowStyle>
-						<EndArrowSize>1</EndArrowSize>
-						<EndArrowStyle>0</EndArrowStyle>
-						<Dx>-458</Dx>
-						<Dy>0</Dy>
-						<Dz>0</Dz>
-					</Line>
-					<Group>
-						<Id>1724074508882</Id>
-						<Name><![CDATA[gr_colorings]]></Name>
-						<X>-180</X>
-						<Y>0</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>
-						<Rotation>0.0</Rotation>
-						<Presentation>
-							<Text>
-								<Id>1724074508886</Id>
-								<Name><![CDATA[txt_colorings]]></Name>
-								<X>4</X>
-								<Y>-71</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[Kleur gebouwen o.b.v.:]]></Text>
-								<Font>
-									<Name><![CDATA[SansSerif]]></Name>
-									<Size>11</Size>
-									<Style>0</Style>
-								</Font>
-								<Alignment>CENTER</Alignment>
-							</Text>
-						</Presentation>
-					</Group>
-				</Presentation>
-			</Group>
-		</Presentation>
-	</Group>
 	<Text>
 		<Id>1696863329245</Id>
 		<Name><![CDATA[t_mapClickingFunctions]]></Name>
@@ -2551,7 +1722,7 @@ van het gebied, en de huidige gasconsumptie voor verwarming.]]></Text>
 		<Id>1719217632486</Id>
 		<Name><![CDATA[line_ordereringDescription]]></Name>
 		<X>50</X>
-		<Y>-720</Y>
+		<Y>-750</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2579,7 +1750,7 @@ van het gebied, en de huidige gasconsumptie voor verwarming.]]></Text>
 		<Id>1719217632488</Id>
 		<Name><![CDATA[t_ordereringDescription]]></Name>
 		<X>60</X>
-		<Y>-750</Y>
+		<Y>-780</Y>
 		<Label>
 			<X>0</X>
 			<Y>-10</Y>
@@ -7861,30 +7032,257 @@ gr_infoText.setVisible(false);</OnClickCode>
 						<Y>0</Y>
 						<Label>
 							<X>0</X>
-							<Y>0</Y>
+							<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>
+						<RadiusX>12</RadiusX>
+						<RadiusY>40</RadiusY>
+						<Rotation>0.0</Rotation>
+						<FillColor>-12566464</FillColor>
+						<FillMaterial>null</FillMaterial>
+					</Oval>
+					<Line>
+						<Id>1746110287604</Id>
+						<Name><![CDATA[line_closeInfoText1]]></Name>
+						<X>-6</X>
+						<Y>6</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>3</LineWidth>
+						<LineColor>-1</LineColor>
+						<LineMaterial>null</LineMaterial>
+						<LineStyle>SOLID</LineStyle>
+						<BeginArrowSize>1</BeginArrowSize>
+						<BeginArrowStyle>0</BeginArrowStyle>
+						<EndArrowSize>1</EndArrowSize>
+						<EndArrowStyle>0</EndArrowStyle>
+						<Dx>12</Dx>
+						<Dy>-12</Dy>
+						<Dz>0</Dz>
+					</Line>
+					<Line>
+						<Id>1746110287606</Id>
+						<Name><![CDATA[line_closeInfoText2]]></Name>
+						<X>6</X>
+						<Y>6</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>3</LineWidth>
+						<LineColor>-1</LineColor>
+						<LineMaterial>null</LineMaterial>
+						<LineStyle>SOLID</LineStyle>
+						<BeginArrowSize>1</BeginArrowSize>
+						<BeginArrowStyle>0</BeginArrowStyle>
+						<EndArrowSize>1</EndArrowSize>
+						<EndArrowStyle>0</EndArrowStyle>
+						<Dx>-12</Dx>
+						<Dy>-12</Dy>
+						<Dz>0</Dz>
+					</Line>
+				</Presentation>
+			</Group>
+			<Text>
+				<Id>1746110287608</Id>
+				<Name><![CDATA[t_infoTextHeader]]></Name>
+				<X>20</X>
+				<Y>20</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[Extra Informatie]]></Text>
+				<Font>
+					<Name><![CDATA[Calibri]]></Name>
+					<Size>18</Size>
+					<Style>1</Style>
+				</Font>
+				<Alignment>LEFT</Alignment>
+			</Text>
+			<Text>
+				<Id>1746110287610</Id>
+				<Name><![CDATA[t_infoTextDescription]]></Name>
+				<X>20</X>
+				<Y>50</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["Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
+Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat
+nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui
+officia deserunt mollit anim id est laborum."]]></Text>
+				<Font>
+					<Name><![CDATA[SansSerif]]></Name>
+					<Size>14</Size>
+					<Style>0</Style>
+				</Font>
+				<Alignment>LEFT</Alignment>
+			</Text>
+		</Presentation>
+	</Group>
+	<Group>
+		<Id>1753710949434</Id>
+		<Name><![CDATA[groupLegendRadioButton]]></Name>
+		<X>910</X>
+		<Y>880</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>
+		<Rotation>0.0</Rotation>
+		<Presentation>
+			<Group>
+				<Id>1701951640330</Id>
+				<Name><![CDATA[group_legenda]]></Name>
+				<X>0</X>
+				<Y>0</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>
+				<Rotation>0.0</Rotation>
+				<Presentation>
+					<Rectangle>
+						<Id>1701951640332</Id>
+						<Name><![CDATA[rect_legendaBackground]]></Name>
+						<X>-510</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>1</LineWidth>
+						<LineColor/>
+						<LineMaterial>null</LineMaterial>
+						<LineStyle>SOLID</LineStyle>
+						<Width>1020</Width>
+						<Height>200</Height>
+						<Rotation>0.0</Rotation>
+						<FillColor>-3092235</FillColor>
+						<FillColorCode>v_themeColor</FillColorCode>
+						<FillMaterial>null</FillMaterial>
+					</Rectangle>
+					<Rectangle>
+						<Id>1701951640336</Id>
+						<Name><![CDATA[rect_legenda]]></Name>
+						<X>-500</X>
+						<Y>-84</Y>
+						<Label>
+							<X>10</X>
+							<Y>10</Y>
+						</Label>
+						<PublicFlag>true</PublicFlag>
+						<PresentationFlag>true</PresentationFlag>
+						<ShowLabel>false</ShowLabel>
+						<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
+						<EmbeddedIcon>false</EmbeddedIcon>
+						<Z>0</Z>
+						<ZHeight>10</ZHeight>
+						<LineWidth>1</LineWidth>
+						<LineColor>-1644806</LineColor>
+						<LineMaterial>null</LineMaterial>
+						<LineStyle>DOTTED</LineStyle>
+						<Width>1000</Width>
+						<Height>172</Height>
+						<Rotation>0.0</Rotation>
+						<FillColor>-1</FillColor>
+						<FillMaterial>null</FillMaterial>
+					</Rectangle>
+					<Text>
+						<Id>1701951640338</Id>
+						<Name><![CDATA[t_legenda]]></Name>
+						<X>-470</X>
+						<Y>-100</Y>
+						<Label>
+							<X>0</X>
+							<Y>-10</Y>
 						</Label>
 						<PublicFlag>true</PublicFlag>
 						<PresentationFlag>true</PresentationFlag>
 						<ShowLabel>false</ShowLabel>
-						<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
+						<DrawMode>SHAPE_DRAW_2D</DrawMode>
 						<EmbeddedIcon>false</EmbeddedIcon>
 						<Z>0</Z>
-						<ZHeight>10</ZHeight>
-						<LineWidth>1</LineWidth>
-						<LineColor>-16777216</LineColor>
-						<LineMaterial>null</LineMaterial>
-						<LineStyle>SOLID</LineStyle>
-						<RadiusX>12</RadiusX>
-						<RadiusY>40</RadiusY>
 						<Rotation>0.0</Rotation>
-						<FillColor>-12566464</FillColor>
-						<FillMaterial>null</FillMaterial>
-					</Oval>
+						<Color>-1</Color>
+						<Text><![CDATA[Legenda]]></Text>
+						<Font>
+							<Name><![CDATA[Calibri]]></Name>
+							<Size>18</Size>
+							<Style>0</Style>
+						</Font>
+						<Alignment>LEFT</Alignment>
+					</Text>
 					<Line>
-						<Id>1746110287604</Id>
-						<Name><![CDATA[line_closeInfoText1]]></Name>
-						<X>-6</X>
-						<Y>6</Y>
+						<Id>1701951640396</Id>
+						<Name><![CDATA[line_legendaSeperator1]]></Name>
+						<X>-165</X>
+						<Y>-70</Y>
 						<Label>
 							<X>10</X>
 							<Y>0</Y>
@@ -7896,23 +7294,23 @@ gr_infoText.setVisible(false);</OnClickCode>
 						<EmbeddedIcon>false</EmbeddedIcon>
 						<Z>0</Z>
 						<ZHeight>10</ZHeight>
-						<LineWidth>3</LineWidth>
-						<LineColor>-1</LineColor>
+						<LineWidth>1</LineWidth>
+						<LineColor>-1644806</LineColor>
 						<LineMaterial>null</LineMaterial>
 						<LineStyle>SOLID</LineStyle>
 						<BeginArrowSize>1</BeginArrowSize>
 						<BeginArrowStyle>0</BeginArrowStyle>
 						<EndArrowSize>1</EndArrowSize>
 						<EndArrowStyle>0</EndArrowStyle>
-						<Dx>12</Dx>
-						<Dy>-12</Dy>
+						<Dx>0</Dx>
+						<Dy>140</Dy>
 						<Dz>0</Dz>
 					</Line>
 					<Line>
-						<Id>1746110287606</Id>
-						<Name><![CDATA[line_closeInfoText2]]></Name>
-						<X>6</X>
-						<Y>6</Y>
+						<Id>1724074247375</Id>
+						<Name><![CDATA[line_legendaSeperator2]]></Name>
+						<X>-10</X>
+						<Y>-70</Y>
 						<Label>
 							<X>10</X>
 							<Y>0</Y>
@@ -7924,75 +7322,696 @@ gr_infoText.setVisible(false);</OnClickCode>
 						<EmbeddedIcon>false</EmbeddedIcon>
 						<Z>0</Z>
 						<ZHeight>10</ZHeight>
-						<LineWidth>3</LineWidth>
-						<LineColor>-1</LineColor>
+						<LineWidth>1</LineWidth>
+						<LineColor>-1644806</LineColor>
 						<LineMaterial>null</LineMaterial>
 						<LineStyle>SOLID</LineStyle>
 						<BeginArrowSize>1</BeginArrowSize>
 						<BeginArrowStyle>0</BeginArrowStyle>
 						<EndArrowSize>1</EndArrowSize>
 						<EndArrowStyle>0</EndArrowStyle>
-						<Dx>-12</Dx>
-						<Dy>-12</Dy>
+						<Dx>0</Dx>
+						<Dy>140</Dy>
 						<Dz>0</Dz>
 					</Line>
+					<Group>
+						<Id>1724074154126</Id>
+						<Name><![CDATA[gr_infrastructure]]></Name>
+						<X>-340</X>
+						<Y>5</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>
+						<Rotation>0.0</Rotation>
+						<Presentation>
+							<Text>
+								<Id>1724074154148</Id>
+								<Name><![CDATA[t_infrastructure]]></Name>
+								<X>-60</X>
+								<Y>-79</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[Infrastructuur]]></Text>
+								<Font>
+									<Name><![CDATA[Calibri]]></Name>
+									<Size>16</Size>
+									<Style>1</Style>
+								</Font>
+								<Alignment>LEFT</Alignment>
+							</Text>
+							<Line>
+								<Id>1724074154158</Id>
+								<Name><![CDATA[line_infrastructure]]></Name>
+								<X>-120</X>
+								<Y>-59</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>-1644806</LineColor>
+								<LineMaterial>null</LineMaterial>
+								<LineStyle>SOLID</LineStyle>
+								<BeginArrowSize>1</BeginArrowSize>
+								<BeginArrowStyle>0</BeginArrowStyle>
+								<EndArrowSize>1</EndArrowSize>
+								<EndArrowStyle>0</EndArrowStyle>
+								<Dx>271</Dx>
+								<Dy>0</Dy>
+								<Dz>0</Dz>
+							</Line>
+							<Group>
+								<Id>1724074839746</Id>
+								<Name><![CDATA[gr_gridnodes]]></Name>
+								<X>-75</X>
+								<Y>-19</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>
+								<Rotation>0.0</Rotation>
+								<Presentation>
+									<Polyline>
+										<Id>1724074853961</Id>
+										<Name><![CDATA[polyline_congestedGridnode]]></Name>
+										<X>-55</X>
+										<Y>40</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>
+										<LineColorCode>v_gridLineColorCongested</LineColorCode>
+										<LineMaterial>null</LineMaterial>
+										<LineStyle>SOLID</LineStyle>
+										<BeginArrowSize>1</BeginArrowSize>
+										<BeginArrowStyle>0</BeginArrowStyle>
+										<EndArrowSize>1</EndArrowSize>
+										<EndArrowStyle>0</EndArrowStyle>
+										<FillColor/>
+										<FillColorCode>v_gridNodeColorCongested</FillColorCode>
+										<FillMaterial>null</FillMaterial>
+										<Points>
+											<Point>
+												<X>0</X>
+												<Y>0</Y>
+												<Z>0</Z>
+											</Point>
+											<Point>
+												<X>10</X>
+												<Y>-14</Y>
+												<Z>0</Z>
+											</Point>
+											<Point>
+												<X>20</X>
+												<Y>0</Y>
+												<Z>0</Z>
+											</Point>
+											<Point>
+												<X>0</X>
+												<Y>0</Y>
+												<Z>0</Z>
+											</Point>
+										</Points>
+										<Closed>false</Closed>
+									</Polyline>
+									<Text>
+										<Id>1724074853963</Id>
+										<Name><![CDATA[txt_congestedGridnode]]></Name>
+										<X>-25</X>
+										<Y>25</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[Trafo overbelast]]></Text>
+										<Font>
+											<Name><![CDATA[SansSerif]]></Name>
+											<Size>12</Size>
+											<Style>0</Style>
+										</Font>
+										<Alignment>LEFT</Alignment>
+									</Text>
+									<Polyline>
+										<Id>1724074853967</Id>
+										<Name><![CDATA[polyline_gridnode]]></Name>
+										<X>-55</X>
+										<Y>-7</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>
+										<LineColorCode>v_MVLVLineColor</LineColorCode>
+										<LineMaterial>null</LineMaterial>
+										<LineStyle>SOLID</LineStyle>
+										<BeginArrowSize>1</BeginArrowSize>
+										<BeginArrowStyle>0</BeginArrowStyle>
+										<EndArrowSize>1</EndArrowSize>
+										<EndArrowStyle>0</EndArrowStyle>
+										<FillColor/>
+										<FillColorCode>v_MVLVNodeColor</FillColorCode>
+										<FillMaterial>null</FillMaterial>
+										<Points>
+											<Point>
+												<X>0</X>
+												<Y>0</Y>
+												<Z>0</Z>
+											</Point>
+											<Point>
+												<X>10</X>
+												<Y>-14</Y>
+												<Z>0</Z>
+											</Point>
+											<Point>
+												<X>20</X>
+												<Y>0</Y>
+												<Z>0</Z>
+											</Point>
+											<Point>
+												<X>0</X>
+												<Y>0</Y>
+												<Z>0</Z>
+											</Point>
+										</Points>
+										<Closed>false</Closed>
+									</Polyline>
+									<Text>
+										<Id>1724074853969</Id>
+										<Name><![CDATA[txt_gridnode]]></Name>
+										<X>-25</X>
+										<Y>-21</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[Trafo stabiel]]></Text>
+										<Font>
+											<Name><![CDATA[SansSerif]]></Name>
+											<Size>12</Size>
+											<Style>0</Style>
+										</Font>
+										<Alignment>LEFT</Alignment>
+									</Text>
+									<Polyline>
+										<Id>1724074853971</Id>
+										<Name><![CDATA[polyline_strainedGridnode]]></Name>
+										<X>-55</X>
+										<Y>15</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>
+										<LineColorCode>v_gridNodeLineColorStrained</LineColorCode>
+										<LineMaterial>null</LineMaterial>
+										<LineStyle>SOLID</LineStyle>
+										<BeginArrowSize>1</BeginArrowSize>
+										<BeginArrowStyle>0</BeginArrowStyle>
+										<EndArrowSize>1</EndArrowSize>
+										<EndArrowStyle>0</EndArrowStyle>
+										<FillColor/>
+										<FillColorCode>v_gridNodeColorStrained</FillColorCode>
+										<FillMaterial>null</FillMaterial>
+										<Points>
+											<Point>
+												<X>0</X>
+												<Y>0</Y>
+												<Z>0</Z>
+											</Point>
+											<Point>
+												<X>10</X>
+												<Y>-14</Y>
+												<Z>0</Z>
+											</Point>
+											<Point>
+												<X>20</X>
+												<Y>0</Y>
+												<Z>0</Z>
+											</Point>
+											<Point>
+												<X>0</X>
+												<Y>0</Y>
+												<Z>0</Z>
+											</Point>
+										</Points>
+										<Closed>false</Closed>
+									</Polyline>
+									<Text>
+										<Id>1724074853973</Id>
+										<Name><![CDATA[txt_strainedGridnode]]></Name>
+										<X>-25</X>
+										<Y>2</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[Trafo belast]]></Text>
+										<Font>
+											<Name><![CDATA[SansSerif]]></Name>
+											<Size>12</Size>
+											<Style>0</Style>
+										</Font>
+										<Alignment>LEFT</Alignment>
+									</Text>
+								</Presentation>
+							</Group>
+							<Group>
+								<Id>1724074839748</Id>
+								<Name><![CDATA[gr_cables]]></Name>
+								<X>75</X>
+								<Y>5</Y>
+								<Label>
+									<X>10</X>
+									<Y>0</Y>
+								</Label>
+								<PublicFlag>true</PublicFlag>
+								<PresentationFlag>true</PresentationFlag>
+								<ShowLabel>false</ShowLabel>
+								<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
+								<VisibleCode>b_showCables</VisibleCode>
+								<EmbeddedIcon>false</EmbeddedIcon>
+								<Z>0</Z>
+								<Rotation>0.0</Rotation>
+								<Presentation>
+									<Text>
+										<Id>1724074864095</Id>
+										<Name><![CDATA[t_HV]]></Name>
+										<ExcludeFromBuild>true</ExcludeFromBuild>
+										<X>-15</X>
+										<Y>15</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[HS-net (150kV)]]></Text>
+										<Font>
+											<Name><![CDATA[SansSerif]]></Name>
+											<Size>12</Size>
+											<Style>0</Style>
+										</Font>
+										<Alignment>LEFT</Alignment>
+									</Text>
+									<Line>
+										<Id>1724074864097</Id>
+										<Name><![CDATA[line_HV]]></Name>
+										<ExcludeFromBuild>true</ExcludeFromBuild>
+										<X>-40</X>
+										<Y>25</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>2.5</LineWidth>
+										<LineColor>-16776961</LineColor>
+										<LineColorCode>v_HVGridColor</LineColorCode>
+										<LineMaterial>null</LineMaterial>
+										<LineStyle>SOLID</LineStyle>
+										<BeginArrowSize>1</BeginArrowSize>
+										<BeginArrowStyle>0</BeginArrowStyle>
+										<EndArrowSize>1</EndArrowSize>
+										<EndArrowStyle>0</EndArrowStyle>
+										<Dx>10</Dx>
+										<Dy>0</Dy>
+										<Dz>0</Dz>
+									</Line>
+									<Text>
+										<Id>1724074870571</Id>
+										<Name><![CDATA[t_MV]]></Name>
+										<X>-15</X>
+										<Y>-50</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[MS-net]]></Text>
+										<Font>
+											<Name><![CDATA[SansSerif]]></Name>
+											<Size>12</Size>
+											<Style>0</Style>
+										</Font>
+										<Alignment>LEFT</Alignment>
+									</Text>
+									<Text>
+										<Id>1724074870573</Id>
+										<Name><![CDATA[t_LV]]></Name>
+										<X>-15</X>
+										<Y>-25</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[LS-net]]></Text>
+										<Font>
+											<Name><![CDATA[SansSerif]]></Name>
+											<Size>12</Size>
+											<Style>0</Style>
+										</Font>
+										<Alignment>LEFT</Alignment>
+									</Text>
+									<Line>
+										<Id>1724074870575</Id>
+										<Name><![CDATA[line_LV]]></Name>
+										<X>-40</X>
+										<Y>-15</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>2.5</LineWidth>
+										<LineColor>-6737204</LineColor>
+										<LineColorCode>v_LVGridColor</LineColorCode>
+										<LineMaterial>null</LineMaterial>
+										<LineStyle>SOLID</LineStyle>
+										<BeginArrowSize>1</BeginArrowSize>
+										<BeginArrowStyle>0</BeginArrowStyle>
+										<EndArrowSize>1</EndArrowSize>
+										<EndArrowStyle>0</EndArrowStyle>
+										<Dx>10</Dx>
+										<Dy>0</Dy>
+										<Dz>0</Dz>
+									</Line>
+									<Line>
+										<Id>1724074870577</Id>
+										<Name><![CDATA[line_MV]]></Name>
+										<X>-40</X>
+										<Y>-40</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>2.5</LineWidth>
+										<LineColor>-12156236</LineColor>
+										<LineColorCode>v_MVGridColor</LineColorCode>
+										<LineMaterial>null</LineMaterial>
+										<LineStyle>SOLID</LineStyle>
+										<BeginArrowSize>1</BeginArrowSize>
+										<BeginArrowStyle>0</BeginArrowStyle>
+										<EndArrowSize>1</EndArrowSize>
+										<EndArrowStyle>0</EndArrowStyle>
+										<Dx>10</Dx>
+										<Dy>0</Dy>
+										<Dz>0</Dz>
+									</Line>
+									<Text>
+										<Id>1724074875518</Id>
+										<Name><![CDATA[t_gasNetwork]]></Name>
+										<ExcludeFromBuild>true</ExcludeFromBuild>
+										<X>-15</X>
+										<Y>-2.5</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[Gasnet]]></Text>
+										<Font>
+											<Name><![CDATA[SansSerif]]></Name>
+											<Size>12</Size>
+											<Style>0</Style>
+										</Font>
+										<Alignment>LEFT</Alignment>
+									</Text>
+									<Oval>
+										<Id>1724074875520</Id>
+										<Name><![CDATA[oval_gasNetwork]]></Name>
+										<ExcludeFromBuild>true</ExcludeFromBuild>
+										<X>-35</X>
+										<Y>5</Y>
+										<Label>
+											<X>0</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>
+										<RadiusX>5.75</RadiusX>
+										<RadiusY>40</RadiusY>
+										<Rotation>0.0</Rotation>
+										<FillColor>-1</FillColor>
+										<FillColorCode>v_gasGridColor</FillColorCode>
+										<FillMaterial>null</FillMaterial>
+									</Oval>
+								</Presentation>
+							</Group>
+						</Presentation>
+					</Group>
+					<Group>
+						<Id>1724074493431</Id>
+						<Name><![CDATA[gr_buildings]]></Name>
+						<X>80</X>
+						<Y>10</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>
+						<Rotation>0.0</Rotation>
+						<Presentation>
+							<Text>
+								<Id>1724074500599</Id>
+								<Name><![CDATA[t_buildings]]></Name>
+								<X>50</X>
+								<Y>-84</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[Gebouwen]]></Text>
+								<Font>
+									<Name><![CDATA[Calibri]]></Name>
+									<Size>16</Size>
+									<Style>1</Style>
+								</Font>
+								<Alignment>LEFT</Alignment>
+							</Text>
+							<Line>
+								<Id>1724074502826</Id>
+								<Name><![CDATA[line_buildings]]></Name>
+								<X>380</X>
+								<Y>-64</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>-1644806</LineColor>
+								<LineMaterial>null</LineMaterial>
+								<LineStyle>SOLID</LineStyle>
+								<BeginArrowSize>1</BeginArrowSize>
+								<BeginArrowStyle>0</BeginArrowStyle>
+								<EndArrowSize>1</EndArrowSize>
+								<EndArrowStyle>0</EndArrowStyle>
+								<Dx>-458</Dx>
+								<Dy>0</Dy>
+								<Dz>0</Dz>
+							</Line>
+							<Group>
+								<Id>1724074508882</Id>
+								<Name><![CDATA[gr_colorings]]></Name>
+								<X>-180</X>
+								<Y>0</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>
+								<Rotation>0.0</Rotation>
+								<Presentation>
+									<Text>
+										<Id>1724074508886</Id>
+										<Name><![CDATA[txt_colorings]]></Name>
+										<X>4</X>
+										<Y>-71</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[Kleur gebouwen o.b.v.:]]></Text>
+										<Font>
+											<Name><![CDATA[SansSerif]]></Name>
+											<Size>11</Size>
+											<Style>0</Style>
+										</Font>
+										<Alignment>CENTER</Alignment>
+									</Text>
+								</Presentation>
+							</Group>
+						</Presentation>
+					</Group>
 				</Presentation>
 			</Group>
-			<Text>
-				<Id>1746110287608</Id>
-				<Name><![CDATA[t_infoTextHeader]]></Name>
-				<X>20</X>
-				<Y>20</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[Extra Informatie]]></Text>
-				<Font>
-					<Name><![CDATA[Calibri]]></Name>
-					<Size>18</Size>
-					<Style>1</Style>
-				</Font>
-				<Alignment>LEFT</Alignment>
-			</Text>
-			<Text>
-				<Id>1746110287610</Id>
-				<Name><![CDATA[t_infoTextDescription]]></Name>
-				<X>20</X>
-				<Y>50</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["Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
-tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
-Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat
-nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui
-officia deserunt mollit anim id est laborum."]]></Text>
-				<Font>
-					<Name><![CDATA[SansSerif]]></Name>
-					<Size>14</Size>
-					<Style>0</Style>
-				</Font>
-				<Alignment>LEFT</Alignment>
-			</Text>
 		</Presentation>
 	</Group>
 </Presentation>
diff --git a/_alp/Agents/Zero_Interface/Variables.xml b/_alp/Agents/Zero_Interface/Variables.xml
index 15355d7e..14282878 100644
--- a/_alp/Agents/Zero_Interface/Variables.xml
+++ b/_alp/Agents/Zero_Interface/Variables.xml
@@ -2700,7 +2700,7 @@
 		<Id>1715178022675</Id>
 		<Name><![CDATA[c_orderedVehicles]]></Name>
 		<X>68</X>
-		<Y>-530</Y>
+		<Y>-520</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2718,7 +2718,7 @@
 		<Id>1715183417595</Id>
 		<Name><![CDATA[c_orderedHeatingSystemsCompanies]]></Name>
 		<X>68</X>
-		<Y>-505</Y>
+		<Y>-495</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2736,7 +2736,7 @@
 		<Id>1715183423011</Id>
 		<Name><![CDATA[c_orderedPVSystemsCompanies]]></Name>
 		<X>68</X>
-		<Y>-580</Y>
+		<Y>-570</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2754,7 +2754,7 @@
 		<Id>1719176257019</Id>
 		<Name><![CDATA[c_orderedHeatingSystemsHouses]]></Name>
 		<X>68</X>
-		<Y>-485</Y>
+		<Y>-475</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2773,7 +2773,7 @@
 		<Name><![CDATA[c_activePublicChargers]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>70</X>
-		<Y>-320</Y>
+		<Y>-310</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2792,7 +2792,7 @@
 		<Name><![CDATA[c_inactivePublicChargers]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>70</X>
-		<Y>-300</Y>
+		<Y>-290</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -2811,7 +2811,7 @@
 		<Name><![CDATA[c_fixedPublicChargers]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>70</X>
-		<Y>-340</Y>
+		<Y>-330</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -3047,7 +3047,7 @@
 		<Id>1749741070275</Id>
 		<Name><![CDATA[c_orderedParkingSpaces]]></Name>
 		<X>70</X>
-		<Y>-380</Y>
+		<Y>-370</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -3065,7 +3065,7 @@
 		<Id>1747300275742</Id>
 		<Name><![CDATA[c_orderedPVSystemsHouses]]></Name>
 		<X>68</X>
-		<Y>-555</Y>
+		<Y>-545</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -3101,7 +3101,7 @@
 		<Id>1750247117301</Id>
 		<Name><![CDATA[c_orderedV1GChargers]]></Name>
 		<X>70</X>
-		<Y>-280</Y>
+		<Y>-270</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -3137,7 +3137,7 @@
 		<Id>1750247117305</Id>
 		<Name><![CDATA[c_orderedV2GChargers]]></Name>
 		<X>70</X>
-		<Y>-260</Y>
+		<Y>-250</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -3173,7 +3173,7 @@
 		<Id>1750333596459</Id>
 		<Name><![CDATA[c_orderedActiveVehiclesPublicParking]]></Name>
 		<X>70</X>
-		<Y>-440</Y>
+		<Y>-430</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -3191,7 +3191,7 @@
 		<Id>1750333624380</Id>
 		<Name><![CDATA[c_orderedNonActiveVehiclesPublicParking]]></Name>
 		<X>70</X>
-		<Y>-420</Y>
+		<Y>-410</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -3209,7 +3209,7 @@
 		<Id>1750333680450</Id>
 		<Name><![CDATA[c_orderedVehiclesPrivateParking]]></Name>
 		<X>70</X>
-		<Y>-400</Y>
+		<Y>-390</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -3228,7 +3228,7 @@
 		<Name><![CDATA[c_orderedPublicChargers]]></Name>
 		<Description><![CDATA[Niet laadpleinen, alleen losse palen]]></Description>
 		<X>70</X>
-		<Y>-230</Y>
+		<Y>-220</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
diff --git a/_alp/Agents/Zero_Loader/AOC.Zero_Loader.xml b/_alp/Agents/Zero_Loader/AOC.Zero_Loader.xml
index eb6cd69f..99190fbf 100644
--- a/_alp/Agents/Zero_Loader/AOC.Zero_Loader.xml
+++ b/_alp/Agents/Zero_Loader/AOC.Zero_Loader.xml
@@ -12,6 +12,10 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.node.TextNode;
 import com.fasterxml.jackson.databind.node.NumericNode;
 import com.fasterxml.jackson.core.type.TypeReference;
+
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+
 import java.io.FileOutputStream;
 import java.util.stream.Stream;
 import java.util.stream.IntStream;
diff --git a/_alp/Agents/Zero_Loader/Code/Functions.java b/_alp/Agents/Zero_Loader/Code/Functions.java
index 01b71faf..f6bad02c 100644
--- a/_alp/Agents/Zero_Loader/Code/Functions.java
+++ b/_alp/Agents/Zero_Loader/Code/Functions.java
@@ -3209,7 +3209,7 @@ GridNode f_createHeatGridNode()
 J_ProfilePointer f_createEngineProfile(String profileID,double[] arguments,double[] values)
 {/*ALCODESTART::1749125189323*/
 TableFunction tf_profile = new TableFunction(arguments, values, TableFunction.InterpolationType.INTERPOLATION_LINEAR, 2, TableFunction.OutOfRangeAction.OUTOFRANGE_REPEAT, 0.0);
-J_ProfilePointer profilePointer = new J_ProfilePointer(profileID, tf_profile);
+J_ProfilePointer profilePointer = new J_ProfilePointer(profileID, tf_profile);	
 energyModel.f_addProfile(profilePointer);
 return profilePointer;
 /*ALCODEEND*/}
@@ -3924,3 +3924,241 @@ else if (map_buildingData_Vallum != null && !map_buildingData_Vallum.isEmpty())
 return connectedBuildingsData;
 /*ALCODEEND*/}
 
+J_ProfilePointer f_createEngineProfile1(String profileID,double[] arguments,double[] values,EnergyModel energyModel)
+{/*ALCODESTART::1753349205424*/
+TableFunction tf_profile = new TableFunction(arguments, values, TableFunction.InterpolationType.INTERPOLATION_LINEAR, 2, TableFunction.OutOfRangeAction.OUTOFRANGE_REPEAT, 0.0);
+J_ProfilePointer profilePointer;
+if (energyModel.f_findProfile(profileID)!=null) {
+	profilePointer=energyModel.f_findProfile(profileID);
+	profilePointer.setTableFunction(tf_profile);
+} else {
+	profilePointer = new J_ProfilePointer(profileID, tf_profile);	
+	energyModel.f_addProfile(profilePointer);
+}
+return profilePointer;
+/*ALCODEEND*/}
+
+double f_setEngineProfilesAfterDeserialisation(EnergyModel energyModel)
+{/*ALCODESTART::1753349205426*/
+energyModel.p_truckTripsCsv = inputCSVtruckTrips;
+energyModel.p_householdTripsCsv = inputCSVhouseholdTrips;
+energyModel.p_cookingPatternCsv = inputCSVcookingActivities;
+
+//Profile Arguments
+double[] a_arguments_hr = ListUtil.doubleListToArray(defaultProfiles_data.arguments_hr());
+
+//Weather data
+double[] a_ambientTemperatureProfile_degC = ListUtil.doubleListToArray(defaultProfiles_data.ambientTemperatureProfile_degC());
+double[] a_PVProductionProfile35DegSouth_fr = ListUtil.doubleListToArray(defaultProfiles_data.PVProductionProfile35DegSouth_fr());
+double[] a_PVProductionProfile15DegEastWest_fr = ListUtil.doubleListToArray(defaultProfiles_data.PVProductionProfile15DegEastWest_fr());
+double[] a_windProductionProfile_fr = ListUtil.doubleListToArray(defaultProfiles_data.windProductionProfile_fr());
+
+//EPEX data
+double[] a_epexProfile_eurpMWh = ListUtil.doubleListToArray(defaultProfiles_data.epexProfile_eurpMWh()); 
+
+//Various demand data
+double[] a_defaultHouseElectricityDemandProfile_fr = ListUtil.doubleListToArray(defaultProfiles_data.defaultHouseElectricityDemandProfile_fr());
+double[] a_defaultHouseHotWaterDemandProfile_fr = ListUtil.doubleListToArray(defaultProfiles_data.defaultHouseHotWaterDemandProfile_fr());
+double[] a_defaultHouseCookingDemandProfile_fr = ListUtil.doubleListToArray(defaultProfiles_data.defaultHouseCookingDemandProfile_fr());
+double[] a_defaultOfficeElectricityDemandProfile_fr = ListUtil.doubleListToArray(defaultProfiles_data.defaultOfficeElectricityDemandProfile_fr());
+double[] a_defaultBuildingHeatDemandProfile_fr = ListUtil.doubleListToArray(defaultProfiles_data.defaultBuildingHeatDemandProfile_fr());
+
+//Create Weather engine profiles
+energyModel.pp_ambientTemperature_degC = f_createEngineProfile1("ambient_temperature_degC", a_arguments_hr, a_ambientTemperatureProfile_degC, energyModel);
+energyModel.pp_PVProduction35DegSouth_fr = f_createEngineProfile1("pv_production_south_fr", a_arguments_hr, a_PVProductionProfile35DegSouth_fr, energyModel);
+energyModel.pp_PVProduction15DegEastWest_fr = f_createEngineProfile1("pv_production_eastwest_fr", a_arguments_hr, a_PVProductionProfile15DegEastWest_fr, energyModel);
+energyModel.pp_windProduction_fr = f_createEngineProfile1("wind_production_fr", a_arguments_hr, a_windProductionProfile_fr, energyModel);
+
+//Create Epex engine profile
+energyModel.pp_dayAheadElectricityPricing_eurpMWh = f_createEngineProfile1("epex_price_eurpMWh", a_arguments_hr, a_epexProfile_eurpMWh, energyModel);
+
+//Create Consumption engine profiles:
+f_createEngineProfile1("default_house_electricity_demand_fr", a_arguments_hr, a_defaultHouseElectricityDemandProfile_fr, energyModel);
+f_createEngineProfile1("default_house_hot_water_demand_fr", a_arguments_hr, a_defaultHouseHotWaterDemandProfile_fr, energyModel);
+f_createEngineProfile1("default_house_cooking_demand_fr", a_arguments_hr, a_defaultHouseCookingDemandProfile_fr, energyModel);
+f_createEngineProfile1("default_office_electricity_demand_fr", a_arguments_hr, a_defaultOfficeElectricityDemandProfile_fr, energyModel);
+f_createEngineProfile1("default_building_heat_demand_fr", a_arguments_hr, a_defaultBuildingHeatDemandProfile_fr, energyModel);
+
+
+//Create custom engine profiles
+for(CustomProfile_data customProfile : c_customProfiles_data){
+	f_createEngineProfile1(customProfile.customProfileID(), customProfile.getArgumentsArray(), customProfile.getValuesArray(), energyModel);
+}
+/*ALCODEEND*/}
+
+double f_reconstructGridConnections(EnergyModel deserializedEnergyModel)
+{/*ALCODESTART::1753449467888*/
+ArrayList<GridConnection> allConnections = new ArrayList<>();
+allConnections.addAll(deserializedEnergyModel.c_gridConnections);
+allConnections.addAll(deserializedEnergyModel.c_pausedGridConnections);
+
+for(GridConnection GC : allConnections){
+	GC.energyModel = deserializedEnergyModel;
+	if (GC instanceof GCHouse){
+		//toMove.add(GC);
+		f_reconstructAgent(GC, deserializedEnergyModel.Houses, deserializedEnergyModel);
+	} else if (GC instanceof GCEnergyProduction) {
+		f_reconstructAgent(GC, deserializedEnergyModel.EnergyProductionSites, deserializedEnergyModel);
+	} else if (GC instanceof GCEnergyConversion) {
+		f_reconstructAgent(GC, deserializedEnergyModel.EnergyConversionSites, deserializedEnergyModel);
+	} else if (GC instanceof GCGridBattery) {
+		f_reconstructAgent(GC, deserializedEnergyModel.GridBatteries, deserializedEnergyModel);
+	} else if (GC instanceof GCNeighborhood) {
+		f_reconstructAgent(GC, deserializedEnergyModel.Neighborhoods, deserializedEnergyModel);
+	} else if (GC instanceof GCPublicCharger) {
+		f_reconstructAgent(GC, deserializedEnergyModel.PublicChargers, deserializedEnergyModel);
+	} else if (GC instanceof GCUtility) {
+		f_reconstructAgent(GC, deserializedEnergyModel.UtilityConnections, deserializedEnergyModel);
+	}
+	GC.f_startAfterDeserialisation();
+}
+
+
+/*ALCODEEND*/}
+
+double f_reconstructEnergyModel(EnergyModel energyModel)
+{/*ALCODESTART::1753449467890*/
+// Code Instead of Agent.goToPopulation() (which resets all parameters to default!)	
+
+try{ // Reflection trick to get to Agent.owner private field
+	energyModel.forceSetOwner(energyModel, pop_energyModels);
+} catch (Exception e) {
+	e.printStackTrace();
+}
+
+energyModel.setEngine(getEngine());	
+energyModel.instantiateBaseStructure_xjal();
+energyModel.setEnvironment(this.getEnvironment());
+traceln("EnergyModel owner: %s", energyModel.getOwner());
+
+pop_energyModels._add(energyModel ); // Add to the population
+int popSize = pop_energyModels.size(); 
+pop_energyModels.callCreate(energyModel , popSize); // Update population object
+energyModel.start();
+/*ALCODEEND*/}
+
+double f_reconstructAgent(Agent agent,AgentArrayList pop,EnergyModel energyModel)
+{/*ALCODESTART::1753449467892*/
+// Code Instead of Agent.goToPopulation() (which resets many variables to default!)	
+try{ // Reflection trick to get to Agent.owner private field
+	if (agent instanceof GridNode) {
+	
+		((GridNode)agent).forceSetOwner(agent,pop);
+	} else if (agent instanceof GridConnection) {
+		((GridConnection)agent).forceSetOwner(agent,pop);
+	} else if (agent instanceof Actor) {
+		((Actor)agent).forceSetOwner(agent,pop);
+	}
+} catch (Exception e) {
+	e.printStackTrace();
+}
+	
+
+agent.setEngine(getEngine());	
+agent.instantiateBaseStructure_xjal();
+agent.setEnvironment(pop.getEnvironment());
+
+pop._add(agent); // Add to the population
+int popSize = pop.size(); 
+pop.callCreate(agent, popSize); // Update population object
+
+/*ALCODEEND*/}
+
+double f_reconstructGridConnections1(EnergyModel energyModel)
+{/*ALCODESTART::1753449467894*/
+// Code Instead of Agent.goToPopulation() (which resets many variables to default!)	
+GC.energyModel = energyModel;
+try{ // Reflection trick to get to Agent.owner private field
+	GC.forceSetOwner(GC,pop);
+} catch (Exception e) {
+	e.printStackTrace();
+}
+	
+traceln("GC owner: %s", GC.getOwner());
+GC.setEngine(getEngine());	
+GC.instantiateBaseStructure_xjal();
+GC.setEnvironment(pop.getEnvironment());
+
+pop._add(GC); // Add to the population
+int popSize = pop.size(); 
+pop.callCreate(GC, popSize); // Update population object
+
+/*ALCODEEND*/}
+
+double f_addMixins()
+{/*ALCODESTART::1753451091785*/
+v_objectMapper.addMixIn(Agent.class, AgentMixin.class);
+v_objectMapper.addMixIn(EnergyModel.class, EnergyModelMixin.class);
+v_objectMapper.addMixIn(Actor.class, ActorMixin.class);
+v_objectMapper.addMixIn(DataSet.class, DataSetMixin.class);
+v_objectMapper.addMixIn(com.anylogic.engine.TableFunction.class, IgnoreClassMixin.class);
+//objectMapper.addMixIn(com.anylogic.engine.TableFunction.class, TableFunctionMixin.class);
+v_objectMapper.addMixIn(com.anylogic.engine.markup.GISRegion.class, IgnoreClassMixin.class);
+v_objectMapper.addMixIn(com.anylogic.engine.presentation.ViewArea.class, IgnoreClassMixin.class);
+v_objectMapper.addMixIn(com.anylogic.engine.AgentSpacePosition.class, IgnoreClassMixin.class);
+
+// Weirdness regarding material handling toolbox	
+v_objectMapper.addMixIn(com.anylogic.engine.AgentSpacePosition.class, IgnoreClassMixin.class);
+v_objectMapper.addMixIn(com.anylogic.engine.markup.AbstractWall.class, IgnoreClassMixin.class);
+v_objectMapper.addMixIn(com.anylogic.engine.markup.RailwayTrack.class, IgnoreClassMixin.class);
+v_objectMapper.addMixIn(com.anylogic.engine.markup.PalletRack.class, IgnoreClassMixin.class);
+v_objectMapper.addMixIn(com.anylogic.engine.markup.RoadNetwork.class, IgnoreClassMixin.class);
+v_objectMapper.addMixIn(com.anylogic.engine.markup.AreaNode.class, IgnoreClassMixin.class);
+v_objectMapper.addMixIn(com.anylogic.engine.markup.AbstractFluidMarkup.class, IgnoreClassMixin.class);
+v_objectMapper.addMixIn(com.anylogic.engine.markup.Lift.class, IgnoreClassMixin.class);
+v_objectMapper.addMixIn(com.anylogic.engine.markup.ConveyorNode.class, IgnoreClassMixin.class);
+v_objectMapper.addMixIn(com.anylogic.engine.markup.Node.class, IgnoreClassMixin.class);
+
+/*ALCODEEND*/}
+
+double f_reconstructActors(EnergyModel deserializedEnergyModel)
+{/*ALCODESTART::1753712630322*/
+for(Actor AC : deserializedEnergyModel.c_actors){
+		
+		if (AC instanceof ConnectionOwner) {
+			((ConnectionOwner)AC).energyModel = deserializedEnergyModel;
+			f_reconstructAgent(AC, deserializedEnergyModel.pop_connectionOwners, deserializedEnergyModel);
+		} else if (AC instanceof EnergySupplier) {
+			((EnergySupplier)AC).energyModel = deserializedEnergyModel;
+			f_reconstructAgent(AC, deserializedEnergyModel.pop_energySuppliers, deserializedEnergyModel);
+		} else if (AC instanceof EnergyCoop) {
+			((EnergyCoop)AC).energyModel = deserializedEnergyModel;
+			f_reconstructAgent(AC, deserializedEnergyModel.pop_energyCoops, deserializedEnergyModel);
+			((EnergyCoop)AC).f_startAfterDeserialisation();
+		} else if (AC instanceof GridOperator) {
+			((GridOperator)AC).energyModel = deserializedEnergyModel;
+			f_reconstructAgent(AC, deserializedEnergyModel.pop_gridOperators, deserializedEnergyModel);
+		}
+	}
+
+/*ALCODEEND*/}
+
+double f_reconstructGIS_Objects(EnergyModel deserializedEnergyModel)
+{/*ALCODESTART::1753712697685*/
+for(GIS_Object GO : deserializedEnergyModel.c_GISObjects){
+	GO.gisRegion = c_GISregions.get(GO.p_id);
+	
+	if (GO instanceof GIS_Building) {
+		((GIS_Building)GO).energyModel = deserializedEnergyModel;
+		f_reconstructAgent(GO, deserializedEnergyModel.pop_GIS_Buildings, deserializedEnergyModel);
+	} else if (GO instanceof GIS_Parcel) {
+		((GIS_Parcel)GO).energyModel = deserializedEnergyModel;
+		f_reconstructAgent(GO, deserializedEnergyModel.pop_GIS_Parcels, deserializedEnergyModel);
+	} else {
+		GO.energyModel = deserializedEnergyModel;
+		f_reconstructAgent(GO, deserializedEnergyModel.pop_GIS_Objects, deserializedEnergyModel);
+		//GO.f_startAfterDeserialisation();
+	}
+	GO.f_resetStyle();
+}
+/*ALCODEEND*/}
+
+double f_reconstructGridNodes(EnergyModel deserializedEnergyModel)
+{/*ALCODESTART::1753712761420*/
+for(GridNode GN : deserializedEnergyModel.c_gridNodes){
+	GN.energyModel = deserializedEnergyModel;
+	f_reconstructAgent(GN, deserializedEnergyModel.pop_gridNodes, deserializedEnergyModel);
+}
+
+/*ALCODEEND*/}
+
diff --git a/_alp/Agents/Zero_Loader/Code/Functions.xml b/_alp/Agents/Zero_Loader/Code/Functions.xml
index 88fe49c3..0aadf406 100644
--- a/_alp/Agents/Zero_Loader/Code/Functions.xml
+++ b/_alp/Agents/Zero_Loader/Code/Functions.xml
@@ -1743,4 +1743,225 @@ verbruik = levering + productie - teruglevering]]></Description>
 		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
+	<Function AccessType="public" StaticFunction="false">
+		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
+		<ReturnType>J_ProfilePointer</ReturnType>
+		<Id>1753349205424</Id>
+		<Name><![CDATA[f_createEngineProfile1]]></Name>
+		<Description><![CDATA[Functie van gillis voor inladen weer data!]]></Description>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>2109</X>
+		<Y>450</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[profileID]]></Name>
+			<Type><![CDATA[String]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[arguments]]></Name>
+			<Type><![CDATA[double[]]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[values]]></Name>
+			<Type><![CDATA[double[]]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[energyModel]]></Name>
+			<Type><![CDATA[EnergyModel]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="public" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1753349205426</Id>
+		<Name><![CDATA[f_setEngineProfilesAfterDeserialisation]]></Name>
+		<Description><![CDATA[Functie van gillis voor inladen weer data!]]></Description>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>2090</X>
+		<Y>430</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[energyModel]]></Name>
+			<Type><![CDATA[EnergyModel]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1753449467888</Id>
+		<Name><![CDATA[f_reconstructGridConnections]]></Name>
+		<X>2123.333</X>
+		<Y>302</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[deserializedEnergyModel]]></Name>
+			<Type><![CDATA[EnergyModel]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1753449467890</Id>
+		<Name><![CDATA[f_reconstructEnergyModel]]></Name>
+		<X>2123.333</X>
+		<Y>282</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[energyModel]]></Name>
+			<Type><![CDATA[EnergyModel]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1753449467892</Id>
+		<Name><![CDATA[f_reconstructAgent]]></Name>
+		<X>2135</X>
+		<Y>379</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[agent]]></Name>
+			<Type><![CDATA[Agent]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[pop]]></Name>
+			<Type><![CDATA[AgentArrayList]]></Type>
+		</Parameter>
+		<Parameter>
+			<Name><![CDATA[energyModel]]></Name>
+			<Type><![CDATA[EnergyModel]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1753449467894</Id>
+		<Name><![CDATA[f_reconstructGridConnections1]]></Name>
+		<ExcludeFromBuild>true</ExcludeFromBuild>
+		<X>2110</X>
+		<Y>480</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[energyModel]]></Name>
+			<Type><![CDATA[EnergyModel]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="protected" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1753451091785</Id>
+		<Name><![CDATA[f_addMixins]]></Name>
+		<X>2140</X>
+		<Y>69</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1753712630322</Id>
+		<Name><![CDATA[f_reconstructActors]]></Name>
+		<X>2123</X>
+		<Y>322</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[deserializedEnergyModel]]></Name>
+			<Type><![CDATA[EnergyModel]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1753712697685</Id>
+		<Name><![CDATA[f_reconstructGIS_Objects]]></Name>
+		<X>2123</X>
+		<Y>362</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[deserializedEnergyModel]]></Name>
+			<Type><![CDATA[EnergyModel]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
+	<Function AccessType="default" StaticFunction="false">
+		<ReturnModificator>VOID</ReturnModificator>
+		<ReturnType>double</ReturnType>
+		<Id>1753712761420</Id>
+		<Name><![CDATA[f_reconstructGridNodes]]></Name>
+		<X>2123</X>
+		<Y>342</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Parameter>
+			<Name><![CDATA[deserializedEnergyModel]]></Name>
+			<Type><![CDATA[EnergyModel]]></Type>
+		</Parameter>
+		<Body xmlns:al="http://anylogic.com"/>
+	</Function>
 </Functions>
diff --git a/_alp/Agents/Zero_Loader/EmbeddedObjects.xml b/_alp/Agents/Zero_Loader/EmbeddedObjects.xml
index a3918fbb..b85fe237 100644
--- a/_alp/Agents/Zero_Loader/EmbeddedObjects.xml
+++ b/_alp/Agents/Zero_Loader/EmbeddedObjects.xml
@@ -109,6 +109,115 @@
 		<InitializationDatabaseType>ONE_AGENT_PER_DATABASE_RECORD</InitializationDatabaseType>
 		<QuantityColumn/>
 	</EmbeddedObject>
+	<EmbeddedObject>
+		<Id>1708522361909</Id>
+		<Name><![CDATA[pop_energyModels]]></Name>
+		<X>2125</X>
+		<Y>259</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>
+		<GenericParameterSubstitute>
+			<GenericParameterSubstituteReference>
+				<PackageName>zero_engine</PackageName>
+				<ClassName>EnergyModel</ClassName>
+				<ItemName>1658477103138</ItemName>
+			</GenericParameterSubstituteReference>
+		</GenericParameterSubstitute>
+		<Parameters>
+			<Parameter>
+				<Name><![CDATA[p_timeStep_h]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_forecastTime_h]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_truckTripsCsv]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_householdTripsCsv]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_cookingPatternCsv]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_year]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[avgc_data]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[b_parallelizeConnectionOwners]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[b_parallelizeGridConnections]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[b_enableDLR]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_winterWeekNumber]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_summerWeekNumber]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_runStartTime_h]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_runEndTime_h]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[b_isInitialized]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[b_storePreviousRapidRunData]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_regionName]]></Name>
+			</Parameter>
+		</Parameters>
+		<ReplicationFlag>true</ReplicationFlag>
+		<Replication Class="CodeValue">
+			<Code><![CDATA[0]]></Code>
+		</Replication>
+		<CollectionType>ARRAY_LIST_BASED</CollectionType>
+		<InEnvironment>true</InEnvironment>
+		<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>SPECIFIED_NUMBER</InitializationType>
+		<InitializationDatabaseTableQuery>
+			<Id>1658477089963</Id>
+			<TableReference/>
+		</InitializationDatabaseTableQuery>
+		<InitializationDatabaseType>ONE_AGENT_PER_DATABASE_RECORD</InitializationDatabaseType>
+		<QuantityColumn/>
+	</EmbeddedObject>
 	<EmbeddedObject>
 		<Id>1726584829907</Id>
 		<Name><![CDATA[avgc_data]]></Name>
diff --git a/_alp/Agents/Zero_Loader/Levels/Level.level.xml b/_alp/Agents/Zero_Loader/Levels/Level.level.xml
index 6bfaa07e..8df110cd 100644
--- a/_alp/Agents/Zero_Loader/Levels/Level.level.xml
+++ b/_alp/Agents/Zero_Loader/Levels/Level.level.xml
@@ -30,7 +30,7 @@
 	<Rectangle>
 		<Id>1726584205907</Id>
 		<Name><![CDATA[rect_projectDataTracking]]></Name>
-		<X>1440</X>
+		<X>1580</X>
 		<Y>20</Y>
 		<Label>
 			<X>10</X>
@@ -47,7 +47,7 @@
 		<LineColor>-65536</LineColor>
 		<LineMaterial>null</LineMaterial>
 		<LineStyle>SOLID</LineStyle>
-		<Width>460</Width>
+		<Width>320</Width>
 		<Height>490</Height>
 		<Rotation>0.0</Rotation>
 		<FillColor>-1</FillColor>
@@ -109,7 +109,7 @@
 	<Text>
 		<Id>1726584205913</Id>
 		<Name><![CDATA[txt_timeLoggers]]></Name>
-		<X>1470</X>
+		<X>1610</X>
 		<Y>70</Y>
 		<Label>
 			<X>0</X>
@@ -185,7 +185,7 @@
 	<Text>
 		<Id>1726584205921</Id>
 		<Name><![CDATA[txt_projectDataTracking]]></Name>
-		<X>1460</X>
+		<X>1600</X>
 		<Y>40</Y>
 		<Label>
 			<X>0</X>
@@ -876,7 +876,7 @@
 	<Rectangle>
 		<Id>1730217549237</Id>
 		<Name><![CDATA[rect_supportFunctions]]></Name>
-		<X>1520</X>
+		<X>1540</X>
 		<Y>750</Y>
 		<Label>
 			<X>10</X>
@@ -893,7 +893,7 @@
 		<LineColor>-16777216</LineColor>
 		<LineMaterial>null</LineMaterial>
 		<LineStyle>SOLID</LineStyle>
-		<Width>390</Width>
+		<Width>370</Width>
 		<Height>220</Height>
 		<Rotation>0.0</Rotation>
 		<FillColor>-1</FillColor>
@@ -1102,4 +1102,172 @@
 		</Font>
 		<Alignment>LEFT</Alignment>
 	</Text>
+	<Rectangle>
+		<Id>1753349205420</Id>
+		<Name><![CDATA[rect_defaultStartup1]]></Name>
+		<X>2050</X>
+		<Y>0</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>2</LineWidth>
+		<LineColor>-16777216</LineColor>
+		<LineMaterial>null</LineMaterial>
+		<LineStyle>SOLID</LineStyle>
+		<Width>340</Width>
+		<Height>400</Height>
+		<Rotation>0.0</Rotation>
+		<FillColor>-1</FillColor>
+		<FillMaterial>null</FillMaterial>
+	</Rectangle>
+	<Text>
+		<Id>1753349205422</Id>
+		<Name><![CDATA[txt_loaderStartupDeserialisation]]></Name>
+		<X>2070</X>
+		<Y>9</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[Loader after deserialisation (in Progress!)]]></Text>
+		<Font>
+			<Name><![CDATA[SansSerif]]></Name>
+			<Size>14</Size>
+			<Style>1</Style>
+		</Font>
+		<Alignment>LEFT</Alignment>
+	</Text>
+	<Control Type="Button">
+		<EmbeddedIcon>false</EmbeddedIcon>
+		<Id>1753449467882</Id>
+		<Name><![CDATA[deserialize2]]></Name>
+		<X>2103.333</X>
+		<Y>202</Y>
+		<Label>
+			<X>0</X>
+			<Y>-10</Y>
+		</Label>
+		<PublicFlag>true</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>false</ShowLabel>
+		<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
+		<BasicProperties Width="162" Height="30">
+			<EmbeddedIcon>false</EmbeddedIcon>
+			<TextColor>-16777216</TextColor>
+			<Enabled>true</Enabled>
+			<ActionCode>// Collect GIS_Objects into hashmap, to link to new EnergyModel.
+energyModel.pop_GIS_Buildings.forEach(x-&gt;{c_GISregions.put(x.p_id, x.gisRegion);});
+energyModel.pop_GIS_Objects.forEach(x-&gt;{c_GISregions.put(x.p_id, x.gisRegion);});
+energyModel.pop_GIS_Parcels.forEach(x-&gt;{c_GISregions.put(x.p_id, x.gisRegion);});
+
+try {
+	v_objectMapper = new ObjectMapper();
+	f_addMixins();
+	
+	// Deserialize the JSON into a new EnergyModel instance:
+	EnergyModel deserializedEnergyModel = v_objectMapper.readValue(new File("energyModel.json"), EnergyModel.class);
+	
+	// Reconstruct all Agents
+	f_reconstructEnergyModel(deserializedEnergyModel);	
+	f_reconstructGridConnections(deserializedEnergyModel);
+	f_reconstructActors(deserializedEnergyModel);
+	f_reconstructGridNodes(deserializedEnergyModel);
+	f_reconstructGIS_Objects(deserializedEnergyModel);
+	
+	// Get profilePointer tableFunctions from 'original' energyModel
+	deserializedEnergyModel.c_profiles.forEach(x-&gt;{
+		J_ProfilePointer origProfile = energyModel.f_findProfile(x.name);
+		x.setTableFunction(origProfile.getTableFunction());
+	});
+	//loader_L4L.f_setEngineProfilesL4LafterDeserialisation(deserializedEnergyModel);
+	deserializedEnergyModel.b_isInitialized = false;
+	deserializedEnergyModel.f_initializeEngine();	
+	
+	energyModel = deserializedEnergyModel;
+	zero_Interface.energyModel = deserializedEnergyModel;
+	zero_Interface.uI_Results.energyModel = deserializedEnergyModel;
+	//zero_Interface.f_initalAssetOrdering();
+	zero_Interface.f_clearSelectionAndSelectEnergyModel();
+	zero_Interface.f_updateMainInterfaceSliders();
+	if (zero_Interface.p_selectedProjectType==OL_ProjectType.RESIDENTIAL) {
+		zero_Interface.f_initialisationOfResidentialSliders();
+	}
+	zero_Interface.f_updateOrderedListsAfterDeserialising(deserializedEnergyModel);
+	
+} catch (IOException e) {
+	e.printStackTrace();
+}
+
+</ActionCode>
+		</BasicProperties>
+		<ExtendedProperties>
+			<Font Name="Dialog" Size="11" Style="0"/>
+			<LabelText>deserialize_energy_model</LabelText>
+		</ExtendedProperties>
+	</Control>
+	<Control Type="Button">
+		<EmbeddedIcon>false</EmbeddedIcon>
+		<Id>1753449467884</Id>
+		<Name><![CDATA[serialize1]]></Name>
+		<X>2106.333</X>
+		<Y>99</Y>
+		<Label>
+			<X>0</X>
+			<Y>-10</Y>
+		</Label>
+		<PublicFlag>true</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>false</ShowLabel>
+		<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
+		<BasicProperties Width="160" Height="30">
+			<EmbeddedIcon>false</EmbeddedIcon>
+			<TextColor>-16777216</TextColor>
+			<Enabled>true</Enabled>
+			<ActionCode>energyModel.pop_gridNodes.forEach(x-&gt;energyModel.c_gridNodes.add(x));
+energyModel.pop_GIS_Buildings.forEach(x-&gt;{energyModel.c_GISObjects.add(x); c_GISregions.put(x.p_id, x.gisRegion);x.f_writeStyleStrings();});
+energyModel.pop_GIS_Objects.forEach(x-&gt;{energyModel.c_GISObjects.add(x); c_GISregions.put(x.p_id, x.gisRegion);x.f_writeStyleStrings();});
+energyModel.pop_GIS_Parcels.forEach(x-&gt;{energyModel.c_GISObjects.add(x); c_GISregions.put(x.p_id, x.gisRegion);x.f_writeStyleStrings();});
+
+v_objectMapper = new ObjectMapper();
+f_addMixins();
+
+v_objectMapper.setVisibility(PropertyAccessor.GETTER, JsonAutoDetect.Visibility.NONE);
+v_objectMapper.addMixIn(AgentArrayList.class, IgnoreClassMixin.class);
+//objectMapper.addMixIn(AgentArrayList.class, IgnoreClassMixin.class);
+v_objectMapper.addMixIn(TextFile.class, IgnoreClassMixin.class);
+v_objectMapper.addMixIn(EnergyDataViewer.class, IgnoreClassMixin.class);
+
+
+try {
+	
+	//objectMapper.setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
+	
+	//objectMapper.writeValue(new File("objects.json"), myAgents.get(0));
+	v_objectMapper.writeValue(new File("energyModel.json"), energyModel);
+} catch (IOException e) {
+	e.printStackTrace();
+}
+</ActionCode>
+		</BasicProperties>
+		<ExtendedProperties>
+			<Font Name="Dialog" Size="11" Style="0"/>
+			<LabelText>serialize_energy_model</LabelText>
+		</ExtendedProperties>
+	</Control>
 </Presentation>
diff --git a/_alp/Agents/Zero_Loader/Variables.xml b/_alp/Agents/Zero_Loader/Variables.xml
index 130aeb54..5d97d550 100644
--- a/_alp/Agents/Zero_Loader/Variables.xml
+++ b/_alp/Agents/Zero_Loader/Variables.xml
@@ -3,7 +3,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1726584205883</Id>
 		<Name><![CDATA[v_timeOfModelStart_ms]]></Name>
-		<X>1480</X>
+		<X>1620</X>
 		<Y>170</Y>
 		<Label>
 			<X>10</X>
@@ -22,7 +22,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1726584205885</Id>
 		<Name><![CDATA[v_modelStartUpDuration_s]]></Name>
-		<X>1480</X>
+		<X>1620</X>
 		<Y>190</Y>
 		<Label>
 			<X>10</X>
@@ -45,7 +45,7 @@
 		<Id>1726584205887</Id>
 		<Name><![CDATA[v_hourOfYearStart]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>1480</X>
+		<X>1620</X>
 		<Y>100</Y>
 		<Label>
 			<X>10</X>
@@ -67,7 +67,7 @@
 	<Variable Class="PlainVariable">
 		<Id>1726584205889</Id>
 		<Name><![CDATA[v_remainingNumberOfTrucks]]></Name>
-		<X>1480</X>
+		<X>1620</X>
 		<Y>390</Y>
 		<Label>
 			<X>10</X>
@@ -88,7 +88,7 @@
 		<Name><![CDATA[v_totalFloorAreaAnonymousCompanies_m2]]></Name>
 		<Description><![CDATA[variable that tracks how much floor area remains for the average companies. (this will be used to determine the average m3 and kwh per m2 floor area to be used by the unkown companies (that have not filled in the survey). 
 Calculated by: initial value (total floor area of the area) - total floor area of the survey companies]]></Description>
-		<X>1481</X>
+		<X>1621</X>
 		<Y>261</Y>
 		<Label>
 			<X>10</X>
@@ -107,7 +107,7 @@ Calculated by: initial value (total floor area of the area) - total floor area o
 	<Variable Class="PlainVariable">
 		<Id>1726584205893</Id>
 		<Name><![CDATA[v_numberOfCompaniesNoSurvey]]></Name>
-		<X>1481</X>
+		<X>1621</X>
 		<Y>241</Y>
 		<Label>
 			<X>10</X>
@@ -126,7 +126,7 @@ Calculated by: initial value (total floor area of the area) - total floor area o
 	<Variable Class="PlainVariable">
 		<Id>1726584205895</Id>
 		<Name><![CDATA[v_remainingGasConsumption_m3]]></Name>
-		<X>1481</X>
+		<X>1621</X>
 		<Y>301</Y>
 		<Label>
 			<X>10</X>
@@ -146,7 +146,7 @@ Calculated by: initial value (total floor area of the area) - total floor area o
 		<Id>1726584205897</Id>
 		<Name><![CDATA[v_remainingElectricityDelivery_kWh]]></Name>
 		<Description><![CDATA[This variable indicates an annual maximum consumption for all the created consumption profiles combined. Setting it produces warnings if this is exceeded.]]></Description>
-		<X>1481</X>
+		<X>1621</X>
 		<Y>281</Y>
 		<Label>
 			<X>10</X>
@@ -168,7 +168,7 @@ Calculated by: initial value (total floor area of the area) - total floor area o
 	<Variable Class="PlainVariable">
 		<Id>1726584205899</Id>
 		<Name><![CDATA[v_remainingNumberOfVans]]></Name>
-		<X>1481</X>
+		<X>1621</X>
 		<Y>371</Y>
 		<Label>
 			<X>10</X>
@@ -187,7 +187,7 @@ Calculated by: initial value (total floor area of the area) - total floor area o
 	<Variable Class="PlainVariable">
 		<Id>1727683925084</Id>
 		<Name><![CDATA[v_nbCreatedVans]]></Name>
-		<X>1480</X>
+		<X>1620</X>
 		<Y>420</Y>
 		<Label>
 			<X>10</X>
@@ -209,7 +209,7 @@ Calculated by: initial value (total floor area of the area) - total floor area o
 	<Variable Class="PlainVariable">
 		<Id>1733235094633</Id>
 		<Name><![CDATA[v_numberOfSurveyCompanies]]></Name>
-		<X>1480</X>
+		<X>1620</X>
 		<Y>220</Y>
 		<Label>
 			<X>10</X>
@@ -229,7 +229,7 @@ Calculated by: initial value (total floor area of the area) - total floor area o
 		<Id>1733389557748</Id>
 		<Name><![CDATA[v_simStartHour_h]]></Name>
 		<Description><![CDATA[The hour 0 is defined as january 1st, 00:00h in the year energyModel.p_year]]></Description>
-		<X>1480</X>
+		<X>1620</X>
 		<Y>119</Y>
 		<Label>
 			<X>10</X>
@@ -251,7 +251,7 @@ Calculated by: initial value (total floor area of the area) - total floor area o
 	<Variable Class="PlainVariable">
 		<Id>1733390702422</Id>
 		<Name><![CDATA[v_simDuration_h]]></Name>
-		<X>1480</X>
+		<X>1620</X>
 		<Y>138</Y>
 		<Label>
 			<X>10</X>
@@ -273,7 +273,7 @@ Calculated by: initial value (total floor area of the area) - total floor area o
 	<Variable Class="PlainVariable">
 		<Id>1736255870137</Id>
 		<Name><![CDATA[v_remainingNumberOfCars]]></Name>
-		<X>1480</X>
+		<X>1620</X>
 		<Y>350</Y>
 		<Label>
 			<X>10</X>
@@ -308,6 +308,25 @@ Calculated by: initial value (total floor area of the area) - total floor area o
 			<Type><![CDATA[Map<String, com.zenmo.bag.Pand>]]></Type>
 		</Properties>
 	</Variable>
+	<Variable Class="PlainVariable">
+		<Id>1753450969530</Id>
+		<Name><![CDATA[v_objectMapper]]></Name>
+		<X>2140</X>
+		<Y>49</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[ObjectMapper]]></Type>
+		</Properties>
+	</Variable>
 	<Variable Class="Parameter">
 		<Id>1726584206064</Id>
 		<Name><![CDATA[zero_Interface]]></Name>
@@ -438,7 +457,7 @@ Calculated by: initial value (total floor area of the area) - total floor area o
 	<Variable Class="CollectionVariable">
 		<Id>1726584205737</Id>
 		<Name><![CDATA[c_gridNodeIDsInScope]]></Name>
-		<X>1480</X>
+		<X>1620</X>
 		<Y>450</Y>
 		<Label>
 			<X>10</X>
@@ -726,7 +745,7 @@ Calculated by: initial value (total floor area of the area) - total floor area o
 	<Variable Class="CollectionVariable">
 		<Id>1749631164240</Id>
 		<Name><![CDATA[c_gridNodeIDsWithProfiles]]></Name>
-		<X>1480</X>
+		<X>1620</X>
 		<Y>490</Y>
 		<Label>
 			<X>10</X>
@@ -777,4 +796,22 @@ Calculated by: initial value (total floor area of the area) - total floor area o
 			<ValueElementClass>String</ValueElementClass>
 		</Properties>
 	</Variable>
+	<Variable Class="CollectionVariable">
+		<Id>1753449467886</Id>
+		<Name><![CDATA[c_GISregions]]></Name>
+		<X>2135.333</X>
+		<Y>163</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>LinkedHashMap</CollectionClass>
+			<ElementClass>String</ElementClass>
+			<ValueElementClass>GISRegion</ValueElementClass>
+		</Properties>
+	</Variable>
 </Variables>