diff --git a/Zero_Interface-Loader.alpx b/Zero_Interface-Loader.alpx
index ae366acc..d35a300e 100644
--- a/Zero_Interface-Loader.alpx
+++ b/Zero_Interface-Loader.alpx
@@ -110,7 +110,7 @@
 			</OptionList>
 			<OptionList>
 				<Id>1709718356700</Id>
-				<Name><![CDATA[EnergyDemandTab]]></Name>
+				<Name><![CDATA[OL_CustomScenarioTabs]]></Name>
 				<Option>
 					<Id>1709718356702</Id>
 					<Name><![CDATA[MOBILITY]]></Name>
diff --git a/_alp/Agents/UI_Tabs/Code/Functions.java b/_alp/Agents/UI_Tabs/Code/Functions.java
index da817094..413af75d 100644
--- a/_alp/Agents/UI_Tabs/Code/Functions.java
+++ b/_alp/Agents/UI_Tabs/Code/Functions.java
@@ -23,7 +23,7 @@
 
 /*ALCODEEND*/}
 
-double f_setTab(EnergyDemandTab tab)
+double f_setTab(OL_CustomScenarioTabs tab)
 {/*ALCODESTART::1722259092945*/
 v_selectedTabType = tab;
 f_showCorrectTab();
diff --git a/_alp/Agents/UI_Tabs/Code/Functions.xml b/_alp/Agents/UI_Tabs/Code/Functions.xml
index 222c6c16..345486be 100644
--- a/_alp/Agents/UI_Tabs/Code/Functions.xml
+++ b/_alp/Agents/UI_Tabs/Code/Functions.xml
@@ -32,7 +32,7 @@
 		<ShowLabel>true</ShowLabel>
 		<Parameter>
 			<Name><![CDATA[tab]]></Name>
-			<Type><![CDATA[EnergyDemandTab]]></Type>
+			<Type><![CDATA[OL_CustomScenarioTabs]]></Type>
 		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
diff --git a/_alp/Agents/UI_Tabs/Levels/Level.level.xml b/_alp/Agents/UI_Tabs/Levels/Level.level.xml
index 9baf6fe5..81c53a25 100644
--- a/_alp/Agents/UI_Tabs/Levels/Level.level.xml
+++ b/_alp/Agents/UI_Tabs/Levels/Level.level.xml
@@ -31,8 +31,7 @@
 				<ShowLabel>false</ShowLabel>
 				<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
 				<VisibleCode>!pop_tabElectricity.isEmpty()</VisibleCode>
-				<OnClickCode>v_selectedTabType = EnergyDemandTab.ELECTRICITY;
-f_showCorrectTab();</OnClickCode>
+				<OnClickCode>f_setTab(OL_CustomScenarioTabs.ELECTRICITY);</OnClickCode>
 				<EmbeddedIcon>false</EmbeddedIcon>
 				<Z>0</Z>
 				<Rotation>0.0</Rotation>
@@ -105,8 +104,7 @@ f_showCorrectTab();</OnClickCode>
 				<ShowLabel>false</ShowLabel>
 				<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
 				<VisibleCode>!pop_tabHeating.isEmpty()</VisibleCode>
-				<OnClickCode>v_selectedTabType = EnergyDemandTab.HEAT;
-f_showCorrectTab();</OnClickCode>
+				<OnClickCode>f_setTab(OL_CustomScenarioTabs.HEAT);</OnClickCode>
 				<EmbeddedIcon>false</EmbeddedIcon>
 				<Z>0</Z>
 				<Rotation>0.0</Rotation>
@@ -179,8 +177,7 @@ f_showCorrectTab();</OnClickCode>
 				<ShowLabel>false</ShowLabel>
 				<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
 				<VisibleCode>!pop_tabMobility.isEmpty()</VisibleCode>
-				<OnClickCode>v_selectedTabType = EnergyDemandTab.MOBILITY;
-f_showCorrectTab();</OnClickCode>
+				<OnClickCode>f_setTab(OL_CustomScenarioTabs.MOBILITY);</OnClickCode>
 				<EmbeddedIcon>false</EmbeddedIcon>
 				<Z>0</Z>
 				<Rotation>0.0</Rotation>
@@ -253,8 +250,7 @@ f_showCorrectTab();</OnClickCode>
 				<ShowLabel>false</ShowLabel>
 				<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
 				<VisibleCode>!pop_tabEHub.isEmpty()</VisibleCode>
-				<OnClickCode>v_selectedTabType = EnergyDemandTab.HUB;
-f_showCorrectTab();</OnClickCode>
+				<OnClickCode>f_setTab(OL_CustomScenarioTabs.HUB);</OnClickCode>
 				<EmbeddedIcon>false</EmbeddedIcon>
 				<Z>0</Z>
 				<Rotation>0.0</Rotation>
diff --git a/_alp/Agents/UI_Tabs/Variables.xml b/_alp/Agents/UI_Tabs/Variables.xml
index 304377c8..781de493 100644
--- a/_alp/Agents/UI_Tabs/Variables.xml
+++ b/_alp/Agents/UI_Tabs/Variables.xml
@@ -16,9 +16,9 @@
               Constant="false"
               AccessType="public"
               StaticVariable="false">
-			<Type><![CDATA[EnergyDemandTab]]></Type>
+			<Type><![CDATA[OL_CustomScenarioTabs]]></Type>
 			<InitialValue Class="CodeValue">
-				<Code><![CDATA[ELECTRICITY]]></Code>
+				<Code><![CDATA[OL_CustomScenarioTabs.ELECTRICITY]]></Code>
 			</InitialValue>
 		</Properties>
 	</Variable>
diff --git a/_alp/Agents/UI_company/Code/Functions.java b/_alp/Agents/UI_company/Code/Functions.java
index 3ce49c40..ca36cd9b 100644
--- a/_alp/Agents/UI_company/Code/Functions.java
+++ b/_alp/Agents/UI_company/Code/Functions.java
@@ -1950,8 +1950,8 @@ else if(v_NFATO_kW_feedin < 0){
 
 double f_setDemandReductionSliderPresets()
 {/*ALCODESTART::1756898097088*/
-v_minSavingsSliders = -50;
-v_maxSavingsSliders = 50;
+v_minSavingsSliders = p_minSavingsSliders_default;
+v_maxSavingsSliders = p_maxSavingsSliders_default;
 sl_heatDemandCompanyReduction.setRange(v_minSavingsSliders, v_maxSavingsSliders);
 sl_electricityDemandCompanyReduction.setRange(v_minSavingsSliders, v_maxSavingsSliders);
 sl_mobilityDemandCompanyReduction.setRange(v_minSavingsSliders, v_maxSavingsSliders);
diff --git a/_alp/Agents/UI_company/Variables.xml b/_alp/Agents/UI_company/Variables.xml
index 48e572b3..8b94a3ed 100644
--- a/_alp/Agents/UI_company/Variables.xml
+++ b/_alp/Agents/UI_company/Variables.xml
@@ -1324,4 +1324,60 @@
 			</ParameterEditor>
 		</Properties>
 	</Variable>
+	<Variable Class="Parameter">
+		<Id>1768927550529</Id>
+		<Name><![CDATA[p_maxSavingsSliders_default]]></Name>
+		<X>-1440</X>
+		<Y>1290</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
+			<Type><![CDATA[double]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<DefaultValue Class="CodeValue">
+				<Code><![CDATA[50]]></Code>
+			</DefaultValue>
+			<ParameterEditor>
+				<Id>1768927550527</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
+	<Variable Class="Parameter">
+		<Id>1768927552379</Id>
+		<Name><![CDATA[p_minSavingsSliders_default]]></Name>
+		<X>-1440</X>
+		<Y>1270</Y>
+		<Label>
+			<X>10</X>
+			<Y>0</Y>
+		</Label>
+		<PublicFlag>false</PublicFlag>
+		<PresentationFlag>true</PresentationFlag>
+		<ShowLabel>true</ShowLabel>
+		<Properties SaveInSnapshot="true" ModificatorType="STATIC">
+			<Type><![CDATA[double]]></Type>
+			<UnitType>NONE</UnitType>
+			<SdArray>false</SdArray>
+			<DefaultValue Class="CodeValue">
+				<Code><![CDATA[-50]]></Code>
+			</DefaultValue>
+			<ParameterEditor>
+				<Id>1768927552377</Id>
+				<EditorContolType>TEXT_BOX</EditorContolType>
+				<MinSliderValue>0</MinSliderValue>
+				<MaxSliderValue>100</MaxSliderValue>
+				<DelimeterType>NO_DELIMETER</DelimeterType>
+			</ParameterEditor>
+		</Properties>
+	</Variable>
 </Variables>
diff --git a/_alp/Agents/Zero_Interface/Code/Functions.xml b/_alp/Agents/Zero_Interface/Code/Functions.xml
index 34fd2aaf..f5ed77c4 100644
--- a/_alp/Agents/Zero_Interface/Code/Functions.xml
+++ b/_alp/Agents/Zero_Interface/Code/Functions.xml
@@ -2245,7 +2245,7 @@
 		<ShowLabel>true</ShowLabel>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
-	<Function AccessType="default" StaticFunction="false">
+	<Function AccessType="protected" StaticFunction="false">
 		<ReturnModificator>VOID</ReturnModificator>
 		<ReturnType>double</ReturnType>
 		<Id>1760978860758</Id>
diff --git a/_alp/Agents/Zero_Interface/EmbeddedObjects.xml b/_alp/Agents/Zero_Interface/EmbeddedObjects.xml
index 852fc660..efe45977 100644
--- a/_alp/Agents/Zero_Interface/EmbeddedObjects.xml
+++ b/_alp/Agents/Zero_Interface/EmbeddedObjects.xml
@@ -39,6 +39,12 @@
 			<Parameter>
 				<Name><![CDATA[p_gridConnection]]></Name>
 			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_maxSavingsSliders_default]]></Name>
+			</Parameter>
+			<Parameter>
+				<Name><![CDATA[p_minSavingsSliders_default]]></Name>
+			</Parameter>
 		</Parameters>
 		<ReplicationFlag>true</ReplicationFlag>
 		<Replication Class="CodeValue">
diff --git a/_alp/Agents/tabEHub/Code/Functions.java b/_alp/Agents/tabEHub/Code/Functions.java
index 5d693b3a..f528bbe2 100644
--- a/_alp/Agents/tabEHub/Code/Functions.java
+++ b/_alp/Agents/tabEHub/Code/Functions.java
@@ -264,9 +264,9 @@ else if ( maxFeedinCapacity_kW > gc2.v_liveConnectionMetaData.contractedFeedinCa
 b_NFATOListener = false;
 /*ALCODEEND*/}
 
-double f_setTab(EnergyDemandTab selectedTabType)
+double f_setTab(OL_CustomScenarioTabs selectedTabType)
 {/*ALCODESTART::1722256998182*/
-if (selectedTabType == EnergyDemandTab.NFATO) {
+if (selectedTabType == OL_CustomScenarioTabs.NFATO) {
 	gr_nfatoSettings.setVisible(true);
 	gr_hubSliders.setVisible(false);
 }
diff --git a/_alp/Agents/tabEHub/Code/Functions.xml b/_alp/Agents/tabEHub/Code/Functions.xml
index 2f545016..642aa73c 100644
--- a/_alp/Agents/tabEHub/Code/Functions.xml
+++ b/_alp/Agents/tabEHub/Code/Functions.xml
@@ -126,7 +126,7 @@
 		<ShowLabel>true</ShowLabel>
 		<Parameter>
 			<Name><![CDATA[selectedTabType]]></Name>
-			<Type><![CDATA[EnergyDemandTab]]></Type>
+			<Type><![CDATA[OL_CustomScenarioTabs]]></Type>
 		</Parameter>
 		<Body xmlns:al="http://anylogic.com"/>
 	</Function>
