diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index c3944c0..d8f48e9 100644
--- a/MAIN_SSG.rdx
+++ b/MAIN_SSG.rdx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PROCESS Id="RDK:0001" Name="MAIN_SSG" ModernUI="True" Options="(GITSAVEMODE)(NOUPDATEINCLUDEFILES)" Expanded="True">
-	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2025-03-04T12:23:33" LanguageVersion="2014.1.3.699" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2025-03-04T15:40:01" LanguageVersion="2014.1.3.699" />
 	<GROUP Id="RDK:0002" Name="Declarations" SubType="Declarations" Expanded="True">
 		<GROUP Id="RDK:0003" Name="Types" SubType="TypeSet" IncludeDate="0">
 			<GROUP Id="RDK:26387" Name="SSG_Group" SubType="TypeSet" IncludeDate="0">
@@ -60,7 +60,7 @@
 					<FIELD Id="RDK:1520421" Name="Drehung" Type="integer" DesignTimeNotes="1= im Uhrzeigersinn=rechts&#xD;&#xA;-1= Gegen Uhrzeigersinn=links" />
 					<FIELD Id="RDK:1520424" Name="Durchmesser" Type="double" />
 				</TYPE>
-				<TYPE Id="RDK:302581" Name="GefaelleType" SubType="structure">
+				<TYPE Id="RDK:302581" Name="GefaelleType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:302571" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:880709" Name="L1" Type="double" />
@@ -1311,6 +1311,7 @@
 			<VAR Id="RDK:22938910" Name="KeyValues" Type="SSGDictArr[]" DesignTimeRemark="Array von Key-Value paaren, um sich eine liste von Begriffen zu einem Key zu merken" />
 			<VAR Id="RDK:23222557" Name="OFBogenData" Type="OFBogenType[]" DesignTimeRemark="Dropdown Liste aller Bögen im Interface" />
 			<VAR Id="RDK:23222658" Name="OFWeichenData" Type="OFWeicheType[]" DesignTimeRemark="Dropdown Liste aller Weichen im Interface" />
+			<VAR Id="RDK:23611107" Name="HoeheOben" Type="double" DesignTimeRemark="Generated by RD" />
 		</GROUP>
 		<GROUP Id="RDK:0006" Name="Profiles" SubType="ProfileSet">
 			<PROFILE Id="RDK:383" Name="ImportBackgroundProfile" TypeName="ImportBackgroundType" />
@@ -20498,7 +20499,438 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 						</CASEGROUP>
 						<CASEGROUP Id="RDK:23017289" CaseType="0">
 							<EXP><![CDATA[$C$AUTOCOMMIT]]></EXP>
-							<GROUP Id="RDK:23017247" Name="Group" SubType="Generic">
+							<GROUP Id="RDK:23611160" Name="Check empty fields and its fix boxes" SubType="Generic">
+								<GROUP Id="RDK:23611127" Name="Group" SubType="Generic">
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$FieldAffected="FesteH1"]]></EXP>
+									</VALUECONDITION>
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$IsEmpty(Shape_Prototype.OFGeradeDefinition.HoeheOben)]]></EXP>
+									</VALUECONDITION>
+									<SET Id="RDK:23619540" VarRef="Shape_Prototype.OFGeradeDefinition.FesteH1">
+										<EXP><![CDATA[$C$False]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+									<ACTION_CALL Id="RDK:23622360" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
+										<PAR Name="RDLibraryName">
+											<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+										</PAR>
+										<PAR Name="RenderList">
+											<EXP><![CDATA[$=$Render_OFGerade]]></EXP>
+										</PAR>
+										<PAR Name="PanelName">
+											<EXP><![CDATA[$C$0]]></EXP>
+										</PAR>
+										<PAR Name="CustomPanel" />
+										<PAR Name="ActionType">
+											<EXP><![CDATA[$C$0]]></EXP>
+										</PAR>
+										<PAR Name="Id">
+											<EXP><![CDATA[$C$FesteH1]]></EXP>
+										</PAR>
+										<PAR Name="ParentId" />
+										<PAR Name="Label">
+											<EXP><![CDATA[$C$fixiert]]></EXP>
+										</PAR>
+										<PAR Name="Field">
+											<EXP><![CDATA[$C$FesteH1]]></EXP>
+										</PAR>
+										<PAR Name="Value" />
+										<PAR Name="Uom" />
+										<PAR Name="Tooltip" />
+										<PAR Name="Styles" />
+										<PAR Name="Classes">
+											<EXP><![CDATA[$C$col-1]]></EXP>
+										</PAR>
+										<PAR Name="Rules" />
+										<PAR Name="Image" />
+										<PAR Name="ControlType">
+											<EXP><![CDATA[$C$checkbox]]></EXP>
+										</PAR>
+										<PAR Name="ButtonSubType" />
+										<PAR Name="DropdownSubType" />
+										<PAR Name="TextboxSubType" />
+										<PAR Name="Action" />
+										<PAR Name="Required">
+											<EXP><![CDATA[$C$True]]></EXP>
+										</PAR>
+										<PAR Name="Hidden" />
+										<PAR Name="ROnly" />
+										<PAR Name="Disabled" />
+										<PAR Name="Pressed" />
+										<PAR Name="AutoCommit">
+											<EXP><![CDATA[$=$True]]></EXP>
+										</PAR>
+										<PAR Name="ValidateFail" />
+										<PAR Name="ValidateMsg" />
+										<PAR Name="DataSource" />
+										<PAR Name="Options">
+											<EXP><![CDATA[$C$(SINGLESELECT)]]></EXP>
+										</PAR>
+									</ACTION_CALL>
+									<EXIT_PROCESS Id="RDK:23611126" BreakType="4" ExitStatus="0" />
+								</GROUP>
+								<GROUP Id="RDK:23017247" Name="Group" SubType="Generic">
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$FieldAffected="FesteH0"]]></EXP>
+									</VALUECONDITION>
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$IsEmpty(Shape_Prototype.OFGeradeDefinition.HoeheUnten)]]></EXP>
+									</VALUECONDITION>
+									<SET Id="RDK:23619526" VarRef="Shape_Prototype.OFGeradeDefinition.FesteH0">
+										<EXP><![CDATA[$C$False]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+									<ACTION_CALL Id="RDK:23622356" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
+										<PAR Name="RDLibraryName">
+											<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+										</PAR>
+										<PAR Name="RenderList">
+											<EXP><![CDATA[$=$Render_OFGerade]]></EXP>
+										</PAR>
+										<PAR Name="PanelName">
+											<EXP><![CDATA[$C$0]]></EXP>
+										</PAR>
+										<PAR Name="CustomPanel" />
+										<PAR Name="ActionType">
+											<EXP><![CDATA[$C$0]]></EXP>
+										</PAR>
+										<PAR Name="Id">
+											<EXP><![CDATA[$C$FesteH0]]></EXP>
+										</PAR>
+										<PAR Name="ParentId" />
+										<PAR Name="Label">
+											<EXP><![CDATA[$C$fixiert]]></EXP>
+										</PAR>
+										<PAR Name="Field">
+											<EXP><![CDATA[$C$FesteH0]]></EXP>
+										</PAR>
+										<PAR Name="Value" />
+										<PAR Name="Uom" />
+										<PAR Name="Tooltip" />
+										<PAR Name="Styles" />
+										<PAR Name="Classes">
+											<EXP><![CDATA[$C$col-1]]></EXP>
+										</PAR>
+										<PAR Name="Rules" />
+										<PAR Name="Image" />
+										<PAR Name="ControlType">
+											<EXP><![CDATA[$C$checkbox]]></EXP>
+										</PAR>
+										<PAR Name="ButtonSubType" />
+										<PAR Name="DropdownSubType" />
+										<PAR Name="TextboxSubType" />
+										<PAR Name="Action" />
+										<PAR Name="Required">
+											<EXP><![CDATA[$C$True]]></EXP>
+										</PAR>
+										<PAR Name="Hidden" />
+										<PAR Name="ROnly" />
+										<PAR Name="Disabled" />
+										<PAR Name="Pressed" />
+										<PAR Name="AutoCommit">
+											<EXP><![CDATA[$=$True]]></EXP>
+										</PAR>
+										<PAR Name="ValidateFail" />
+										<PAR Name="ValidateMsg" />
+										<PAR Name="DataSource" />
+										<PAR Name="Options">
+											<EXP><![CDATA[$C$(SINGLESELECT)]]></EXP>
+										</PAR>
+									</ACTION_CALL>
+									<EXIT_PROCESS Id="RDK:23611118" BreakType="4" ExitStatus="0" />
+								</GROUP>
+								<GROUP Id="RDK:23643619" Name="Group" SubType="Generic">
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$FieldAffected="FesteL1"]]></EXP>
+									</VALUECONDITION>
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$IsEmpty(Shape_Prototype.OFGeradeDefinition.L1)]]></EXP>
+									</VALUECONDITION>
+									<SET Id="RDK:23643616" VarRef="Shape_Prototype.OFGeradeDefinition.FesteL1">
+										<EXP><![CDATA[$C$False]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+									<ACTION_CALL Id="RDK:23643617" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
+										<PAR Name="RDLibraryName">
+											<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+										</PAR>
+										<PAR Name="RenderList">
+											<EXP><![CDATA[$=$Render_OFGerade]]></EXP>
+										</PAR>
+										<PAR Name="PanelName">
+											<EXP><![CDATA[$C$0]]></EXP>
+										</PAR>
+										<PAR Name="CustomPanel" />
+										<PAR Name="ActionType">
+											<EXP><![CDATA[$C$0]]></EXP>
+										</PAR>
+										<PAR Name="Id">
+											<EXP><![CDATA[$C$FesteL1]]></EXP>
+										</PAR>
+										<PAR Name="ParentId" />
+										<PAR Name="Label">
+											<EXP><![CDATA[$C$fixiert]]></EXP>
+										</PAR>
+										<PAR Name="Field">
+											<EXP><![CDATA[$C$FesteL1]]></EXP>
+										</PAR>
+										<PAR Name="Value" />
+										<PAR Name="Uom" />
+										<PAR Name="Tooltip" />
+										<PAR Name="Styles" />
+										<PAR Name="Classes">
+											<EXP><![CDATA[$C$col-1]]></EXP>
+										</PAR>
+										<PAR Name="Rules" />
+										<PAR Name="Image" />
+										<PAR Name="ControlType">
+											<EXP><![CDATA[$C$checkbox]]></EXP>
+										</PAR>
+										<PAR Name="ButtonSubType" />
+										<PAR Name="DropdownSubType" />
+										<PAR Name="TextboxSubType" />
+										<PAR Name="Action" />
+										<PAR Name="Required">
+											<EXP><![CDATA[$C$True]]></EXP>
+										</PAR>
+										<PAR Name="Hidden" />
+										<PAR Name="ROnly" />
+										<PAR Name="Disabled" />
+										<PAR Name="Pressed" />
+										<PAR Name="AutoCommit">
+											<EXP><![CDATA[$=$True]]></EXP>
+										</PAR>
+										<PAR Name="ValidateFail" />
+										<PAR Name="ValidateMsg" />
+										<PAR Name="DataSource" />
+										<PAR Name="Options">
+											<EXP><![CDATA[$C$(SINGLESELECT)]]></EXP>
+										</PAR>
+									</ACTION_CALL>
+									<EXIT_PROCESS Id="RDK:23643618" BreakType="4" ExitStatus="0" />
+								</GROUP>
+								<GROUP Id="RDK:23620504" Name="Group" SubType="Generic">
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$FieldAffected="HoeheOben"]]></EXP>
+									</VALUECONDITION>
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$IsEmpty(Shape_Prototype.OFGeradeDefinition.HoeheOben)]]></EXP>
+									</VALUECONDITION>
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$Shape_Prototype.OFGeradeDefinition.FesteH1]]></EXP>
+									</VALUECONDITION>
+									<SET Id="RDK:23620502" VarRef="Shape_Prototype.OFGeradeDefinition.FesteH1">
+										<EXP><![CDATA[$C$False]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+									<ACTION_CALL Id="RDK:23622362" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
+										<PAR Name="RDLibraryName">
+											<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+										</PAR>
+										<PAR Name="RenderList">
+											<EXP><![CDATA[$=$Render_OFGerade]]></EXP>
+										</PAR>
+										<PAR Name="PanelName">
+											<EXP><![CDATA[$C$0]]></EXP>
+										</PAR>
+										<PAR Name="CustomPanel" />
+										<PAR Name="ActionType">
+											<EXP><![CDATA[$C$0]]></EXP>
+										</PAR>
+										<PAR Name="Id">
+											<EXP><![CDATA[$C$FesteH1]]></EXP>
+										</PAR>
+										<PAR Name="ParentId" />
+										<PAR Name="Label">
+											<EXP><![CDATA[$C$fixiert]]></EXP>
+										</PAR>
+										<PAR Name="Field">
+											<EXP><![CDATA[$C$FesteH1]]></EXP>
+										</PAR>
+										<PAR Name="Value" />
+										<PAR Name="Uom" />
+										<PAR Name="Tooltip" />
+										<PAR Name="Styles" />
+										<PAR Name="Classes">
+											<EXP><![CDATA[$C$col-1]]></EXP>
+										</PAR>
+										<PAR Name="Rules" />
+										<PAR Name="Image" />
+										<PAR Name="ControlType">
+											<EXP><![CDATA[$C$checkbox]]></EXP>
+										</PAR>
+										<PAR Name="ButtonSubType" />
+										<PAR Name="DropdownSubType" />
+										<PAR Name="TextboxSubType" />
+										<PAR Name="Action" />
+										<PAR Name="Required">
+											<EXP><![CDATA[$C$True]]></EXP>
+										</PAR>
+										<PAR Name="Hidden" />
+										<PAR Name="ROnly" />
+										<PAR Name="Disabled" />
+										<PAR Name="Pressed" />
+										<PAR Name="AutoCommit">
+											<EXP><![CDATA[$=$True]]></EXP>
+										</PAR>
+										<PAR Name="ValidateFail" />
+										<PAR Name="ValidateMsg" />
+										<PAR Name="DataSource" />
+										<PAR Name="Options">
+											<EXP><![CDATA[$C$(SINGLESELECT)]]></EXP>
+										</PAR>
+									</ACTION_CALL>
+									<EXIT_PROCESS Id="RDK:23620503" BreakType="4" ExitStatus="0" />
+								</GROUP>
+								<GROUP Id="RDK:23620492" Name="Group" SubType="Generic">
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$FieldAffected="HoeheUnten"]]></EXP>
+									</VALUECONDITION>
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$IsEmpty(Shape_Prototype.OFGeradeDefinition.HoeheUnten)]]></EXP>
+									</VALUECONDITION>
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$Shape_Prototype.OFGeradeDefinition.FesteH0]]></EXP>
+									</VALUECONDITION>
+									<SET Id="RDK:23620490" VarRef="Shape_Prototype.OFGeradeDefinition.FesteH0">
+										<EXP><![CDATA[$C$False]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+									<ACTION_CALL Id="RDK:23622358" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
+										<PAR Name="RDLibraryName">
+											<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+										</PAR>
+										<PAR Name="RenderList">
+											<EXP><![CDATA[$=$Render_OFGerade]]></EXP>
+										</PAR>
+										<PAR Name="PanelName">
+											<EXP><![CDATA[$C$0]]></EXP>
+										</PAR>
+										<PAR Name="CustomPanel" />
+										<PAR Name="ActionType">
+											<EXP><![CDATA[$C$0]]></EXP>
+										</PAR>
+										<PAR Name="Id">
+											<EXP><![CDATA[$C$FesteH0]]></EXP>
+										</PAR>
+										<PAR Name="ParentId" />
+										<PAR Name="Label">
+											<EXP><![CDATA[$C$fixiert]]></EXP>
+										</PAR>
+										<PAR Name="Field">
+											<EXP><![CDATA[$C$FesteH0]]></EXP>
+										</PAR>
+										<PAR Name="Value" />
+										<PAR Name="Uom" />
+										<PAR Name="Tooltip" />
+										<PAR Name="Styles" />
+										<PAR Name="Classes">
+											<EXP><![CDATA[$C$col-1]]></EXP>
+										</PAR>
+										<PAR Name="Rules" />
+										<PAR Name="Image" />
+										<PAR Name="ControlType">
+											<EXP><![CDATA[$C$checkbox]]></EXP>
+										</PAR>
+										<PAR Name="ButtonSubType" />
+										<PAR Name="DropdownSubType" />
+										<PAR Name="TextboxSubType" />
+										<PAR Name="Action" />
+										<PAR Name="Required">
+											<EXP><![CDATA[$C$True]]></EXP>
+										</PAR>
+										<PAR Name="Hidden" />
+										<PAR Name="ROnly" />
+										<PAR Name="Disabled" />
+										<PAR Name="Pressed" />
+										<PAR Name="AutoCommit">
+											<EXP><![CDATA[$=$True]]></EXP>
+										</PAR>
+										<PAR Name="ValidateFail" />
+										<PAR Name="ValidateMsg" />
+										<PAR Name="DataSource" />
+										<PAR Name="Options">
+											<EXP><![CDATA[$C$(SINGLESELECT)]]></EXP>
+										</PAR>
+									</ACTION_CALL>
+									<EXIT_PROCESS Id="RDK:23620491" BreakType="4" ExitStatus="0" />
+								</GROUP>
+								<GROUP Id="RDK:23645489" Name="Group" SubType="Generic">
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$FieldAffected="L1"]]></EXP>
+									</VALUECONDITION>
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$IsEmpty(Shape_Prototype.OFGeradeDefinition.FesteL1)]]></EXP>
+									</VALUECONDITION>
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$Shape_Prototype.OFGeradeDefinition.FesteL1]]></EXP>
+									</VALUECONDITION>
+									<SET Id="RDK:23645486" VarRef="Shape_Prototype.OFGeradeDefinition.FesteL1">
+										<EXP><![CDATA[$C$False]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+									<ACTION_CALL Id="RDK:23645487" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
+										<PAR Name="RDLibraryName">
+											<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+										</PAR>
+										<PAR Name="RenderList">
+											<EXP><![CDATA[$=$Render_OFGerade]]></EXP>
+										</PAR>
+										<PAR Name="PanelName">
+											<EXP><![CDATA[$C$0]]></EXP>
+										</PAR>
+										<PAR Name="CustomPanel" />
+										<PAR Name="ActionType">
+											<EXP><![CDATA[$C$0]]></EXP>
+										</PAR>
+										<PAR Name="Id">
+											<EXP><![CDATA[$C$FesteL1]]></EXP>
+										</PAR>
+										<PAR Name="ParentId" />
+										<PAR Name="Label">
+											<EXP><![CDATA[$C$fixiert]]></EXP>
+										</PAR>
+										<PAR Name="Field">
+											<EXP><![CDATA[$C$FesteL1]]></EXP>
+										</PAR>
+										<PAR Name="Value" />
+										<PAR Name="Uom" />
+										<PAR Name="Tooltip" />
+										<PAR Name="Styles" />
+										<PAR Name="Classes">
+											<EXP><![CDATA[$C$col-1]]></EXP>
+										</PAR>
+										<PAR Name="Rules" />
+										<PAR Name="Image" />
+										<PAR Name="ControlType">
+											<EXP><![CDATA[$C$checkbox]]></EXP>
+										</PAR>
+										<PAR Name="ButtonSubType" />
+										<PAR Name="DropdownSubType" />
+										<PAR Name="TextboxSubType" />
+										<PAR Name="Action" />
+										<PAR Name="Required">
+											<EXP><![CDATA[$C$True]]></EXP>
+										</PAR>
+										<PAR Name="Hidden" />
+										<PAR Name="ROnly" />
+										<PAR Name="Disabled" />
+										<PAR Name="Pressed" />
+										<PAR Name="AutoCommit">
+											<EXP><![CDATA[$=$True]]></EXP>
+										</PAR>
+										<PAR Name="ValidateFail" />
+										<PAR Name="ValidateMsg" />
+										<PAR Name="DataSource" />
+										<PAR Name="Options">
+											<EXP><![CDATA[$C$(SINGLESELECT)]]></EXP>
+										</PAR>
+									</ACTION_CALL>
+									<EXIT_PROCESS Id="RDK:23645488" BreakType="4" ExitStatus="0" />
+								</GROUP>
+							</GROUP>
+							<GROUP Id="RDK:23611082" Name="Group" SubType="Generic">
 								<VALUECONDITION Value="true" Oper="OR">
 									<EXP><![CDATA[$=$FieldAffected="winkel"]]></EXP>
 								</VALUECONDITION>
@@ -20511,8 +20943,8 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 								<VALUECONDITION Value="true">
 									<EXP><![CDATA[$=$FieldAffected="H1gtH0"]]></EXP>
 								</VALUECONDITION>
-								<COMMENTS Id="RDK:23017245" DesignTimeRemark="Änderung von Winkel und Länge" />
-								<CALLFUNCTION Id="RDK:23017246">
+								<COMMENTS Id="RDK:23611079" DesignTimeRemark="Änderung von Winkel und Länge" />
+								<CALLFUNCTION Id="RDK:23611080">
 									<PAR Name="FuncName">
 										<EXP><![CDATA[$C$CalcGFTheoretischeLänge_Prototype]]></EXP>
 									</PAR>
@@ -20524,29 +20956,19 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									</PAR>
 									<PAR Name="Options" />
 								</CALLFUNCTION>
-								<EXEC_ON_VALUES Id="RDK:23565982" VarRef="Shape_Prototype.OFGeradeDefinition.M_Strecke">
-									<PAR Name="id" />
-									<PAR Name="x_M" />
-									<PAR Name="x_S" />
-									<PAR Name="x" />
-									<PAR Name="y" />
-									<PAR Name="z" />
-									<PAR Name="direction" />
-									<PAR Name="linkClass" />
-									<PAR Name="label" />
+								<EXEC_ON_VALUES Id="RDK:23611081" VarRef="Shape_Prototype.OFGeradeDefinition.M_Strecke">
 									<PAR Name="aktiv">
 										<EXP><![CDATA[$=$IIF(me.x_M<=(Shape_Prototype.OFGeradeDefinition.L1-Shape_Prototype.OFGeradeDefinition.d_min),TRUE,FALSE)]]></EXP>
 									</PAR>
 								</EXEC_ON_VALUES>
 							</GROUP>
-							<GROUP Id="RDK:23017251" Name="Group" SubType="Generic">
+							<GROUP Id="RDK:23017251" Name="Group" SubType="Generic" Suppressed="True">
 								<VALUECONDITION Value="true" Oper="OR">
 									<EXP><![CDATA[$=$FieldAffected="FesteH0"]]></EXP>
 								</VALUECONDITION>
 								<VALUECONDITION Value="true">
 									<EXP><![CDATA[$=$FieldAffected="FesteH1"]]></EXP>
 								</VALUECONDITION>
-								<COMMENTS Id="RDK:23017248" DesignTimeRemark="Änderung des fixiert Hakens der Höhe rechts oder links" />
 								<CALLFUNCTION Id="RDK:23017250">
 									<PAR Name="FuncName">
 										<EXP><![CDATA[$C$Calculate Gefaellestrecke]]></EXP>
@@ -20564,10 +20986,17 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 								<VALUECONDITION Value="true" Oper="OR">
 									<EXP><![CDATA[$=$FieldAffected="HoeheOben"]]></EXP>
 								</VALUECONDITION>
-								<VALUECONDITION Value="true">
+								<VALUECONDITION Value="true" Oper="OR">
 									<EXP><![CDATA[$=$FieldAffected="HoeheUnten"]]></EXP>
 								</VALUECONDITION>
+								<VALUECONDITION Value="true" Oper="OR">
+									<EXP><![CDATA[$=$FieldAffected="FesteH0"]]></EXP>
+								</VALUECONDITION>
+								<VALUECONDITION Value="true">
+									<EXP><![CDATA[$=$FieldAffected="FesteH1"]]></EXP>
+								</VALUECONDITION>
 								<COMMENTS Id="RDK:23017252" DesignTimeRemark="Änderung der Höhen" DesignTimeTip="Wenn sich eine der Höhen ändert dann prüfe welche sich ändern darf, bzw. ob eine an einem Kreisel angebunden ist." />
+								<COMMENTS Id="RDK:23017248" DesignTimeRemark="Änderung des fixiert Hakens der Höhe rechts oder links" />
 								<CALLFUNCTION Id="RDK:23017287">
 									<PAR Name="FuncName">
 										<EXP><![CDATA[$C$CalcGFTheoretischeLänge_Prototype]]></EXP>
@@ -32860,7 +33289,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								</SET>
 								<IFTHENELSE Id="RDK:23467176">
 									<VALUECONDITION Value="true">
-										<EXP><![CDATA[$=$H1gtH0]]></EXP>
+										<EXP><![CDATA[$=$H1gtH0=-1]]></EXP>
 									</VALUECONDITION>
 									<GROUP Id="RDK:23467173" SubType="Then">
 										<SET Id="RDK:23467172" VarRef="HoeheUnten">
@@ -33096,52 +33525,6 @@ ShapeList["id="+Param.Input[1].shapeID].name
 													<EXP><![CDATA[$=$Abs(Round(H_th/Tan(DegToRad(winkel)),0))]]></EXP>
 													<PAR Name="AdvancedOptions" />
 												</SET>
-												<IFTHENELSE Id="RDK:23134048">
-													<VALUECONDITION Value="true">
-														<EXP><![CDATA[$=$FesteH1]]></EXP>
-													</VALUECONDITION>
-													<VALUECONDITION Value="false">
-														<EXP><![CDATA[$=$FesteH0]]></EXP>
-													</VALUECONDITION>
-													<GROUP Id="RDK:23134047" SubType="Then">
-														<IFTHENELSE Id="RDK:23134046">
-															<VALUECONDITION Value="true">
-																<EXP><![CDATA[$=$H1gtH0=1]]></EXP>
-															</VALUECONDITION>
-															<GROUP Id="RDK:23134043" SubType="Then">
-																<SET Id="RDK:23134042" VarRef="HoeheUnten">
-																	<EXP><![CDATA[$=$HoeheOben+Round(H_th,0)]]></EXP>
-																	<PAR Name="AdvancedOptions" />
-																</SET>
-															</GROUP>
-															<GROUP Id="RDK:23134045" SubType="Else">
-																<SET Id="RDK:23134044" VarRef="HoeheUnten">
-																	<EXP><![CDATA[$=$HoeheOben-Round(H_th,0)]]></EXP>
-																	<PAR Name="AdvancedOptions" />
-																</SET>
-															</GROUP>
-														</IFTHENELSE>
-													</GROUP>
-													<GROUP Id="RDK:23472751" SubType="Else">
-														<IFTHENELSE Id="RDK:23134053">
-															<VALUECONDITION Value="true">
-																<EXP><![CDATA[$=$H1gtH0=1]]></EXP>
-															</VALUECONDITION>
-															<GROUP Id="RDK:23134050" SubType="Then">
-																<SET Id="RDK:23134049" VarRef="HoeheOben">
-																	<EXP><![CDATA[$=$HoeheUnten-Round(H_th,0)]]></EXP>
-																	<PAR Name="AdvancedOptions" />
-																</SET>
-															</GROUP>
-															<GROUP Id="RDK:23134052" SubType="Else">
-																<SET Id="RDK:23134051" VarRef="HoeheOben">
-																	<EXP><![CDATA[$=$HoeheUnten+Round(H_th,0)]]></EXP>
-																	<PAR Name="AdvancedOptions" />
-																</SET>
-															</GROUP>
-														</IFTHENELSE>
-													</GROUP>
-												</IFTHENELSE>
 											</GROUP>
 											<GROUP Id="RDK:23472757" SubType="Else">
 												<SET Id="RDK:23472763" VarRef="L_th">
@@ -33154,6 +33537,52 @@ ShapeList["id="+Param.Input[1].shapeID].name
 												</SET>
 											</GROUP>
 										</IFTHENELSE>
+										<IFTHENELSE Id="RDK:23134048">
+											<VALUECONDITION Value="true">
+												<EXP><![CDATA[$=$FesteH1]]></EXP>
+											</VALUECONDITION>
+											<VALUECONDITION Value="false">
+												<EXP><![CDATA[$=$FesteH0]]></EXP>
+											</VALUECONDITION>
+											<GROUP Id="RDK:23134047" SubType="Then">
+												<IFTHENELSE Id="RDK:23134046">
+													<VALUECONDITION Value="true">
+														<EXP><![CDATA[$=$H1gtH0=1]]></EXP>
+													</VALUECONDITION>
+													<GROUP Id="RDK:23134043" SubType="Then">
+														<SET Id="RDK:23134042" VarRef="HoeheUnten">
+															<EXP><![CDATA[$=$HoeheOben+Round(H_th,0)]]></EXP>
+															<PAR Name="AdvancedOptions" />
+														</SET>
+													</GROUP>
+													<GROUP Id="RDK:23134045" SubType="Else">
+														<SET Id="RDK:23134044" VarRef="HoeheUnten">
+															<EXP><![CDATA[$=$HoeheOben-Round(H_th,0)]]></EXP>
+															<PAR Name="AdvancedOptions" />
+														</SET>
+													</GROUP>
+												</IFTHENELSE>
+											</GROUP>
+											<GROUP Id="RDK:23472751" SubType="Else">
+												<IFTHENELSE Id="RDK:23134053">
+													<VALUECONDITION Value="true">
+														<EXP><![CDATA[$=$H1gtH0=1]]></EXP>
+													</VALUECONDITION>
+													<GROUP Id="RDK:23134050" SubType="Then">
+														<SET Id="RDK:23134049" VarRef="HoeheOben">
+															<EXP><![CDATA[$=$HoeheUnten-Round(H_th,0)]]></EXP>
+															<PAR Name="AdvancedOptions" />
+														</SET>
+													</GROUP>
+													<GROUP Id="RDK:23134052" SubType="Else">
+														<SET Id="RDK:23134051" VarRef="HoeheOben">
+															<EXP><![CDATA[$=$HoeheUnten+Round(H_th,0)]]></EXP>
+															<PAR Name="AdvancedOptions" />
+														</SET>
+													</GROUP>
+												</IFTHENELSE>
+											</GROUP>
+										</IFTHENELSE>
 									</GROUP>
 								</IFTHENELSE>
 								<SET Id="RDK:23134063" VarRef="LH_fits">