diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 3b22a59..fe9a84f 100644
--- a/MAIN_SSG.rdx
+++ b/MAIN_SSG.rdx
@@ -4033,7 +4033,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 						</SET_STRUCT>
 						<COMMENTS Id="RDK:23017409" DesignTimeRemark="Zusammensetzen der Assembly für Gefällestrecke" />
 						<GROUP Id="RDK:23017418" Name="Shapes" SubType="Generic" Bookmarked="True">
-							<SET_STRUCT Id="RDK:23017410" VarRef="ChiltItem" ClearAll="True" ListRef="ChildList" Suppressed="True" DesignTimeNotes="0-&gt;X------------------------------------------------------------&#xD;&#xA; |                                                                  |&#xD;&#xA;Y   M                                                     S    |&#xD;&#xA;|                                                                   |&#xD;&#xA;--------------------------------------------------------------------">
+							<SET_STRUCT Id="RDK:23017410" VarRef="ChiltItem" ClearAll="True" ListRef="ChildList" DesignTimeNotes="0-&gt;X------------------------------------------------------------&#xD;&#xA; |                                                                  |&#xD;&#xA;Y   M                                                     S    |&#xD;&#xA;|                                                                   |&#xD;&#xA;--------------------------------------------------------------------">
 								<PAR Name="id" />
 								<PAR Name="source">
 									<EXP><![CDATA[$C$s70]]></EXP>
@@ -5191,8 +5191,12 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="GefaelleDefinition">
 											<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition]]></EXP>
 										</PAR>
-										<PAR Name="KurveDefinition" />
 										<PAR Name="FoerdererDefinition" />
+										<PAR Name="VarioFoerdererDefinition" />
+										<PAR Name="KurveDefinition" />
+										<PAR Name="KurveFoerdererDefinition" />
+										<PAR Name="OFGeradeDefinition" />
+										<PAR Name="OFBogenDefinition" />
 										<PAR Name="WeicheDefinition" />
 										<PAR Name="BTMTBeladungDefinition" />
 										<PAR Name="BTMTEntladungDefinition" />
@@ -5258,10 +5262,6 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="pinned" />
 										<PAR Name="selected" />
 										<PAR Name="includeInBOM" />
-										<PAR Name="KurveFoerdererDefinition" />
-										<PAR Name="VarioFoerdererDefinition" />
-										<PAR Name="OFGeradeDefinition" />
-										<PAR Name="OFBogenDefinition" />
 									</SET_STRUCT>
 								</GROUP>
 							</CASEGROUP>
@@ -9559,6 +9559,11 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 								<PAR Name="FoerdererDefinition" />
 								<PAR Name="StreckeDefinition" />
 								<PAR Name="isDefined" />
+								<PAR Name="VarioFoerdererDefinition" />
+								<PAR Name="KurveDefinition" />
+								<PAR Name="KurveFoerdererDefinition" />
+								<PAR Name="OFGeradeDefinition" />
+								<PAR Name="OFBogenDefinition" />
 							</SET_STRUCT>
 						</FOREACHLOOP>
 					</FUNCTION>
@@ -19558,6 +19563,18 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									<EXP><![CDATA[$=$FieldAffected="FesteH1"]]></EXP>
 								</VALUECONDITION>
 								<COMMENTS Id="RDK:23017248" DesignTimeRemark="Änderung des fixiert Hakens der Höhe rechts oder links" />
+								<CALLFUNCTION Id="RDK:23017249" Suppressed="True">
+									<PAR Name="FuncName">
+										<EXP><![CDATA[$C$CheckFixHeights_Prototype]]></EXP>
+									</PAR>
+									<PAR Name="InputExp">
+										<EXP><![CDATA[$=$FieldAffected]]></EXP>
+									</PAR>
+									<PAR Name="ResultRef">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+									<PAR Name="Options" />
+								</CALLFUNCTION>
 								<CALLFUNCTION Id="RDK:23017250">
 									<PAR Name="FuncName">
 										<EXP><![CDATA[$C$Calculate Gefaellestrecke]]></EXP>
@@ -19609,7 +19626,184 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										</SET_STRUCT>
 									</VAR>
 								</GROUP>
-								<CALLFUNCTION Id="RDK:23017287" Suppressed="True">
+								<CALLFUNCTION Id="RDK:23017259" DesignTimeRemark="checkt ob eine Gefällestrecke an einem Kreisel oder Eckrad hängt">
+									<PAR Name="FuncName">
+										<EXP><![CDATA[$C$isConnectedToFixHeight]]></EXP>
+									</PAR>
+									<PAR Name="InputExp">
+										<EXP><![CDATA[$=$UebergabeListe]]></EXP>
+									</PAR>
+									<PAR Name="ResultRef">
+										<EXP><![CDATA[$V$isConnected]]></EXP>
+									</PAR>
+									<PAR Name="Options" />
+								</CALLFUNCTION>
+								<IFTHENELSE Id="RDK:23017286">
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$isConnected]]></EXP>
+									</VALUECONDITION>
+									<GROUP Id="RDK:23017270" SubType="Then">
+										<IFTHENELSE Id="RDK:23017264">
+											<VALUECONDITION Value="true">
+												<EXP><![CDATA[$=$FieldAffected="HoeheOben"]]></EXP>
+											</VALUECONDITION>
+											<GROUP Id="RDK:23017263" SubType="Then">
+												<COMMENTS Id="RDK:23017260" DesignTimeRemark="Setzt die Höhe wieder zurück auf die Höhe des Kreisels/Eckrads" DesignTimeTip="Wenn sich eine der Höhen ändert dann prüfe welche sich ändern darf, bzw. ob eine an einem Kreisel angebunden ist." />
+												<SET Id="RDK:23017261" VarRef="Shape_Prototype.GefaelleDefinition.HoeheOben">
+													<EXP><![CDATA[$=$ShapeList["id="+Shape_Prototype.id].GefaelleDefinition.HoeheOben]]></EXP>
+													<PAR Name="AdvancedOptions" />
+												</SET>
+												<ACTION_CALL Id="RDK:23017262" Name="RDEngineering_MsgBox" DesignTimeRemark="{Text}">
+													<PAR Name="RDLibraryName">
+														<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+													</PAR>
+													<PAR Name="MsgText">
+														<EXP><![CDATA[$C$Punkt H1 ist mit Kreisel/Eckrad verbunden. Verändern Sie die Höhe durch die Änderung der Höhe von Kreisel oder Eckrad.]]></EXP>
+													</PAR>
+													<PAR Name="MsgStyle">
+														<EXP><![CDATA[$C$-1]]></EXP>
+													</PAR>
+													<PAR Name="BtnLayout">
+														<EXP><![CDATA[$C$-1]]></EXP>
+													</PAR>
+													<PAR Name="MsgCaption" />
+													<PAR Name="BaloonType" />
+													<PAR Name="BtnPressed">
+														<EXP><![CDATA[$V$]]></EXP>
+													</PAR>
+												</ACTION_CALL>
+											</GROUP>
+										</IFTHENELSE>
+										<IFTHENELSE Id="RDK:23017269">
+											<VALUECONDITION Value="true">
+												<EXP><![CDATA[$=$FieldAffected="HoeheUnten"]]></EXP>
+											</VALUECONDITION>
+											<GROUP Id="RDK:23017268" SubType="Then">
+												<COMMENTS Id="RDK:23017265" DesignTimeRemark="Setzte die Höhe wieder zurück auf die Höhe des Kreisels/Eckrads" DesignTimeTip="Wenn sich eine der Höhen ändert dann prüfe welche sich ändern darf, bzw. ob eine an einem Kreisel angebunden ist." />
+												<SET Id="RDK:23017266" VarRef="Shape_Prototype.GefaelleDefinition.HoeheUnten">
+													<EXP><![CDATA[$=$ShapeList["id="+Shape_Prototype.id].GefaelleDefinition.HoeheUnten]]></EXP>
+													<PAR Name="AdvancedOptions" />
+												</SET>
+												<ACTION_CALL Id="RDK:23017267" Name="RDEngineering_MsgBox" DesignTimeRemark="{Text}">
+													<PAR Name="RDLibraryName">
+														<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+													</PAR>
+													<PAR Name="MsgText">
+														<EXP><![CDATA[$C$Punkt H0 ist mit Kreisel/Eckrad verbunden. Verändern Sie die Höhe durch die Änderung der Höhe von Kreisel oder Eckrad.]]></EXP>
+													</PAR>
+													<PAR Name="MsgStyle">
+														<EXP><![CDATA[$C$-1]]></EXP>
+													</PAR>
+													<PAR Name="BtnLayout">
+														<EXP><![CDATA[$C$-1]]></EXP>
+													</PAR>
+													<PAR Name="MsgCaption" />
+													<PAR Name="BaloonType" />
+													<PAR Name="BtnPressed">
+														<EXP><![CDATA[$V$]]></EXP>
+													</PAR>
+												</ACTION_CALL>
+											</GROUP>
+										</IFTHENELSE>
+									</GROUP>
+									<GROUP Id="RDK:23017285" SubType="Else">
+										<CALLFUNCTION Id="RDK:23017271" DesignTimeRemark="Pürft ob die Angabe die Werte innerhalb der maximal zulässigen Grenzen belässt.">
+											<PAR Name="FuncName">
+												<EXP><![CDATA[$C$CalcGFAngle_Prototype]]></EXP>
+											</PAR>
+											<PAR Name="InputExp">
+												<EXP><![CDATA[$=$]]></EXP>
+											</PAR>
+											<PAR Name="ResultRef">
+												<EXP><![CDATA[$V$bordersOk]]></EXP>
+											</PAR>
+											<PAR Name="Options" />
+										</CALLFUNCTION>
+										<IFTHENELSE Id="RDK:23017284">
+											<VALUECONDITION Value="false">
+												<EXP><![CDATA[$=$bordersOk]]></EXP>
+											</VALUECONDITION>
+											<GROUP Id="RDK:23017281" SubType="Then">
+												<COMMENTS Id="RDK:23017272" DesignTimeRemark="Setzte die Höhe wieder zurück wenn die Angaben ausserhalb des erlaubten Bereichs liegen" />
+												<IFTHENELSE Id="RDK:23017276">
+													<VALUECONDITION Value="true">
+														<EXP><![CDATA[$=$FieldAffected="HoeheOben"]]></EXP>
+													</VALUECONDITION>
+													<GROUP Id="RDK:23017275" SubType="Then">
+														<ACTION_CALL Id="RDK:23017273" Name="RDEngineering_MsgBox" DesignTimeRemark="{Text}">
+															<PAR Name="RDLibraryName">
+																<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+															</PAR>
+															<PAR Name="MsgText">
+																<EXP><![CDATA[$C$Winkel  überschreitet die zulässigen Grenzen]]></EXP>
+															</PAR>
+															<PAR Name="MsgStyle">
+																<EXP><![CDATA[$C$-1]]></EXP>
+															</PAR>
+															<PAR Name="BtnLayout">
+																<EXP><![CDATA[$C$-1]]></EXP>
+															</PAR>
+															<PAR Name="MsgCaption" />
+															<PAR Name="BaloonType" />
+															<PAR Name="BtnPressed">
+																<EXP><![CDATA[$V$]]></EXP>
+															</PAR>
+														</ACTION_CALL>
+														<SET Id="RDK:23017274" VarRef="Shape_Prototype.GefaelleDefinition.HoeheOben">
+															<EXP><![CDATA[$=$ShapeList["id="+Shape_Prototype.id].GefaelleDefinition.HoeheOben]]></EXP>
+															<PAR Name="AdvancedOptions" />
+														</SET>
+													</GROUP>
+												</IFTHENELSE>
+												<IFTHENELSE Id="RDK:23017280">
+													<VALUECONDITION Value="true">
+														<EXP><![CDATA[$=$FieldAffected="HoeheUnten"]]></EXP>
+													</VALUECONDITION>
+													<GROUP Id="RDK:23017279" SubType="Then">
+														<ACTION_CALL Id="RDK:23017277" Name="RDEngineering_MsgBox" DesignTimeRemark="{Text}">
+															<PAR Name="RDLibraryName">
+																<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+															</PAR>
+															<PAR Name="MsgText">
+																<EXP><![CDATA[$C$Winkel  überschreitet die zulässigen Grenzen]]></EXP>
+															</PAR>
+															<PAR Name="MsgStyle">
+																<EXP><![CDATA[$C$-1]]></EXP>
+															</PAR>
+															<PAR Name="BtnLayout">
+																<EXP><![CDATA[$C$-1]]></EXP>
+															</PAR>
+															<PAR Name="MsgCaption" />
+															<PAR Name="BaloonType" />
+															<PAR Name="BtnPressed">
+																<EXP><![CDATA[$V$]]></EXP>
+															</PAR>
+														</ACTION_CALL>
+														<SET Id="RDK:23017278" VarRef="Shape_Prototype.GefaelleDefinition.HoeheUnten">
+															<EXP><![CDATA[$=$ShapeList["id="+Shape_Prototype.id].GefaelleDefinition.HoeheUnten]]></EXP>
+															<PAR Name="AdvancedOptions" />
+														</SET>
+													</GROUP>
+												</IFTHENELSE>
+											</GROUP>
+											<GROUP Id="RDK:23017283" SubType="Else">
+												<CALLFUNCTION Id="RDK:23017282">
+													<PAR Name="FuncName">
+														<EXP><![CDATA[$C$CalcGFTheoretischeLänge_Prototype]]></EXP>
+													</PAR>
+													<PAR Name="InputExp">
+														<EXP><![CDATA[$=$]]></EXP>
+													</PAR>
+													<PAR Name="ResultRef">
+														<EXP><![CDATA[$V$]]></EXP>
+													</PAR>
+													<PAR Name="Options" />
+												</CALLFUNCTION>
+											</GROUP>
+										</IFTHENELSE>
+									</GROUP>
+								</IFTHENELSE>
+								<CALLFUNCTION Id="RDK:23017287">
 									<PAR Name="FuncName">
 										<EXP><![CDATA[$C$CalcGFTheoretischeLänge_Prototype]]></EXP>
 									</PAR>
@@ -19621,16 +19815,6 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									</PAR>
 									<PAR Name="Options" />
 								</CALLFUNCTION>
-								<CALLFUNCTION Id="RDK:23155464">
-									<PAR Name="FuncName">
-										<EXP><![CDATA[$C$CalcGFTheoretischeLänge_OFGerade]]></EXP>
-									</PAR>
-									<PAR Name="InputExp" />
-									<PAR Name="ResultRef">
-										<EXP><![CDATA[$V$]]></EXP>
-									</PAR>
-									<PAR Name="Options" />
-								</CALLFUNCTION>
 							</GROUP>
 						</CASEGROUP>
 						<CASEGROUP Id="RDK:23017296" CaseType="0">
@@ -29147,6 +29331,12 @@ ShapeList["id="+Param.Input[1].shapeID].name
 			</FUNCTION>
 			<FUNCTION Id="RDK:21069369" Name="Calculate Gefaellestrecke" InputTypeName="string">
 				<COMMENTS Id="RDK:21069327" DesignTimeRemark="Wenn die theoretische Länge L_f und die Länge des Shapes L1 übereinstimmen, dann wird der Gefaelle als &quot;in Ordnung&quot; betrachtet" />
+				<GROUP Id="RDK:21069333" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
+					<VAR Id="RDK:21069328" Name="L_th" Type="double" />
+					<VAR Id="RDK:21069329" Name="H_th" Type="double" />
+					<VAR Id="RDK:21069330" Name="winkel_th" Type="double" />
+					<VAR Id="RDK:21069331" Name="shape_item" Type="Editor2DShapeType" />
+				</GROUP>
 				<IFTHENELSE Id="RDK:21069336">
 					<VALUECONDITION Value="true">
 						<EXP><![CDATA[$=$IsEmpty(Param.Input)]]></EXP>
@@ -29156,85 +29346,13 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					</GROUP>
 				</IFTHENELSE>
 				<COMMENTS Id="RDK:21069337" DesignTimeRemark="Param.Input" />
-				<GROUP Id="RDK:23155727" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
-					<VAR Id="RDK:21069331" Name="shape_item" Type="Editor2DShapeType" />
-				</GROUP>
 				<SET Id="RDK:21069338" VarRef="shape_item">
 					<EXP><![CDATA[$=$ShapeList["id="+Param.Input]]]></EXP>
 					<PAR Name="AdvancedOptions" />
 				</SET>
-				<IFTHENELSE Id="RDK:23155575">
-					<VALUECONDITION Value="true" Oper="OR">
-						<EXP><![CDATA[$=$IsEmpty(shape_item.GefaelleDefinition.HoeheOben)]]></EXP>
-					</VALUECONDITION>
-					<VALUECONDITION Value="true">
-						<EXP><![CDATA[$=$IsEmpty(shape_item.GefaelleDefinition.HoeheUnten)]]></EXP>
-					</VALUECONDITION>
-					<GROUP Id="RDK:23155551" SubType="Then">
-						<SET Id="RDK:23155548" VarRef="shape_item.GefaelleDefinition.LH_fits">
-							<EXP><![CDATA[$=$False]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:23155549" VarRef="shape_item.text">
-							<EXP><![CDATA[$C$O]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:23155550" VarRef="Param.Result">
-							<EXP><![CDATA[$C$False]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<EXIT_PROCESS Id="RDK:23155587" BreakType="4" ExitStatus="0" />
-					</GROUP>
-				</IFTHENELSE>
-				<GROUP Id="RDK:21069333" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
-					<VAR Id="RDK:23155474" Name="HoeheOben" Type="double" />
-					<VAR Id="RDK:23155476" Name="HoeheUnten" Type="double" />
-					<VAR Id="RDK:23155502" Name="winkel" Type="double" />
-					<VAR Id="RDK:23155641" Name="FesteH1" Type="boolean" />
-					<VAR Id="RDK:23155725" Name="FesteH0" Type="boolean" />
-					<VAR Id="RDK:23155672" Name="L1" Type="double" />
-					<VAR Id="RDK:21069328" Name="L_th" Type="double" />
-					<VAR Id="RDK:23159239" Name="LH_toleranz" Type="double" />
-					<VAR Id="RDK:23155670" Name="LH_fits" Type="boolean" />
-					<VAR Id="RDK:23155682" Name="text" Type="string" />
-				</GROUP>
-				<GROUP Id="RDK:23155467" Name="ShapeItemToLocal" SubType="Generic">
-					<SET Id="RDK:23155481" VarRef="HoeheOben">
-						<EXP><![CDATA[$=$shape_item.GefaelleDefinition.HoeheOben]]></EXP>
-						<PAR Name="AdvancedOptions" />
-					</SET>
-					<SET Id="RDK:23155487" VarRef="HoeheUnten">
-						<EXP><![CDATA[$=$shape_item.GefaelleDefinition.HoeheUnten]]></EXP>
-						<PAR Name="AdvancedOptions" />
-					</SET>
-					<SET Id="RDK:23155657" VarRef="L1">
-						<EXP><![CDATA[$=$shape_item.GefaelleDefinition.L1]]></EXP>
-						<PAR Name="AdvancedOptions" />
-					</SET>
-					<SET Id="RDK:23155729" VarRef="L_th">
-						<EXP><![CDATA[$=$shape_item.GefaelleDefinition.L_th]]></EXP>
-						<PAR Name="AdvancedOptions" />
-					</SET>
-					<SET Id="RDK:23155661" VarRef="LH_toleranz">
-						<EXP><![CDATA[$=$shape_item.GefaelleDefinition.LH_toleranz]]></EXP>
-						<PAR Name="AdvancedOptions" />
-					</SET>
-					<SET Id="RDK:23155499" VarRef="winkel">
-						<EXP><![CDATA[$=$shape_item.GefaelleDefinition.winkel]]></EXP>
-						<PAR Name="AdvancedOptions" />
-					</SET>
-					<SET Id="RDK:23155643" VarRef="FesteH0">
-						<EXP><![CDATA[$=$shape_item.GefaelleDefinition.FesteH0]]></EXP>
-						<PAR Name="AdvancedOptions" />
-					</SET>
-					<SET Id="RDK:23155651" VarRef="FesteH1">
-						<EXP><![CDATA[$=$shape_item.GefaelleDefinition.FesteH1]]></EXP>
-						<PAR Name="AdvancedOptions" />
-					</SET>
-				</GROUP>
 				<IFTHENELSE Id="RDK:22915898">
 					<VALUECONDITION Value="true">
-						<EXP><![CDATA[$=$HoeheOben=HoeheUnten]]></EXP>
+						<EXP><![CDATA[$=$shape_item.GefaelleDefinition.HoeheOben=shape_item.GefaelleDefinition.HoeheUnten]]></EXP>
 					</VALUECONDITION>
 					<GROUP Id="RDK:22915910" SubType="Then">
 						<ACTION_CALL Id="RDK:22825593" Name="RDEngineering_MsgBox" DesignTimeRemark="{Text}">
@@ -29260,7 +29378,13 @@ ShapeList["id="+Param.Input[1].shapeID].name
 				</IFTHENELSE>
 				<IFTHENELSE Id="RDK:21069368">
 					<VALUECONDITION Value="true" Oper="OR">
-						<EXP><![CDATA[$=$Abs(winkel) < 0.0001]]></EXP>
+						<EXP><![CDATA[$=$IsEmpty(shape_item.GefaelleDefinition.HoeheOben)]]></EXP>
+					</VALUECONDITION>
+					<VALUECONDITION Value="true" Oper="OR">
+						<EXP><![CDATA[$=$IsEmpty(shape_item.GefaelleDefinition.HoeheUnten)]]></EXP>
+					</VALUECONDITION>
+					<VALUECONDITION Value="true" Oper="OR">
+						<EXP><![CDATA[$=$Abs(shape_item.GefaelleDefinition.winkel) < 0.0001]]></EXP>
 					</VALUECONDITION>
 					<VALUECONDITION Value="false">
 						<EXP><![CDATA[$=$shape_item.family = "Gefaellestrecke"]]></EXP>
@@ -29280,257 +29404,88 @@ ShapeList["id="+Param.Input[1].shapeID].name
 						</SET>
 					</GROUP>
 					<GROUP Id="RDK:21069367" SubType="Else">
-						<GROUP Id="RDK:23155723" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
-							<VAR Id="RDK:23155713" Name="H_th" Type="double" />
-							<VAR Id="RDK:23155714" Name="winkel_th" Type="double" />
-							<VAR Id="RDK:23155718" Name="L_th" Type="double" />
-							<VAR Id="RDK:23155719" Name="LH_fits" Type="boolean" />
-							<VAR Id="RDK:23162748" Name="H1gtH0" Type="integer" />
-							<VAR Id="RDK:23155720" Name="text" Type="string" />
-							<VAR Id="RDK:23155722" Name="z" Type="double" />
-						</GROUP>
 						<IFTHENELSE Id="RDK:22744528">
 							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$FesteH1]]></EXP>
+								<EXP><![CDATA[$=$shape_item.GefaelleDefinition.FesteH1]]></EXP>
 							</VALUECONDITION>
 							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$FesteH0]]></EXP>
+								<EXP><![CDATA[$=$shape_item.GefaelleDefinition.FesteH0]]></EXP>
 							</VALUECONDITION>
 							<GROUP Id="RDK:22744529" SubType="Then">
 								<SET Id="RDK:22744546" VarRef="H_th">
-									<EXP><![CDATA[$=$Abs(HoeheOben-HoeheUnten)]]></EXP>
+									<EXP><![CDATA[$=$Abs(shape_item.GefaelleDefinition.HoeheOben-shape_item.GefaelleDefinition.HoeheUnten)]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 							</GROUP>
 							<GROUP Id="RDK:22744530" SubType="Else">
 								<SET Id="RDK:21069357" VarRef="H_th">
-									<EXP><![CDATA[$=$L1*Tan(DegToRad(winkel))]]></EXP>
+									<EXP><![CDATA[$=$shape_item.GefaelleDefinition.L1*Tan(DegToRad(shape_item.GefaelleDefinition.winkel))]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 							</GROUP>
 						</IFTHENELSE>
 						<COMMENTS Id="RDK:21069355" DesignTimeRemark="Es werden die Länge, Winkel und Höhen als gegeben angsehen. Jetzt nur noch rechnen ob die Angaben passen. " />
 						<SET Id="RDK:21069356" VarRef="L_th">
-							<EXP><![CDATA[$=$(HoeheOben-HoeheUnten)/Tan(DegToRad(winkel))]]></EXP>
+							<EXP><![CDATA[$=$(shape_item.GefaelleDefinition.HoeheOben-shape_item.GefaelleDefinition.HoeheUnten)/Tan(DegToRad(shape_item.GefaelleDefinition.winkel))]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
 						<SET Id="RDK:21069358" VarRef="winkel_th">
-							<EXP><![CDATA[$=$Round(RadToDeg(ATAN(Abs(HoeheOben-HoeheUnten)/L1)),0)]]></EXP>
+							<EXP><![CDATA[$=$Round(RadToDeg(ATAN(Abs(shape_item.GefaelleDefinition.HoeheOben-shape_item.GefaelleDefinition.HoeheUnten)/shape_item.GefaelleDefinition.L1)),0)]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
-						<SET Id="RDK:21069362" VarRef="LH_fits">
-							<EXP><![CDATA[$=$IIF(Abs(L1-L_th)<LH_toleranz,True,False)]]></EXP>
+						<SET Id="RDK:21069359" VarRef="shape_item.GefaelleDefinition.L_th">
+							<EXP><![CDATA[$=$Abs(Round(L_th, 0))]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
-						<SET Id="RDK:21211830" VarRef="z">
-							<EXP><![CDATA[$=$HoeheOben/2 + HoeheUnten/2]]></EXP>
+						<SET Id="RDK:21069360" VarRef="shape_item.GefaelleDefinition.H_th">
+							<EXP><![CDATA[$=$Abs(Round(H_th, 0))]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<SET Id="RDK:21069361" VarRef="shape_item.GefaelleDefinition.winkel_th">
+							<EXP><![CDATA[$=$winkel_th]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<SET Id="RDK:21069362" VarRef="shape_item.GefaelleDefinition.LH_fits">
+							<EXP><![CDATA[$=$IIF(Abs(shape_item.GefaelleDefinition.L1-shape_item.GefaelleDefinition.L_th)<shape_item.GefaelleDefinition.LH_toleranz,True,False)]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<SET Id="RDK:21069366" VarRef="Param.Result">
+							<EXP><![CDATA[$=$shape_item.GefaelleDefinition.LH_fits]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
 						<IFTHENELSE Id="RDK:21902123">
 							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$HoeheOben>HoeheUnten]]></EXP>
+								<EXP><![CDATA[$=$shape_item.GefaelleDefinition.HoeheOben>shape_item.GefaelleDefinition.HoeheUnten]]></EXP>
 							</VALUECONDITION>
 							<GROUP Id="RDK:21902124" SubType="Then">
-								<SET Id="RDK:21902137" VarRef="text">
-									<EXP><![CDATA[$=$IIF(LH_fits, "↓", "O")]]></EXP>
+								<SET Id="RDK:21902137" VarRef="shape_item.text">
+									<EXP><![CDATA[$=$IIF(shape_item.GefaelleDefinition.LH_fits, "↓", "O")]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
-								<SET Id="RDK:22732262" VarRef="H1gtH0">
+								<SET Id="RDK:22732262" VarRef="shape_item.GefaelleDefinition.H1gtH0">
 									<EXP><![CDATA[$=$-1]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 							</GROUP>
 							<GROUP Id="RDK:21902125" SubType="Else">
-								<SET Id="RDK:21902117" VarRef="text" DesignTimeTip="↓">
-									<EXP><![CDATA[$=$IIF(LH_fits, "↑", "O")]]></EXP>
+								<SET Id="RDK:21902117" VarRef="shape_item.text" DesignTimeTip="↓">
+									<EXP><![CDATA[$=$IIF(shape_item.GefaelleDefinition.LH_fits, "↑", "O")]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
-								<SET Id="RDK:22732264" VarRef="H1gtH0">
+								<SET Id="RDK:22732264" VarRef="shape_item.GefaelleDefinition.H1gtH0">
 									<EXP><![CDATA[$=$1]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 							</GROUP>
 						</IFTHENELSE>
-						<GROUP Id="RDK:23155612" Name="LocalToShapeItem" SubType="Generic">
-							<SET Id="RDK:23155685" VarRef="shape_item.GefaelleDefinition.H_th">
-								<EXP><![CDATA[$=$Abs(Round(H_th, 0))]]></EXP>
-								<PAR Name="AdvancedOptions" />
-							</SET>
-							<SET Id="RDK:23155689" VarRef="shape_item.GefaelleDefinition.L_th">
-								<EXP><![CDATA[$=$Abs(Round(L_th, 0))]]></EXP>
-								<PAR Name="AdvancedOptions" />
-							</SET>
-							<SET Id="RDK:23155687" VarRef="shape_item.GefaelleDefinition.winkel_th">
-								<EXP><![CDATA[$=$winkel_th]]></EXP>
-								<PAR Name="AdvancedOptions" />
-							</SET>
-							<SET Id="RDK:23155691" VarRef="shape_item.GefaelleDefinition.LH_fits">
-								<EXP><![CDATA[$=$LH_fits]]></EXP>
-								<PAR Name="AdvancedOptions" />
-							</SET>
-							<SET Id="RDK:23162750" VarRef="shape_item.GefaelleDefinition.H1gtH0">
-								<EXP><![CDATA[$=$H1gtH0]]></EXP>
-								<PAR Name="AdvancedOptions" />
-							</SET>
-							<SET Id="RDK:23155616" VarRef="shape_item.z">
-								<EXP><![CDATA[$=$z]]></EXP>
-								<PAR Name="AdvancedOptions" />
-							</SET>
-							<SET Id="RDK:23155680" VarRef="shape_item.text" DesignTimeTip="↓">
-								<EXP><![CDATA[$=$text]]></EXP>
-								<PAR Name="AdvancedOptions" />
-							</SET>
-						</GROUP>
+						<SET Id="RDK:21211830" VarRef="shape_item.z">
+							<EXP><![CDATA[$=$shape_item.GefaelleDefinition.HoeheOben/2 + shape_item.GefaelleDefinition.HoeheUnten/2]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
 						<SET Id="RDK:21069365" VarRef="ShapeList[&quot;id=&quot;+Param.Input]">
 							<EXP><![CDATA[$=$shape_item]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
-						<SET Id="RDK:21069366" VarRef="Param.Result">
-							<EXP><![CDATA[$=$LH_fits]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-					</GROUP>
-				</IFTHENELSE>
-			</FUNCTION>
-			<FUNCTION Id="RDK:23125131" Name="Calculate OFGerade" InputTypeName="string">
-				<COMMENTS Id="RDK:23125089" DesignTimeRemark="Wenn die theoretische Länge L_f und die Länge des Shapes L1 übereinstimmen, dann wird der Gefaelle als &quot;in Ordnung&quot; betrachtet" />
-				<GROUP Id="RDK:23125094" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
-					<VAR Id="RDK:23125090" Name="L_th" Type="double" />
-					<VAR Id="RDK:23125091" Name="H_th" Type="double" />
-					<VAR Id="RDK:23125092" Name="winkel_th" Type="double" />
-					<VAR Id="RDK:23125093" Name="shape_item" Type="Editor2DShapeType" />
-				</GROUP>
-				<IFTHENELSE Id="RDK:23125097">
-					<VALUECONDITION Value="true">
-						<EXP><![CDATA[$=$IsEmpty(Param.Input)]]></EXP>
-					</VALUECONDITION>
-					<GROUP Id="RDK:23125096" SubType="Then">
-						<EXIT_PROCESS Id="RDK:23125095" BreakType="4" ExitStatus="0" />
-					</GROUP>
-				</IFTHENELSE>
-				<COMMENTS Id="RDK:23125098" DesignTimeRemark="Param.Input" />
-				<SET Id="RDK:23125099" VarRef="shape_item">
-					<EXP><![CDATA[$=$ShapeList["id="+Param.Input]]]></EXP>
-					<PAR Name="AdvancedOptions" />
-				</SET>
-				<IFTHENELSE Id="RDK:23125102">
-					<VALUECONDITION Value="true">
-						<EXP><![CDATA[$=$shape_item.OFGeradeDefinition.HoeheOben=shape_item.OFGeradeDefinition.HoeheUnten]]></EXP>
-					</VALUECONDITION>
-					<GROUP Id="RDK:23125145" SubType="Then">
-						<EXIT_PROCESS Id="RDK:23125144" BreakType="4" ExitStatus="0" />
-					</GROUP>
-				</IFTHENELSE>
-				<IFTHENELSE Id="RDK:23125130">
-					<VALUECONDITION Value="true" Oper="OR">
-						<EXP><![CDATA[$=$IsEmpty(shape_item.OFGeradeDefinition.HoeheOben)]]></EXP>
-					</VALUECONDITION>
-					<VALUECONDITION Value="true" Oper="OR">
-						<EXP><![CDATA[$=$IsEmpty(shape_item.OFGeradeDefinition.HoeheUnten)]]></EXP>
-					</VALUECONDITION>
-					<VALUECONDITION Value="true" Oper="OR">
-						<EXP><![CDATA[$=$Abs(shape_item.OFGeradeDefinition.winkel) < 0.0001]]></EXP>
-					</VALUECONDITION>
-					<VALUECONDITION Value="false">
-						<EXP><![CDATA[$=$shape_item.family = "OFGerade"]]></EXP>
-					</VALUECONDITION>
-					<GROUP Id="RDK:23125106" SubType="Then">
-						<SET Id="RDK:23125103" VarRef="shape_item.OFGeradeDefinition.LH_fits">
-							<EXP><![CDATA[$=$False]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:23125104" VarRef="shape_item.text">
-							<EXP><![CDATA[$C$O]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:23125105" VarRef="Param.Result">
-							<EXP><![CDATA[$C$False]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-					</GROUP>
-					<GROUP Id="RDK:23125129" SubType="Else">
-						<IFTHENELSE Id="RDK:23125111">
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$shape_item.OFGeradeDefinition.FesteH1]]></EXP>
-							</VALUECONDITION>
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$shape_item.OFGeradeDefinition.FesteH0]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:23125108" SubType="Then">
-								<SET Id="RDK:23125107" VarRef="H_th">
-									<EXP><![CDATA[$=$Abs(shape_item.OFGeradeDefinition.HoeheOben-shape_item.OFGeradeDefinition.HoeheUnten)]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</GROUP>
-							<GROUP Id="RDK:23125110" SubType="Else">
-								<SET Id="RDK:23125109" VarRef="H_th">
-									<EXP><![CDATA[$=$shape_item.OFGeradeDefinition.L1*Tan(DegToRad(shape_item.OFGeradeDefinition.winkel))]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</GROUP>
-						</IFTHENELSE>
-						<COMMENTS Id="RDK:23125112" DesignTimeRemark="Es werden die Länge, Winkel und Höhen als gegeben angsehen. Jetzt nur noch rechnen ob die Angaben passen. " />
-						<SET Id="RDK:23125113" VarRef="L_th">
-							<EXP><![CDATA[$=$(shape_item.OFGeradeDefinition.HoeheOben-shape_item.OFGeradeDefinition.HoeheUnten)/Tan(DegToRad(shape_item.OFGeradeDefinition.winkel))]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:23125114" VarRef="winkel_th">
-							<EXP><![CDATA[$=$Round(RadToDeg(ATAN(Abs(shape_item.OFGeradeDefinition.HoeheOben-shape_item.OFGeradeDefinition.HoeheUnten)/shape_item.OFGeradeDefinition.L1)),0)]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:23125115" VarRef="shape_item.OFGeradeDefinition.L_th">
-							<EXP><![CDATA[$=$Abs(Round(L_th, 0))]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:23125116" VarRef="shape_item.OFGeradeDefinition.H_th">
-							<EXP><![CDATA[$=$Abs(Round(H_th, 0))]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:23125117" VarRef="shape_item.OFGeradeDefinition.winkel_th">
-							<EXP><![CDATA[$=$winkel_th]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:23125118" VarRef="shape_item.OFGeradeDefinition.LH_fits">
-							<EXP><![CDATA[$=$IIF(Abs(shape_item.OFGeradeDefinition.L1-shape_item.OFGeradeDefinition.L_th)<shape_item.OFGeradeDefinition.LH_toleranz,True,False)]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:23125119" VarRef="Param.Result">
-							<EXP><![CDATA[$=$shape_item.OFGeradeDefinition.LH_fits]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<IFTHENELSE Id="RDK:23125126">
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$shape_item.OFGeradeDefinition.HoeheOben>shape_item.OFGeradeDefinition.HoeheUnten]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:23125122" SubType="Then">
-								<SET Id="RDK:23125120" VarRef="shape_item.text">
-									<EXP><![CDATA[$=$IIF(shape_item.OFGeradeDefinition.LH_fits, "↓", "O")]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-								<SET Id="RDK:23125121" VarRef="shape_item.OFGeradeDefinition.H1gtH0">
-									<EXP><![CDATA[$=$-1]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</GROUP>
-							<GROUP Id="RDK:23125125" SubType="Else">
-								<SET Id="RDK:23125123" VarRef="shape_item.text" DesignTimeTip="↓">
-									<EXP><![CDATA[$=$IIF(shape_item.OFGeradeDefinition.LH_fits, "↑", "O")]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-								<SET Id="RDK:23125124" VarRef="shape_item.OFGeradeDefinition.H1gtH0">
-									<EXP><![CDATA[$=$1]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</GROUP>
-						</IFTHENELSE>
-						<SET Id="RDK:23125127" VarRef="shape_item.z">
-							<EXP><![CDATA[$=$shape_item.OFGeradeDefinition.HoeheOben/2 + shape_item.OFGeradeDefinition.HoeheUnten/2]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:23125128" VarRef="ShapeList[&quot;id=&quot;+Param.Input]">
-							<EXP><![CDATA[$=$shape_item]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
 					</GROUP>
 				</IFTHENELSE>
 			</FUNCTION>
@@ -30040,125 +29995,150 @@ ShapeList["id="+Param.Input[1].shapeID].name
 										<EXP><![CDATA[$=$FesteH1]]></EXP>
 									</VALUECONDITION>
 									<VALUECONDITION Value="true">
-										<EXP><![CDATA[$=$FesteH0]]></EXP>
+										<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.FesteL1]]></EXP>
 									</VALUECONDITION>
-									<GROUP Id="RDK:23134039" SubType="Then">
-										<SET Id="RDK:23134034" VarRef="H_th">
-											<EXP><![CDATA[$=$Abs(HoeheOben-HoeheUnten)]]></EXP>
-											<PAR Name="AdvancedOptions" />
-										</SET>
-										<IFTHENELSE Id="RDK:23134038">
+									<GROUP Id="RDK:20572209" SubType="Then">
+										<IFTHENELSE Id="RDK:20658807">
 											<VALUECONDITION Value="true">
-												<EXP><![CDATA[$=$FesteL1]]></EXP>
+												<EXP><![CDATA[$=$winkel_th=0]]></EXP>
 											</VALUECONDITION>
-											<GROUP Id="RDK:23134037" SubType="Then">
-												<SET Id="RDK:23134035" VarRef="winkel">
+											<GROUP Id="RDK:20658808" SubType="Then">
+												<SET Id="RDK:20658813" VarRef="winkel_th">
+													<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.winkel]]></EXP>
+													<PAR Name="AdvancedOptions" />
+												</SET>
+												<SET Id="RDK:20658815" VarRef="H_th">
+													<EXP><![CDATA[$=$Abs(Round(Shape_Prototype.GefaelleDefinition.L1*Tan(DegToRad(winkel_th)),0))]]></EXP>
+													<PAR Name="AdvancedOptions" />
+												</SET>
+												<SET Id="RDK:20658819" VarRef="L_th">
+													<EXP><![CDATA[$=$Abs(Round((H_th)/Tan(DegToRad(winkel_th)),0))]]></EXP>
+													<PAR Name="AdvancedOptions" />
+												</SET>
+												<SET Id="RDK:20658821" VarRef="Shape_Prototype.GefaelleDefinition.L_th">
+													<EXP><![CDATA[$=$L_th]]></EXP>
+													<PAR Name="AdvancedOptions" />
+												</SET>
+												<SET Id="RDK:20667604" VarRef="Shape_Prototype.GefaelleDefinition.winkel_th">
 													<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:20658809" SubType="Else">
+												<IFTHENELSE Id="RDK:22586313">
+													<VALUECONDITION Value="true" Oper="OR">
+														<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheOben > 0 and Shape_Prototype.GefaelleDefinition.HoeheUnten = 0 ]]></EXP>
+													</VALUECONDITION>
+													<VALUECONDITION Value="true" Oper="OR">
+														<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheUnten > 0 and Shape_Prototype.GefaelleDefinition.HoeheOben = 0 ]]></EXP>
+													</VALUECONDITION>
+													<GROUP Id="RDK:22586346" SubType="Then">
+														<SET Id="RDK:20572216" VarRef="Shape_Prototype.GefaelleDefinition.winkel_th">
+															<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.winkel]]></EXP>
+															<PAR Name="AdvancedOptions" />
+														</SET>
+														<SET Id="RDK:22586361" VarRef="H_th">
+															<EXP><![CDATA[$=$Abs(Round(Shape_Prototype.GefaelleDefinition.L1*Tan(DegToRad(Shape_Prototype.GefaelleDefinition.winkel_th)),0))]]></EXP>
+															<PAR Name="AdvancedOptions" />
+														</SET>
+														<SET Id="RDK:22589618" VarRef="Shape_Prototype.GefaelleDefinition.L_th">
+															<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.L1]]></EXP>
+															<PAR Name="AdvancedOptions" />
+														</SET>
+														<IFTHENELSE Id="RDK:22622938">
+															<VALUECONDITION Value="true" Oper="OR">
+																<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheOben > 0 and Shape_Prototype.GefaelleDefinition.HoeheUnten = 0 ]]></EXP>
+															</VALUECONDITION>
+															<VALUECONDITION Value="true" Oper="OR">
+																<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheUnten > 0 and Shape_Prototype.GefaelleDefinition.HoeheOben = 0 ]]></EXP>
+															</VALUECONDITION>
+															<GROUP Id="RDK:22622945" SubType="Then">
+																<SET Id="RDK:22622948" VarRef="Shape_Prototype.GefaelleDefinition.HoeheUnten">
+																	<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheOben-H_th]]></EXP>
+																	<PAR Name="AdvancedOptions" />
+																</SET>
+															</GROUP>
+															<GROUP Id="RDK:22622946" SubType="Else">
+																<SET Id="RDK:22622950" VarRef="Shape_Prototype.GefaelleDefinition.HoeheOben">
+																	<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheUnten-H_th]]></EXP>
+																	<PAR Name="AdvancedOptions" />
+																</SET>
+															</GROUP>
+														</IFTHENELSE>
+													</GROUP>
+													<GROUP Id="RDK:22586350" SubType="Else">
+														<SET Id="RDK:22586341" VarRef="Shape_Prototype.GefaelleDefinition.winkel_th">
+															<EXP><![CDATA[$=$winkel_th]]></EXP>
+															<PAR Name="AdvancedOptions" />
+														</SET>
+														<SET Id="RDK:20590479" VarRef="H_th">
+															<EXP><![CDATA[$=$Abs(Round(Shape_Prototype.GefaelleDefinition.L1*Tan(DegToRad(Shape_Prototype.GefaelleDefinition.winkel_th)),0))]]></EXP>
+															<PAR Name="AdvancedOptions" />
+														</SET>
+														<SET Id="RDK:19879521" VarRef="Shape_Prototype.GefaelleDefinition.winkel">
+															<EXP><![CDATA[$=$Round(winkel_th,1)]]></EXP>
+															<PAR Name="AdvancedOptions" />
+														</SET>
+														<SET Id="RDK:20636495" VarRef="L_th">
+															<EXP><![CDATA[$=$Abs(Round((Shape_Prototype.GefaelleDefinition.HoeheOben-Shape_Prototype.GefaelleDefinition.HoeheUnten)/Tan(DegToRad(Shape_Prototype.GefaelleDefinition.winkel_th)),0))]]></EXP>
+															<PAR Name="AdvancedOptions" />
+														</SET>
+														<SET Id="RDK:20646626" VarRef="Shape_Prototype.GefaelleDefinition.L_th">
+															<EXP><![CDATA[$=$L_th]]></EXP>
+															<PAR Name="AdvancedOptions" />
+														</SET>
+													</GROUP>
+												</IFTHENELSE>
 											</GROUP>
 										</IFTHENELSE>
 									</GROUP>
-									<GROUP Id="RDK:23134058" SubType="Else">
-										<SET Id="RDK:23134040" VarRef="H_th">
-											<EXP><![CDATA[$=$Abs(Round(L1*Tan(DegToRad(winkel)),2))]]></EXP>
-											<PAR Name="AdvancedOptions" />
-										</SET>
-										<IFTHENELSE Id="RDK:23134057">
+									<GROUP Id="RDK:20572211" SubType="Else">
+										<IFTHENELSE Id="RDK:22758468">
 											<VALUECONDITION Value="true">
-												<EXP><![CDATA[$=$FesteL1]]></EXP>
+												<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.FesteH1]]></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>
+											<VALUECONDITION Value="true">
+												<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.FesteH0]]></EXP>
+											</VALUECONDITION>
+											<GROUP Id="RDK:22758465" SubType="Then">
+												<SET Id="RDK:22758464" VarRef="H_th">
+													<EXP><![CDATA[$=$Abs(Shape_Prototype.GefaelleDefinition.HoeheOben-Shape_Prototype.GefaelleDefinition.HoeheUnten)]]></EXP>
+													<PAR Name="AdvancedOptions" />
+												</SET>
+											</GROUP>
+											<GROUP Id="RDK:22758467" SubType="Else">
+												<SET Id="RDK:18547222" VarRef="H_th">
+													<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.L1*Tan(DegToRad(Shape_Prototype.GefaelleDefinition.winkel))]]></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>
-												</IFTHENELSE>
-												<IFTHENELSE Id="RDK:23134055">
-													<VALUECONDITION Value="true">
-														<EXP><![CDATA[$=$FesteH0]]></EXP>
-													</VALUECONDITION>
-													<VALUECONDITION Value="false">
-														<EXP><![CDATA[$=$FesteH1]]></EXP>
-													</VALUECONDITION>
-													<GROUP Id="RDK:23134054" SubType="Then">
-														<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>
 									</GROUP>
 								</IFTHENELSE>
-								<SET Id="RDK:23134063" VarRef="LH_fits">
-									<EXP><![CDATA[$=$IIF(Abs(L1-L_th)<LH_toleranz,True,False)]]></EXP>
+								<SET Id="RDK:18547225" VarRef="Shape_Prototype.GefaelleDefinition.LH_fits">
+									<EXP><![CDATA[$=$IIF(Abs(Shape_Prototype.GefaelleDefinition.L1-L_th)<Shape_Prototype.GefaelleDefinition.LH_toleranz,True,False)]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
-								<IFTHENELSE Id="RDK:23134070">
+								<IFTHENELSE Id="RDK:21911224">
 									<VALUECONDITION Value="true">
-										<EXP><![CDATA[$=$HoeheOben>HoeheUnten]]></EXP>
+										<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.HoeheOben>Shape_Prototype.GefaelleDefinition.HoeheUnten]]></EXP>
 									</VALUECONDITION>
-									<GROUP Id="RDK:23134066" SubType="Then">
-										<SET Id="RDK:23134064" VarRef="text">
-											<EXP><![CDATA[$=$IIF(LH_fits, "↓", "O")]]></EXP>
+									<GROUP Id="RDK:21911221" SubType="Then">
+										<SET Id="RDK:21911220" VarRef="Shape_Prototype.text">
+											<EXP><![CDATA[$=$IIF(Shape_Prototype.GefaelleDefinition.LH_fits, "↓", "O")]]></EXP>
 											<PAR Name="AdvancedOptions" />
 										</SET>
-										<SET Id="RDK:23134065" VarRef="H1gtH0">
+										<SET Id="RDK:22773187" VarRef="Shape_Prototype.GefaelleDefinition.H1gtH0">
 											<EXP><![CDATA[$=$-1]]></EXP>
 											<PAR Name="AdvancedOptions" />
 										</SET>
 									</GROUP>
-									<GROUP Id="RDK:23134069" SubType="Else">
-										<SET Id="RDK:23134067" VarRef="text" DesignTimeTip="↓">
-											<EXP><![CDATA[$=$IIF(LH_fits, "↑", "O")]]></EXP>
+									<GROUP Id="RDK:21911223" SubType="Else">
+										<SET Id="RDK:21911222" VarRef="Shape_Prototype.text" DesignTimeTip="↓">
+											<EXP><![CDATA[$=$IIF(Shape_Prototype.GefaelleDefinition.LH_fits, "↑", "O")]]></EXP>
 											<PAR Name="AdvancedOptions" />
 										</SET>
-										<SET Id="RDK:23134068" VarRef="H1gtH0">
+										<SET Id="RDK:22773189" VarRef="Shape_Prototype.GefaelleDefinition.H1gtH0">
 											<EXP><![CDATA[$=$1]]></EXP>
 											<PAR Name="AdvancedOptions" />
 										</SET>
@@ -30166,48 +30146,6 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								</IFTHENELSE>
 							</GROUP>
 						</IFTHENELSE>
-						<GROUP Id="RDK:23134399" Name="TransferToPrototype" SubType="Generic">
-							<SET Id="RDK:23134391" VarRef="Shape_Prototype.GefaelleDefinition.HoeheOben">
-								<EXP><![CDATA[$=$HoeheOben]]></EXP>
-								<PAR Name="AdvancedOptions" />
-							</SET>
-							<SET Id="RDK:23134392" VarRef="Shape_Prototype.GefaelleDefinition.HoeheUnten">
-								<EXP><![CDATA[$=$HoeheUnten]]></EXP>
-								<PAR Name="AdvancedOptions" />
-							</SET>
-							<SET Id="RDK:23134393" VarRef="Shape_Prototype.GefaelleDefinition.winkel">
-								<EXP><![CDATA[$=$winkel]]></EXP>
-								<PAR Name="AdvancedOptions" />
-							</SET>
-							<SET Id="RDK:23134408" VarRef="Shape_Prototype.GefaelleDefinition.winkel_th">
-								<EXP><![CDATA[$=$winkel_th]]></EXP>
-								<PAR Name="AdvancedOptions" />
-							</SET>
-							<SET Id="RDK:23134394" VarRef="Shape_Prototype.GefaelleDefinition.L1">
-								<EXP><![CDATA[$=$L1]]></EXP>
-								<PAR Name="AdvancedOptions" />
-							</SET>
-							<SET Id="RDK:23134410" VarRef="Shape_Prototype.GefaelleDefinition.L_th">
-								<EXP><![CDATA[$=$L_th]]></EXP>
-								<PAR Name="AdvancedOptions" />
-							</SET>
-							<SET Id="RDK:23134406" VarRef="Shape_Prototype.GefaelleDefinition.LH_fits">
-								<EXP><![CDATA[$=$LH_fits]]></EXP>
-								<PAR Name="AdvancedOptions" />
-							</SET>
-							<SET Id="RDK:23134402" VarRef="Shape_Prototype.GefaelleDefinition.H_th">
-								<EXP><![CDATA[$=$H_th]]></EXP>
-								<PAR Name="AdvancedOptions" />
-							</SET>
-							<SET Id="RDK:23134398" VarRef="Shape_Prototype.GefaelleDefinition.H1gtH0">
-								<EXP><![CDATA[$=$H1gtH0]]></EXP>
-								<PAR Name="AdvancedOptions" />
-							</SET>
-							<SET Id="RDK:23134404" VarRef="Shape_Prototype.text">
-								<EXP><![CDATA[$=$text]]></EXP>
-								<PAR Name="AdvancedOptions" />
-							</SET>
-						</GROUP>
 					</GROUP>
 				</IFTHENELSE>
 			</FUNCTION>
@@ -31381,7 +31319,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 						</IFTHENELSE>
 						<CALLFUNCTION Id="RDK:23017725">
 							<PAR Name="FuncName">
-								<EXP><![CDATA[$C$Calculate OFGerade]]></EXP>
+								<EXP><![CDATA[$C$Calculate Gefaellestrecke]]></EXP>
 							</PAR>
 							<PAR Name="InputExp">
 								<EXP><![CDATA[$=$shapeId]]></EXP>
@@ -40344,7 +40282,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 				</GROUP>
 				<GROUP Id="RDK:23017165" Name="OFGeradeUI" SubType="Generic">
 					<GROUP Id="RDK:23017145" Name="Steigung" SubType="Generic">
-						<SET_STRUCT Id="RDK:23017143" VarRef="SteigungOFGeradeItem" ClearAll="True" ListRef="SteigungOFGeradeList">
+						<SET_STRUCT Id="RDK:23017143" VarRef="SteigungItem" ClearAll="True" ListRef="SteigungList">
 							<PAR Name="Value">
 								<EXP><![CDATA[$C$1]]></EXP>
 							</PAR>
@@ -40355,7 +40293,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="Tooltip" />
 							<PAR Name="Tags" />
 						</SET_STRUCT>
-						<SET_STRUCT Id="RDK:23017144" VarRef="SteigungOFGeradeItem" ClearAll="True" ListRef="SteigungOFGeradeList">
+						<SET_STRUCT Id="RDK:23017144" VarRef="SteigungItem" ClearAll="True" ListRef="SteigungList">
 							<PAR Name="Value">
 								<EXP><![CDATA[$C$-1]]></EXP>
 							</PAR>
@@ -40934,7 +40872,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<PAR Name="ValidateFail" />
 							<PAR Name="ValidateMsg" />
 							<PAR Name="DataSource">
-								<EXP><![CDATA[$=$SteigungOFGeradeList]]></EXP>
+								<EXP><![CDATA[$=$SteigungList]]></EXP>
 							</PAR>
 							<PAR Name="Options" />
 						</ACTION_CALL>
@@ -42134,12 +42072,8 @@ ShapeList["id="+Param.Input[1].shapeID].name
 				<SET_STRUCT Id="RDK:23017012" VarRef="OFBogenData_defaults" ClearAll="True">
 					<PAR Name="Beschreibung" />
 					<PAR Name="L1" />
-					<PAR Name="H_Anfang">
-						<EXP><![CDATA[$C$2000]]></EXP>
-					</PAR>
-					<PAR Name="H_Ende">
-						<EXP><![CDATA[$C$2000]]></EXP>
-					</PAR>
+					<PAR Name="H_Anfang" />
+					<PAR Name="H_Ende" />
 					<PAR Name="Delta_h">
 						<EXP><![CDATA[$C$0]]></EXP>
 					</PAR>
@@ -42157,38 +42091,6 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<PAR Name="AntriebAussen" />
 				</SET_STRUCT>
 			</GROUP>
-			<GROUP Id="RDK:23125038" Name="OFGerade" SubType="Generic">
-				<SET_STRUCT Id="RDK:23125037" VarRef="OFGeradeData_defaults" ClearAll="True">
-					<PAR Name="Beschreibung" />
-					<PAR Name="L1">
-						<EXP><![CDATA[$C$2000]]></EXP>
-					</PAR>
-					<PAR Name="L_th" />
-					<PAR Name="LH_fits" />
-					<PAR Name="LH_toleranz" />
-					<PAR Name="winkel">
-						<EXP><![CDATA[$C$0]]></EXP>
-					</PAR>
-					<PAR Name="FesteL1" />
-					<PAR Name="H1gtH0" />
-					<PAR Name="HoeheOben">
-						<EXP><![CDATA[$C$2000]]></EXP>
-					</PAR>
-					<PAR Name="FesteH1" />
-					<PAR Name="HoeheUnten">
-						<EXP><![CDATA[$C$2000]]></EXP>
-					</PAR>
-					<PAR Name="FesteH0" />
-					<PAR Name="winkel_th" />
-					<PAR Name="H_th" />
-					<PAR Name="n_Sep">
-						<EXP><![CDATA[$C$0]]></EXP>
-					</PAR>
-					<PAR Name="n_Scan">
-						<EXP><![CDATA[$C$0]]></EXP>
-					</PAR>
-				</SET_STRUCT>
-			</GROUP>
 		</GROUP>
 		<GROUP Id="RDK:326" Name="UI" SubType="Generic">
 			<GROUP Id="RDK:20549455" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
@@ -43185,4 +43087,4 @@ ShapeList["id="+Param.Input[1].shapeID].name
 		</PROFILES_DATA>
 		<BOM_DATA />
 	</EXTERNAL_DATA>
-</PROCESS>
\ No newline at end of file
+</PROCESS>