diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index d8f48e9..8a7fd26 100644
--- a/MAIN_SSG.rdx
+++ b/MAIN_SSG.rdx
@@ -1,10 +1,10 @@
 <?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-04T15:40:01" LanguageVersion="2014.1.3.699" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2025-03-04T17:44:56" 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">
-				<TYPE Id="RDK:313478" Name="SSGConnectionPoint" Expanded="True" SubType="structure" HasArrayType="True">
+				<TYPE Id="RDK:313478" Name="SSGConnectionPoint" SubType="structure" HasArrayType="True">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:609117" Name="id" Type="string" />
 					<FIELD Id="RDK:313462" Name="x_M" Type="double" />
@@ -25,7 +25,7 @@
 					<FIELD Id="RDK:20734834" Name="direction_x" Type="double" DesignTimeRemark="1 if direction posititve x-axis, -1 if is negative x-axis, 0 if it is in y-direction" />
 					<FIELD Id="RDK:20734836" Name="direction_y" Type="double" DesignTimeRemark="1 if direction posititve y-axis, -1 if is negative y-axis, 0 if it is in x-direction" />
 				</TYPE>
-				<TYPE Id="RDK:26388" Name="KreiselType" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:26388" Name="KreiselType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:95024" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:26389" Name="AbstandMS" Type="double" />
@@ -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" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:302581" Name="GefaelleType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:302571" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:880709" Name="L1" Type="double" />
@@ -148,7 +148,7 @@
 					<FIELD Id="RDK:973716" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:973714" Name="Weichenart" Type="string" />
 				</TYPE>
-				<TYPE Id="RDK:23017103" Name="OFGeradeType" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:23017103" Name="OFGeradeType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:23017087" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:23017088" Name="L1" Type="double" />
@@ -18366,6 +18366,437 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 						</CASEGROUP>
 						<CASEGROUP Id="RDK:18338597" CaseType="0">
 							<EXP><![CDATA[$C$AUTOCOMMIT]]></EXP>
+							<GROUP Id="RDK:23678759" Name="Check empty fields and its fix boxes" SubType="Generic">
+								<GROUP Id="RDK:23678738" Name="Group" SubType="Generic">
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$FieldAffected="FesteH1"]]></EXP>
+									</VALUECONDITION>
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$IsEmpty(Shape_Prototype.GefaelleDefinition.HoeheOben)]]></EXP>
+									</VALUECONDITION>
+									<SET Id="RDK:23678735" VarRef="Shape_Prototype.GefaelleDefinition.FesteH1">
+										<EXP><![CDATA[$C$False]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+									<ACTION_CALL Id="RDK:23678736" 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_Gefaelle]]></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:23678737" BreakType="4" ExitStatus="0" />
+								</GROUP>
+								<GROUP Id="RDK:23678742" Name="Group" SubType="Generic">
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$FieldAffected="FesteH0"]]></EXP>
+									</VALUECONDITION>
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$IsEmpty(Shape_Prototype.GefaelleDefinition.HoeheUnten)]]></EXP>
+									</VALUECONDITION>
+									<SET Id="RDK:23678739" VarRef="Shape_Prototype.GefaelleDefinition.FesteH0">
+										<EXP><![CDATA[$C$False]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+									<ACTION_CALL Id="RDK:23678740" 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_Gefaelle]]></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:23678741" BreakType="4" ExitStatus="0" />
+								</GROUP>
+								<GROUP Id="RDK:23678746" Name="Group" SubType="Generic">
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$FieldAffected="FesteL1"]]></EXP>
+									</VALUECONDITION>
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$IsEmpty(Shape_Prototype.GefaelleDefinition.L1)]]></EXP>
+									</VALUECONDITION>
+									<SET Id="RDK:23678743" VarRef="Shape_Prototype.OFGeradeDefinition.FesteL1">
+										<EXP><![CDATA[$C$False]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+									<ACTION_CALL Id="RDK:23678744" 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_Gefaelle]]></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:23678745" BreakType="4" ExitStatus="0" />
+								</GROUP>
+								<GROUP Id="RDK:23678750" Name="Group" SubType="Generic">
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$FieldAffected="HoeheOben"]]></EXP>
+									</VALUECONDITION>
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$IsEmpty(Shape_Prototype.GefaelleDefinition.HoeheOben)]]></EXP>
+									</VALUECONDITION>
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.FesteH1]]></EXP>
+									</VALUECONDITION>
+									<SET Id="RDK:23678747" VarRef="Shape_Prototype.GefaelleDefinition.FesteH1">
+										<EXP><![CDATA[$C$False]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+									<ACTION_CALL Id="RDK:23678748" 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_Gefaelle]]></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:23678749" BreakType="4" ExitStatus="0" />
+								</GROUP>
+								<GROUP Id="RDK:23678754" Name="Group" SubType="Generic">
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$FieldAffected="HoeheUnten"]]></EXP>
+									</VALUECONDITION>
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$IsEmpty(Shape_Prototype.GefaelleDefinition.HoeheUnten)]]></EXP>
+									</VALUECONDITION>
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.FesteH0]]></EXP>
+									</VALUECONDITION>
+									<SET Id="RDK:23678751" VarRef="Shape_Prototype.GefaelleDefinition.FesteH0">
+										<EXP><![CDATA[$C$False]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+									<ACTION_CALL Id="RDK:23678752" 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_Gefaelle]]></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:23678753" BreakType="4" ExitStatus="0" />
+								</GROUP>
+								<GROUP Id="RDK:23678758" Name="Group" SubType="Generic">
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$FieldAffected="L1"]]></EXP>
+									</VALUECONDITION>
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$IsEmpty(Shape_Prototype.GefaelleDefinition.FesteL1)]]></EXP>
+									</VALUECONDITION>
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.FesteL1]]></EXP>
+									</VALUECONDITION>
+									<SET Id="RDK:23678755" VarRef="Shape_Prototype.GefaelleDefinition.FesteL1">
+										<EXP><![CDATA[$C$False]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+									<ACTION_CALL Id="RDK:23678756" 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_Gefaelle]]></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:23678757" BreakType="4" ExitStatus="0" />
+								</GROUP>
+							</GROUP>
 							<GROUP Id="RDK:18338596" Name="Group" SubType="Generic">
 								<VALUECONDITION Value="true" Oper="OR">
 									<EXP><![CDATA[$=$FieldAffected="winkel"]]></EXP>
@@ -18396,35 +18827,25 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									<PAR Name="Options" />
 								</CALLFUNCTION>
 							</GROUP>
-							<GROUP Id="RDK:22674961" Name="Group" SubType="Generic">
-								<VALUECONDITION Value="true" Oper="OR">
-									<EXP><![CDATA[$=$FieldAffected="FesteH0"]]></EXP>
-								</VALUECONDITION>
-								<VALUECONDITION Value="true">
-									<EXP><![CDATA[$=$FieldAffected="FesteH1"]]></EXP>
-								</VALUECONDITION>
-								<COMMENTS Id="RDK:22674980" DesignTimeRemark="Änderung des fixiert Hakens der Höhe rechts oder links" />
-								<CALLFUNCTION Id="RDK:22786305">
-									<PAR Name="FuncName">
-										<EXP><![CDATA[$C$Calculate Gefaellestrecke]]></EXP>
-									</PAR>
-									<PAR Name="InputExp">
-										<EXP><![CDATA[$=$]]></EXP>
-									</PAR>
-									<PAR Name="ResultRef">
-										<EXP><![CDATA[$V$]]></EXP>
-									</PAR>
-									<PAR Name="Options" />
-								</CALLFUNCTION>
-							</GROUP>
 							<GROUP Id="RDK:21224910" Name="Group" SubType="Generic">
 								<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" Oper="OR">
+									<EXP><![CDATA[$=$FieldAffected="FesteH1"]]></EXP>
+								</VALUECONDITION>
+								<VALUECONDITION Value="true">
+									<EXP><![CDATA[$=$FieldAffected="H1gtH0"]]></EXP>
+								</VALUECONDITION>
 								<COMMENTS Id="RDK:21224908" 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:22674980" DesignTimeRemark="Änderung des fixiert Hakens der Höhe rechts oder links" />
+								<COMMENTS Id="RDK:23694468" DesignTimeRemark="Änderung des grösser/kleiner Zeichens" />
 								<GROUP Id="RDK:21231332" Name="localVars" SubType="VarSet" IncludeDate="0">
 									<VAR Id="RDK:21231334" Name="isConnected" Type="boolean" DesignTimeRemark="ist an Kreisel angebunden oder nicht" />
 									<VAR Id="RDK:21382445" Name="bordersOk" Type="boolean" DesignTimeRemark="waren die Userangaben innerhalb der erlaubten Grenzen" />
@@ -20930,18 +21351,15 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									<EXIT_PROCESS Id="RDK:23645488" BreakType="4" ExitStatus="0" />
 								</GROUP>
 							</GROUP>
-							<GROUP Id="RDK:23611082" Name="Group" SubType="Generic">
+							<GROUP Id="RDK:23611082" Name="Group" SubType="Generic" Suppressed="True">
 								<VALUECONDITION Value="true" Oper="OR">
 									<EXP><![CDATA[$=$FieldAffected="winkel"]]></EXP>
 								</VALUECONDITION>
 								<VALUECONDITION Value="true" Oper="OR">
 									<EXP><![CDATA[$=$FieldAffected="L1"]]></EXP>
 								</VALUECONDITION>
-								<VALUECONDITION Value="true" Oper="OR">
-									<EXP><![CDATA[$=$FieldAffected="FesteL1"]]></EXP>
-								</VALUECONDITION>
 								<VALUECONDITION Value="true">
-									<EXP><![CDATA[$=$FieldAffected="H1gtH0"]]></EXP>
+									<EXP><![CDATA[$=$FieldAffected="FesteL1"]]></EXP>
 								</VALUECONDITION>
 								<COMMENTS Id="RDK:23611079" DesignTimeRemark="Änderung von Winkel und Länge" />
 								<CALLFUNCTION Id="RDK:23611080">
@@ -20956,31 +21374,6 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									</PAR>
 									<PAR Name="Options" />
 								</CALLFUNCTION>
-								<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" Suppressed="True">
-								<VALUECONDITION Value="true" Oper="OR">
-									<EXP><![CDATA[$=$FieldAffected="FesteH0"]]></EXP>
-								</VALUECONDITION>
-								<VALUECONDITION Value="true">
-									<EXP><![CDATA[$=$FieldAffected="FesteH1"]]></EXP>
-								</VALUECONDITION>
-								<CALLFUNCTION Id="RDK:23017250">
-									<PAR Name="FuncName">
-										<EXP><![CDATA[$C$Calculate Gefaellestrecke]]></EXP>
-									</PAR>
-									<PAR Name="InputExp">
-										<EXP><![CDATA[$=$]]></EXP>
-									</PAR>
-									<PAR Name="ResultRef">
-										<EXP><![CDATA[$V$]]></EXP>
-									</PAR>
-									<PAR Name="Options" />
-								</CALLFUNCTION>
 							</GROUP>
 							<GROUP Id="RDK:23017288" Name="Group" SubType="Generic">
 								<VALUECONDITION Value="true" Oper="OR">
@@ -20992,11 +21385,24 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 								<VALUECONDITION Value="true" Oper="OR">
 									<EXP><![CDATA[$=$FieldAffected="FesteH0"]]></EXP>
 								</VALUECONDITION>
-								<VALUECONDITION Value="true">
+								<VALUECONDITION Value="true" Oper="OR">
 									<EXP><![CDATA[$=$FieldAffected="FesteH1"]]></EXP>
 								</VALUECONDITION>
+								<VALUECONDITION Value="true" Oper="OR">
+									<EXP><![CDATA[$=$FieldAffected="H1gtH0"]]></EXP>
+								</VALUECONDITION>
+								<VALUECONDITION Value="true" Oper="OR">
+									<EXP><![CDATA[$=$FieldAffected="FesteL1"]]></EXP>
+								</VALUECONDITION>
+								<VALUECONDITION Value="true" Oper="OR">
+									<EXP><![CDATA[$=$FieldAffected="L1"]]></EXP>
+								</VALUECONDITION>
+								<VALUECONDITION Value="true">
+									<EXP><![CDATA[$=$FieldAffected="winkel"]]></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" />
+								<COMMENTS Id="RDK:23694482" DesignTimeRemark="Änderung des grösser/kleiner Zeichens" />
 								<CALLFUNCTION Id="RDK:23017287">
 									<PAR Name="FuncName">
 										<EXP><![CDATA[$C$CalcGFTheoretischeLänge_Prototype]]></EXP>
@@ -21009,6 +21415,11 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									</PAR>
 									<PAR Name="Options" />
 								</CALLFUNCTION>
+								<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>
 						</CASEGROUP>
 						<CASEGROUP Id="RDK:23483946" CaseType="0">
@@ -33161,6 +33572,10 @@ ShapeList["id="+Param.Input[1].shapeID].name
 									</GROUP>
 								</IFTHENELSE>
 								<GROUP Id="RDK:23472870" Name="TransferToPrototype" SubType="Generic">
+									<SET Id="RDK:23697542" VarRef="LH_fits">
+										<EXP><![CDATA[$=$IIF(Abs(L1-L_th)<LH_toleranz,True,False)]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
 									<IFTHENELSE Id="RDK:23474761">
 										<VALUECONDITION Value="true">
 											<EXP><![CDATA[$=$HoeheOben>HoeheUnten]]></EXP>
@@ -33305,6 +33720,10 @@ ShapeList["id="+Param.Input[1].shapeID].name
 									</GROUP>
 								</IFTHENELSE>
 								<GROUP Id="RDK:23472822" Name="TransferToPrototype" SubType="Generic">
+									<SET Id="RDK:23697545" VarRef="LH_fits">
+										<EXP><![CDATA[$=$IIF(Abs(L1-L_th)<LH_toleranz,True,False)]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
 									<IFTHENELSE Id="RDK:23474743">
 										<VALUECONDITION Value="true">
 											<EXP><![CDATA[$=$HoeheOben>HoeheUnten]]></EXP>
@@ -33440,6 +33859,10 @@ ShapeList["id="+Param.Input[1].shapeID].name
 									<EXP><![CDATA[$=$]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
+								<SET Id="RDK:23702174" VarRef="L_th">
+									<EXP><![CDATA[$=$L1]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
 								<ACTION_CALL Id="RDK:23134029" Name="RDEngineering_MsgBox" Suppressed="True" DesignTimeRemark="{Text}">
 									<PAR Name="RDLibraryName">
 										<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
@@ -33465,10 +33888,6 @@ ShapeList["id="+Param.Input[1].shapeID].name
 									<EXP><![CDATA[$=$Round(Abs(HoeheOben-HoeheUnten)/Tan(DegToRad(winkel)),0)]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
-								<SET Id="RDK:23134032" VarRef="Shape_Prototype.GefaelleDefinition.L_th">
-									<EXP><![CDATA[$=$L_th]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
 								<SET Id="RDK:23134033" VarRef="winkel_th">
 									<EXP><![CDATA[$=$Round(RadToDeg(ATAN(Abs(HoeheOben-HoeheUnten)/L1)),1)]]></EXP>
 									<PAR Name="AdvancedOptions" />
@@ -33485,7 +33904,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 											<EXP><![CDATA[$=$Abs(HoeheOben-HoeheUnten)]]></EXP>
 											<PAR Name="AdvancedOptions" />
 										</SET>
-										<IFTHENELSE Id="RDK:23134038">
+										<IFTHENELSE Id="RDK:23134038" DesignTimeRemark="Länge ist auch Fixiert -&gt; Winkel">
 											<VALUECONDITION Value="true">
 												<EXP><![CDATA[$=$FesteL1]]></EXP>
 											</VALUECONDITION>
@@ -33494,16 +33913,8 @@ ShapeList["id="+Param.Input[1].shapeID].name
 													<EXP><![CDATA[$=$winkel_th]]></EXP>
 													<PAR Name="AdvancedOptions" />
 												</SET>
-												<SET Id="RDK:23134036" VarRef="L_th">
-													<EXP><![CDATA[$=$Round(Abs(HoeheOben-HoeheUnten)/Tan(DegToRad(.winkel)),0)]]></EXP>
-													<PAR Name="AdvancedOptions" />
-												</SET>
 											</GROUP>
-											<GROUP Id="RDK:23472885" SubType="Else">
-												<SET Id="RDK:23472892" VarRef="L_th">
-													<EXP><![CDATA[$=$Round(Abs(HoeheOben-HoeheUnten)/Tan(DegToRad(winkel)),0)]]></EXP>
-													<PAR Name="AdvancedOptions" />
-												</SET>
+											<GROUP Id="RDK:23472885" SubType="Else" DesignTimeRemark="Winkel definiert -&gt; Länge">
 												<SET Id="RDK:23472894" VarRef="L1">
 													<EXP><![CDATA[$=$L_th]]></EXP>
 													<PAR Name="AdvancedOptions" />
@@ -33511,23 +33922,85 @@ ShapeList["id="+Param.Input[1].shapeID].name
 											</GROUP>
 										</IFTHENELSE>
 									</GROUP>
-									<GROUP Id="RDK:23134058" SubType="Else">
-										<SET Id="RDK:23134040" VarRef="H_th">
+								</IFTHENELSE>
+								<IFTHENELSE Id="RDK:23134048" DesignTimeRemark="Bestimme die Höhe oben und unten, je nach Wunsch grösser/kleiner einer Höhe">
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$FesteH1]]></EXP>
+									</VALUECONDITION>
+									<VALUECONDITION Value="false">
+										<EXP><![CDATA[$=$FesteH0]]></EXP>
+									</VALUECONDITION>
+									<GROUP Id="RDK:23134047" SubType="Then">
+										<SET Id="RDK:23714135" VarRef="H_th">
 											<EXP><![CDATA[$=$Abs(Round(L1*Tan(DegToRad(winkel)),2))]]></EXP>
 											<PAR Name="AdvancedOptions" />
 										</SET>
-										<IFTHENELSE Id="RDK:23134057">
+										<IFTHENELSE Id="RDK:23134046">
 											<VALUECONDITION Value="true">
-												<EXP><![CDATA[$=$FesteL1]]></EXP>
+												<EXP><![CDATA[$=$H1gtH0=1]]></EXP>
 											</VALUECONDITION>
-											<GROUP Id="RDK:23134056" SubType="Then">
-												<SET Id="RDK:23134041" VarRef="L_th">
-													<EXP><![CDATA[$=$Abs(Round(H_th/Tan(DegToRad(winkel)),0))]]></EXP>
+											<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:23472757" SubType="Else">
-												<SET Id="RDK:23472763" VarRef="L_th">
+											<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">
+										<SET Id="RDK:23714143" VarRef="H_th">
+											<EXP><![CDATA[$=$Abs(Round(L1*Tan(DegToRad(winkel)),2))]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+										<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>
+								<IFTHENELSE Id="RDK:23697502" DesignTimeRemark="Es gibt zwei Höhenangaben, aber keine ist fest gegeben: Winkel und Länge zählen">
+									<VALUECONDITION Value="false">
+										<EXP><![CDATA[$=$FesteH1]]></EXP>
+									</VALUECONDITION>
+									<VALUECONDITION Value="false">
+										<EXP><![CDATA[$=$FesteH0]]></EXP>
+									</VALUECONDITION>
+									<GROUP Id="RDK:23697495" SubType="Then">
+										<SET Id="RDK:23714148" VarRef="H_th">
+											<EXP><![CDATA[$=$Abs(Round(L1*Tan(DegToRad(winkel)),2))]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+										<IFTHENELSE Id="RDK:23134057" DesignTimeRemark="Nur Länge ist fixiert, ">
+											<VALUECONDITION Value="true">
+												<EXP><![CDATA[$=$FesteL1]]></EXP>
+											</VALUECONDITION>
+											<GROUP Id="RDK:23134056" SubType="Then" DesignTimeRemark="Höhen sind bestimmt aber nicht fix -&gt; winkel">
+												<SET Id="RDK:23697358" VarRef="winkel">
+													<EXP><![CDATA[$=$winkel_th]]></EXP>
+													<PAR Name="AdvancedOptions" />
+												</SET>
+											</GROUP>
+											<GROUP Id="RDK:23472757" SubType="Else" DesignTimeRemark="Winkel definiert -&gt; Länge">
+												<SET Id="RDK:23697362" VarRef="L_th">
 													<EXP><![CDATA[$=$Abs(Round(H_th/Tan(DegToRad(winkel)),0))]]></EXP>
 													<PAR Name="AdvancedOptions" />
 												</SET>
@@ -33537,63 +34010,17 @@ 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">
-									<EXP><![CDATA[$=$IIF(Abs(L1-L_th)<LH_toleranz,True,False)]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
 							</GROUP>
 						</IFTHENELSE>
 					</GROUP>
 				</IFTHENELSE>
 				<GROUP Id="RDK:23134399" Name="TransferToPrototype" SubType="Generic">
+					<SET Id="RDK:23134063" VarRef="LH_fits">
+						<EXP><![CDATA[$=$IIF(Abs(L1-L_th)<LH_toleranz,True,False)]]></EXP>
+						<PAR Name="AdvancedOptions" />
+					</SET>
 					<IFTHENELSE Id="RDK:23134070">
 						<VALUECONDITION Value="true">
 							<EXP><![CDATA[$=$HoeheOben>HoeheUnten]]></EXP>