diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 6c9aa9e..4cd3581 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="s.schmutzler [ANGEBOT-NB06]" ModDate="2024-06-10T12:33:13" LanguageVersion="2014.1.3.673" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="s.schmutzler [ANGEBOT-NB06]" ModDate="2024-06-11T11:49:03" LanguageVersion="2014.1.3.674" />
 	<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">
@@ -6398,6 +6398,18 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 								<PAR Name="AdvancedOptions" />
 							</SET>
 						</VAR>
+						<VAR Id="RDK:19562782" Name="alpha_s" Type="double" DesignTimeRemark="Winkel von Gefällestrecke">
+							<SET Id="RDK:19562784" VarRef="Me">
+								<EXP><![CDATA[$=$DegToRad(Shape_Prototype.FoerdererDefinition.winkel_s)]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+						</VAR>
+						<VAR Id="RDK:19562788" Name="alpha_f" Type="double" DesignTimeRemark="Winkel von Gefällestrecke">
+							<SET Id="RDK:19562787" VarRef="Me">
+								<EXP><![CDATA[$=$DegToRad(Shape_Prototype.FoerdererDefinition.winkel_f)]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+						</VAR>
 						<VAR Id="RDK:18150242" Name="L1" Type="double" DesignTimeRemark="Gesamtlänge">
 							<SET Id="RDK:18150244" VarRef="Me">
 								<EXP><![CDATA[$=$Shape_Prototype.FoerdererDefinition.L1]]></EXP>
@@ -6728,7 +6740,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 							</SET>
 							<IFTHENELSE Id="RDK:18729636">
 								<VALUECONDITION Value="true">
-									<EXP><![CDATA[$=$-Delta_h/L1=Tan(DegToRad(winkel_s))]]></EXP>
+									<EXP><![CDATA[$=$-Delta_h/L1=Tan(alpha_s)]]></EXP>
 								</VALUECONDITION>
 								<GROUP Id="RDK:18729637" SubType="Then">
 									<ACTION_CALL Id="RDK:18729653" Name="RDEngineering_MsgBox" DesignTimeRemark="{Text}">
@@ -6750,7 +6762,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 								</GROUP>
 							</IFTHENELSE>
 							<SET Id="RDK:19482859" VarRef="L_F">
-								<EXP><![CDATA[$=$h1-h0+Tan(winkel_s)*L1-Tan(winkel_s)*L_SEA+H_SEA+Tan(winkel_f)*L_FEA-H_FEA]]></EXP>
+								<EXP><![CDATA[$=$(Delta_h+Tan(alpha_s)*L1-Tan(alpha_s)*L_SEA+H_SEA+Tan(alpha_f)*L_FEA-H_FEA)/(Tan(alpha_s)+Tan(alpha_f))]]></EXP>
 								<PAR Name="AdvancedOptions" />
 							</SET>
 							<SET Id="RDK:18150160" VarRef="L_S">
@@ -6762,8 +6774,8 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 								<PAR Name="AdvancedOptions" />
 							</SET>
 							<IFTHENELSE Id="RDK:18150161">
-								<VALUECONDITION Value="true">
-									<EXP><![CDATA[$=$x_verhaeltnis > 1]]></EXP>
+								<VALUECONDITION Value="true" Oper="OR">
+									<EXP><![CDATA[$=$Abs(x_verhaeltnis) > 1]]></EXP>
 								</VALUECONDITION>
 								<GROUP Id="RDK:18150162" SubType="Then">
 									<ACTION_CALL Id="RDK:18205263" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
@@ -6994,12 +7006,128 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<PAR Name="DataSource" />
 										<PAR Name="Options" />
 									</ACTION_CALL>
+									<ACTION_CALL Id="RDK:19577655" 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_Foerderer]]></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$winkel_f]]></EXP>
+										</PAR>
+										<PAR Name="ParentId" />
+										<PAR Name="Label">
+											<EXP><![CDATA[$C$Winkel Förderer [°]]]></EXP>
+										</PAR>
+										<PAR Name="Field">
+											<EXP><![CDATA[$C$winkel_f]]></EXP>
+										</PAR>
+										<PAR Name="Value" />
+										<PAR Name="Uom" />
+										<PAR Name="Tooltip" />
+										<PAR Name="Styles" />
+										<PAR Name="Classes">
+											<EXP><![CDATA[$C$col-3]]></EXP>
+										</PAR>
+										<PAR Name="Rules" />
+										<PAR Name="Image" />
+										<PAR Name="ControlType">
+											<EXP><![CDATA[$C$textbox]]></EXP>
+										</PAR>
+										<PAR Name="ButtonSubType" />
+										<PAR Name="DropdownSubType" />
+										<PAR Name="TextboxSubType">
+											<EXP><![CDATA[$C$STANDARD]]></EXP>
+										</PAR>
+										<PAR Name="Action" />
+										<PAR Name="Required">
+											<EXP><![CDATA[$C$True]]></EXP>
+										</PAR>
+										<PAR Name="Hidden" />
+										<PAR Name="ROnly">
+											<EXP><![CDATA[$C$True]]></EXP>
+										</PAR>
+										<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" />
+									</ACTION_CALL>
+									<ACTION_CALL Id="RDK:19587117" 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_Foerderer]]></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$Richtung]]></EXP>
+										</PAR>
+										<PAR Name="ParentId" />
+										<PAR Name="Label">
+											<EXP><![CDATA[$C$Wechsel der Förderrichtung]]></EXP>
+										</PAR>
+										<PAR Name="Field">
+											<EXP><![CDATA[$C$Richtung]]></EXP>
+										</PAR>
+										<PAR Name="Value" />
+										<PAR Name="Uom" />
+										<PAR Name="Tooltip" />
+										<PAR Name="Styles" />
+										<PAR Name="Classes">
+											<EXP><![CDATA[$C$col-3]]></EXP>
+										</PAR>
+										<PAR Name="Rules" />
+										<PAR Name="Image" />
+										<PAR Name="ControlType">
+											<EXP><![CDATA[$C$dropdownwithimages]]></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[$C$True]]></EXP>
+										</PAR>
+										<PAR Name="ValidateFail" />
+										<PAR Name="ValidateMsg" />
+										<PAR Name="DataSource">
+											<EXP><![CDATA[$=$RichtungList]]></EXP>
+										</PAR>
+										<PAR Name="Options" />
+									</ACTION_CALL>
 									<SET Id="RDK:18172282" VarRef="Shape_Prototype.FoerdererDefinition.Delta_hf">
-										<EXP><![CDATA[$=$Round(Tan(DegToRad(winkel_f))*(L_F-L_FEA) + H_FEA, 2)]]></EXP>
+										<EXP><![CDATA[$=$Round(Tan(alpha_f)*(L_F-L_FEA) + H_FEA, 2)]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 									<SET Id="RDK:18164344" VarRef="Shape_Prototype.FoerdererDefinition.Delta_hs">
-										<EXP><![CDATA[$=$Round(Tan(DegToRad(winkel_f))*(L_S-L_SEA) + H_SEA, 2)]]></EXP>
+										<EXP><![CDATA[$=$Round(Tan(alpha_s)*(L_S-L_SEA) + H_SEA, 2)]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 									<SET Id="RDK:18164346" VarRef="Shape_Prototype.FoerdererDefinition.Delta_h">
@@ -7052,7 +7180,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<PAR Name="AdvancedOptions" />
 									</SET>
 									<SET Id="RDK:18216859" VarRef="Shape_Prototype.FoerdererDefinition.Delta_h">
-										<EXP><![CDATA[$=$h1-h0]]></EXP>
+										<EXP><![CDATA[$=$Delta_h]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 									<SET Id="RDK:18656461" VarRef="Shape_Prototype.FoerdererDefinition.LH_fits" DesignTimeRemark="LH_fits ==False, nicht in Ordnung , rot dargestellt">
@@ -7232,6 +7360,63 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<PAR Name="DataSource" />
 										<PAR Name="Options" />
 									</ACTION_CALL>
+									<ACTION_CALL Id="RDK:19587119" 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_Foerderer]]></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$Richtung]]></EXP>
+										</PAR>
+										<PAR Name="ParentId" />
+										<PAR Name="Label">
+											<EXP><![CDATA[$C$Wechsel der Förderrichtung]]></EXP>
+										</PAR>
+										<PAR Name="Field">
+											<EXP><![CDATA[$C$Richtung]]></EXP>
+										</PAR>
+										<PAR Name="Value" />
+										<PAR Name="Uom" />
+										<PAR Name="Tooltip" />
+										<PAR Name="Styles" />
+										<PAR Name="Classes">
+											<EXP><![CDATA[$C$col-3]]></EXP>
+										</PAR>
+										<PAR Name="Rules" />
+										<PAR Name="Image" />
+										<PAR Name="ControlType">
+											<EXP><![CDATA[$C$dropdownwithimages]]></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[$C$True]]></EXP>
+										</PAR>
+										<PAR Name="ValidateFail" />
+										<PAR Name="ValidateMsg" />
+										<PAR Name="DataSource">
+											<EXP><![CDATA[$=$RichtungList]]></EXP>
+										</PAR>
+										<PAR Name="Options" />
+									</ACTION_CALL>
 								</GROUP>
 							</IFTHENELSE>
 						</GROUP>
@@ -8694,11 +8879,11 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 						<EXP><![CDATA[$=$Param.Input.Text + Lf() + "Höhe vererbt"]]></EXP>
 						<PAR Name="AdvancedOptions" />
 					</SET>
-					<SET Id="RDK:18768030" VarRef="ShapeList[TempIndex].lineColor">
+					<SET Id="RDK:18768030" VarRef="ShapeList[TempIndex].lineColor" Suppressed="True">
 						<EXP><![CDATA[$C$#f33256]]></EXP>
 						<PAR Name="AdvancedOptions" />
 					</SET>
-					<CALLFUNCTION Id="RDK:19452318" Suppressed="True">
+					<CALLFUNCTION Id="RDK:19452318">
 						<PAR Name="FuncName">
 							<EXP><![CDATA[$C$SetStatus_False]]></EXP>
 						</PAR>
@@ -13226,7 +13411,7 @@ me.x
 							<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID]]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
-						<SELECTCASE Id="RDK:19089171">
+						<SELECTCASE Id="RDK:19089171" Suppressed="True">
 							<EXP><![CDATA[$=$item_1.family]]></EXP>
 							<CASEGROUP Id="RDK:19089173" CaseType="0">
 								<EXP><![CDATA[$C$Foerderer]]></EXP>
@@ -13281,7 +13466,7 @@ me.x
 								<EXP><![CDATA[$C$Gefaellestrecke]]></EXP>
 								<CALLFUNCTION Id="RDK:19089286">
 									<PAR Name="FuncName">
-										<EXP><![CDATA[$C$Check_LH_fits_gefaelle]]></EXP>
+										<EXP><![CDATA[$C$Calculate Gefaellestrecke]]></EXP>
 									</PAR>
 									<PAR Name="InputExp">
 										<EXP><![CDATA[$=$Param.Input[1].shapeID]]></EXP>
@@ -13507,7 +13692,7 @@ me.x
 									<GROUP Id="RDK:18827014" SubType="Then">
 										<CALLFUNCTION Id="RDK:19474708">
 											<PAR Name="FuncName">
-												<EXP><![CDATA[$C$Check_LH_fits_gefaelle]]></EXP>
+												<EXP><![CDATA[$C$Calculate Gefaellestrecke]]></EXP>
 											</PAR>
 											<PAR Name="InputExp">
 												<EXP><![CDATA[$=$Param.Input[0].shapeID]]></EXP>
@@ -15381,68 +15566,85 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<EXP><![CDATA[$=$Param.Input["key=Hoehe"].Dbl]]></EXP>
 					<PAR Name="AdvancedOptions" />
 				</SET>
-				<IFTHENELSE Id="RDK:1773499">
+				<IFTHENELSE Id="RDK:1732133">
 					<VALUECONDITION Value="true">
-						<EXP><![CDATA[$=$ShapeList["id="+shapeId].family="Gefaellestrecke"]]></EXP>
+						<EXP><![CDATA[$=$label="Oben"]]></EXP>
 					</VALUECONDITION>
-					<GROUP Id="RDK:1773505" SubType="Then">
-						<IFTHENELSE Id="RDK:1732133">
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$label="Oben"]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:1732134" SubType="Then">
-								<SET Id="RDK:1725908" VarRef="ShapeList[&quot;id=&quot;+shapeId].GefaelleDefinition.HoeheOben">
-									<EXP><![CDATA[$=$hoehe]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</GROUP>
-							<GROUP Id="RDK:1732135" SubType="Else">
-								<SET Id="RDK:1732143" VarRef="ShapeList[&quot;id=&quot;+shapeId].GefaelleDefinition.HoeheUnten">
-									<EXP><![CDATA[$=$hoehe]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</GROUP>
-						</IFTHENELSE>
-					</GROUP>
-				</IFTHENELSE>
-				<IFTHENELSE Id="RDK:18226064">
-					<VALUECONDITION Value="true">
-						<EXP><![CDATA[$=$ShapeList["id="+shapeId].family="Foerderer"]]></EXP>
-					</VALUECONDITION>
-					<GROUP Id="RDK:18226063" SubType="Then">
-						<IFTHENELSE Id="RDK:18226062">
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$label="H_1"]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:18226059" SubType="Then">
-								<SET Id="RDK:18226058" VarRef="ShapeList[&quot;id=&quot;+shapeId].FoerdererDefinition.H_1">
-									<EXP><![CDATA[$=$hoehe]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</GROUP>
-							<GROUP Id="RDK:18226061" SubType="Else">
-								<SET Id="RDK:18226060" VarRef="ShapeList[&quot;id=&quot;+shapeId].FoerdererDefinition.H_0">
-									<EXP><![CDATA[$=$hoehe]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</GROUP>
-						</IFTHENELSE>
-						<SET Id="RDK:18234011" VarRef="Shape_Prototype">
-							<EXP><![CDATA[$=$ShapeList["id="+shapeId]]]></EXP>
+					<GROUP Id="RDK:1732134" SubType="Then">
+						<SET Id="RDK:1725908" VarRef="ShapeList[&quot;id=&quot;+shapeId].GefaelleDefinition.HoeheOben">
+							<EXP><![CDATA[$=$hoehe]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+					</GROUP>
+					<GROUP Id="RDK:1732135" SubType="Else">
+						<SET Id="RDK:1732143" VarRef="ShapeList[&quot;id=&quot;+shapeId].GefaelleDefinition.HoeheUnten">
+							<EXP><![CDATA[$=$hoehe]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
-						<CALLFUNCTION Id="RDK:18232786">
-							<PAR Name="FuncName">
-								<EXP><![CDATA[$C$Calculate Foerderer]]></EXP>
-							</PAR>
-							<PAR Name="InputExp" />
-							<PAR Name="ResultRef">
-								<EXP><![CDATA[$V$]]></EXP>
-							</PAR>
-							<PAR Name="Options" />
-						</CALLFUNCTION>
 					</GROUP>
 				</IFTHENELSE>
+				<CALLFUNCTION Id="RDK:19545884">
+					<PAR Name="FuncName">
+						<EXP><![CDATA[$C$Calculate Gefaellestrecke]]></EXP>
+					</PAR>
+					<PAR Name="InputExp">
+						<EXP><![CDATA[$=$shapeId]]></EXP>
+					</PAR>
+					<PAR Name="ResultRef">
+						<EXP><![CDATA[$V$]]></EXP>
+					</PAR>
+					<PAR Name="Options" />
+				</CALLFUNCTION>
+			</FUNCTION>
+			<FUNCTION Id="RDK:19545872" Name="SetFoerdererHeight" InputTypeName="SSGParameter[]">
+				<GROUP Id="RDK:19545852" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
+					<VAR Id="RDK:19545849" Name="shapeId" Type="string" />
+					<VAR Id="RDK:19545850" Name="label" Type="string" />
+					<VAR Id="RDK:19545851" Name="hoehe" Type="double" />
+				</GROUP>
+				<SET Id="RDK:19545853" VarRef="shapeId">
+					<EXP><![CDATA[$=$Param.Input["key=ShapeId"].Str]]></EXP>
+					<PAR Name="AdvancedOptions" />
+				</SET>
+				<SET Id="RDK:19545854" VarRef="label">
+					<EXP><![CDATA[$=$Param.Input["key=Label"].Str]]></EXP>
+					<PAR Name="AdvancedOptions" />
+				</SET>
+				<SET Id="RDK:19545855" VarRef="hoehe">
+					<EXP><![CDATA[$=$Param.Input["key=Hoehe"].Dbl]]></EXP>
+					<PAR Name="AdvancedOptions" />
+				</SET>
+				<IFTHENELSE Id="RDK:19545867">
+					<VALUECONDITION Value="true">
+						<EXP><![CDATA[$=$label="H_1"]]></EXP>
+					</VALUECONDITION>
+					<GROUP Id="RDK:19545864" SubType="Then">
+						<SET Id="RDK:19545863" VarRef="ShapeList[&quot;id=&quot;+shapeId].FoerdererDefinition.H_1">
+							<EXP><![CDATA[$=$hoehe]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+					</GROUP>
+					<GROUP Id="RDK:19545866" SubType="Else">
+						<SET Id="RDK:19545865" VarRef="ShapeList[&quot;id=&quot;+shapeId].FoerdererDefinition.H_0">
+							<EXP><![CDATA[$=$hoehe]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+					</GROUP>
+				</IFTHENELSE>
+				<SET Id="RDK:19545868" VarRef="Shape_Prototype">
+					<EXP><![CDATA[$=$ShapeList["id="+shapeId]]]></EXP>
+					<PAR Name="AdvancedOptions" />
+				</SET>
+				<CALLFUNCTION Id="RDK:19545869">
+					<PAR Name="FuncName">
+						<EXP><![CDATA[$C$Calculate Foerderer]]></EXP>
+					</PAR>
+					<PAR Name="InputExp" />
+					<PAR Name="ResultRef">
+						<EXP><![CDATA[$V$]]></EXP>
+					</PAR>
+					<PAR Name="Options" />
+				</CALLFUNCTION>
 			</FUNCTION>
 			<FUNCTION Id="RDK:19265800" Name="Check_is_defined" InputTypeName="string" ResultTypeName="boolean">
 				<COMMENTS Id="RDK:19265764" DesignTimeRemark="Wenn beide Connection-Points verbunden sind, dann gibt diese Funktion &quot;True&quot; zurück, sonst &quot;False&quot;" />
@@ -15546,7 +15748,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					</CASEGROUP>
 				</SELECTCASE>
 			</FUNCTION>
-			<FUNCTION Id="RDK:18326311" Name="Check_LH_fits_gefaelle" InputTypeName="string">
+			<FUNCTION Id="RDK:18326311" Name="Calculate Gefaellestrecke" InputTypeName="string">
 				<COMMENTS Id="RDK:1792975" 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:18329391" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
 					<VAR Id="RDK:18329384" Name="L_th" Type="double" />
@@ -15688,8 +15890,8 @@ ShapeList["id="+Param.Input[1].shapeID].name
 				</SET>
 				<GROUP Id="RDK:1698060" Name="Filter" SubType="Generic" DesignTimeNotes="(ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].family=&quot;Gefaellestrecke&quot; And  (ShapeList[&quot;id=&quot;+Param.Input[1].shapeID].Rotationsklasse=&quot;Rotationsobjekt&quot;and IsTagInString(Param.Input[1].connectionPointID, &quot;defcp&quot;)))  &#xA;Or &#xA;(ShapeList[&quot;id=&quot;+Param.Input[1].shapeID].family=&quot;Gefaellestrecke&quot; And  (ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].Rotationsklasse=&quot;Rotationsobjekt&quot; and IsTagInString(Param.Input[0].connectionPointID, &quot;defcp&quot;)))  &#xA;">
 					<VALUECONDITION Value="true">
-						<EXP><![CDATA[$=$(ShapeList["id="+Param.Input[0].shapeID].family="Kreisel" and (ShapeList["id="+Param.Input[1].shapeID].family="Gefaellestrecke") or ShapeList["id="+Param.Input[1].shapeID].family="Foerderer") or
-(ShapeList["id="+Param.Input[1].shapeID].family="Kreisel" and (ShapeList["id="+Param.Input[0].shapeID].family="Gefaellestrecke") or (ShapeList["id="+Param.Input[0].shapeID].family="Foerderer"))]]></EXP>
+						<EXP><![CDATA[$=$(ShapeList["id="+Param.Input[0].shapeID].family="Kreisel" and ShapeList["id="+Param.Input[1].shapeID].family="Gefaellestrecke") or
+(ShapeList["id="+Param.Input[1].shapeID].family="Kreisel" and ShapeList["id="+Param.Input[0].shapeID].family="Gefaellestrecke") ]]></EXP>
 					</VALUECONDITION>
 					<IFTHENELSE Id="RDK:1773568">
 						<VALUECONDITION Value="true">
@@ -15727,48 +15929,21 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								<PAR Name="Int" />
 								<PAR Name="Boo" />
 							</SET_STRUCT>
-							<SELECTCASE Id="RDK:18792286">
-								<EXP><![CDATA[$=$item_1.family]]></EXP>
-								<CASEGROUP Id="RDK:18792287" CaseType="0">
-									<EXP><![CDATA[$C$Foerderer]]></EXP>
-									<SET Id="RDK:18792296" VarRef="cp_kreiselpartner" DesignTimeNotes="ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].connectionPoints[&quot;cpId=&quot;+cpId]">
-										<EXP><![CDATA[$=$FromJSON(ShapeList["id="+Param.Input[1].shapeID].connectionPoints)["cpId="+cpId]]]></EXP>
-										<PAR Name="AdvancedOptions" />
-									</SET>
-									<SET_STRUCT Id="RDK:18792298" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
-										<PAR Name="Key">
-											<EXP><![CDATA[$C$Label]]></EXP>
-										</PAR>
-										<PAR Name="Str">
-											<EXP><![CDATA[$=$cp_kreiselpartner.label]]></EXP>
-										</PAR>
-										<PAR Name="Dbl" />
-										<PAR Name="Int" />
-										<PAR Name="Boo" />
-									</SET_STRUCT>
-								</CASEGROUP>
-								<CASEGROUP Id="RDK:18792292" CaseType="0">
-									<EXP><![CDATA[$C$Gefaellestrecke]]></EXP>
-									<SET Id="RDK:1802723" VarRef="cp_kreiselpartner" DesignTimeNotes="ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].connectionPoints[&quot;cpId=&quot;+cpId]">
-										<EXP><![CDATA[$=$FromJSON(ShapeList["id="+Param.Input[1].shapeID].connectionPoints)["cpId="+cpId]]]></EXP>
-										<PAR Name="AdvancedOptions" />
-									</SET>
-									<SET_STRUCT Id="RDK:1802725" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
-										<PAR Name="Key">
-											<EXP><![CDATA[$C$Label]]></EXP>
-										</PAR>
-										<PAR Name="Str">
-											<EXP><![CDATA[$=$cp_kreiselpartner.label]]></EXP>
-										</PAR>
-										<PAR Name="Dbl" />
-										<PAR Name="Int" />
-										<PAR Name="Boo" />
-									</SET_STRUCT>
-								</CASEGROUP>
-								<CASEGROUP Id="RDK:18792288" CaseType="1">
-									<EXP />
-								</CASEGROUP>
-							</SELECTCASE>
+							<SET Id="RDK:18792296" VarRef="cp_kreiselpartner" DesignTimeNotes="ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].connectionPoints[&quot;cpId=&quot;+cpId]">
+								<EXP><![CDATA[$=$FromJSON(ShapeList["id="+Param.Input[1].shapeID].connectionPoints)["cpId="+cpId]]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+							<SET_STRUCT Id="RDK:18792298" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+								<PAR Name="Key">
+									<EXP><![CDATA[$C$Label]]></EXP>
+								</PAR>
+								<PAR Name="Str">
+									<EXP><![CDATA[$=$cp_kreiselpartner.label]]></EXP>
+								</PAR>
+								<PAR Name="Dbl" />
+								<PAR Name="Int" />
+								<PAR Name="Boo" />
+							</SET_STRUCT>
 							<CALLFUNCTION Id="RDK:1802731">
 								<PAR Name="FuncName">
 									<EXP><![CDATA[$C$SetGefaellestreckeHeight]]></EXP>
@@ -15836,48 +16011,21 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								<PAR Name="Int" />
 								<PAR Name="Boo" />
 							</SET_STRUCT>
-							<SELECTCASE Id="RDK:18792316">
-								<EXP><![CDATA[$=$item_0.family]]></EXP>
-								<CASEGROUP Id="RDK:18792311" CaseType="0">
-									<EXP><![CDATA[$C$Foerderer]]></EXP>
-									<SET Id="RDK:18792309" VarRef="cp_kreiselpartner" DesignTimeNotes="ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].connectionPoints[&quot;cpId=&quot;+cpId]">
-										<EXP><![CDATA[$=$FromJSON(ShapeList["id="+Param.Input[0].shapeID].connectionPoints)["cpId="+cpId]]]></EXP>
-										<PAR Name="AdvancedOptions" />
-									</SET>
-									<SET_STRUCT Id="RDK:18792310" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
-										<PAR Name="Key">
-											<EXP><![CDATA[$C$Label]]></EXP>
-										</PAR>
-										<PAR Name="Str">
-											<EXP><![CDATA[$=$cp_kreiselpartner.label]]></EXP>
-										</PAR>
-										<PAR Name="Dbl" />
-										<PAR Name="Int" />
-										<PAR Name="Boo" />
-									</SET_STRUCT>
-								</CASEGROUP>
-								<CASEGROUP Id="RDK:18792314" CaseType="0">
-									<EXP><![CDATA[$C$Gefaellestrecke]]></EXP>
-									<SET Id="RDK:18792312" VarRef="cp_kreiselpartner" DesignTimeNotes="ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].connectionPoints[&quot;cpId=&quot;+cpId]">
-										<EXP><![CDATA[$=$FromJSON(ShapeList["id="+Param.Input[0].shapeID].connectionPoints)["cpId="+cpId]]]></EXP>
-										<PAR Name="AdvancedOptions" />
-									</SET>
-									<SET_STRUCT Id="RDK:18792313" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
-										<PAR Name="Key">
-											<EXP><![CDATA[$C$Label]]></EXP>
-										</PAR>
-										<PAR Name="Str">
-											<EXP><![CDATA[$=$cp_kreiselpartner.label]]></EXP>
-										</PAR>
-										<PAR Name="Dbl" />
-										<PAR Name="Int" />
-										<PAR Name="Boo" />
-									</SET_STRUCT>
-								</CASEGROUP>
-								<CASEGROUP Id="RDK:18792315" CaseType="1">
-									<EXP />
-								</CASEGROUP>
-							</SELECTCASE>
+							<SET Id="RDK:18792309" VarRef="cp_kreiselpartner" DesignTimeNotes="ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].connectionPoints[&quot;cpId=&quot;+cpId]">
+								<EXP><![CDATA[$=$FromJSON(ShapeList["id="+Param.Input[0].shapeID].connectionPoints)["cpId="+cpId]]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+							<SET_STRUCT Id="RDK:18792310" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+								<PAR Name="Key">
+									<EXP><![CDATA[$C$Label]]></EXP>
+								</PAR>
+								<PAR Name="Str">
+									<EXP><![CDATA[$=$cp_kreiselpartner.label]]></EXP>
+								</PAR>
+								<PAR Name="Dbl" />
+								<PAR Name="Int" />
+								<PAR Name="Boo" />
+							</SET_STRUCT>
 							<CALLFUNCTION Id="RDK:1773534">
 								<PAR Name="FuncName">
 									<EXP><![CDATA[$C$SetGefaellestreckeHeight]]></EXP>
@@ -15915,6 +16063,181 @@ ShapeList["id="+Param.Input[1].shapeID].name
 						</GROUP>
 					</IFTHENELSE>
 				</GROUP>
+				<GROUP Id="RDK:19545806" Name="Filter" SubType="Generic" DesignTimeNotes="(ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].family=&quot;Gefaellestrecke&quot; And  (ShapeList[&quot;id=&quot;+Param.Input[1].shapeID].Rotationsklasse=&quot;Rotationsobjekt&quot;and IsTagInString(Param.Input[1].connectionPointID, &quot;defcp&quot;)))  &#xA;Or &#xA;(ShapeList[&quot;id=&quot;+Param.Input[1].shapeID].family=&quot;Gefaellestrecke&quot; And  (ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].Rotationsklasse=&quot;Rotationsobjekt&quot; and IsTagInString(Param.Input[0].connectionPointID, &quot;defcp&quot;)))  &#xA;">
+					<VALUECONDITION Value="true">
+						<EXP><![CDATA[$=$(ShapeList["id="+Param.Input[0].shapeID].family="Kreisel" and ShapeList["id="+Param.Input[1].shapeID].family="Foerderer") or
+(ShapeList["id="+Param.Input[1].shapeID].family="Kreisel" and ShapeList["id="+Param.Input[0].shapeID].family="Foerderer")]]></EXP>
+					</VALUECONDITION>
+					<IFTHENELSE Id="RDK:19545805">
+						<VALUECONDITION Value="true">
+							<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family="Kreisel"]]></EXP>
+						</VALUECONDITION>
+						<GROUP Id="RDK:19545787" SubType="Then">
+							<COMMENTS Id="RDK:19545771" DesignTimeRemark="//Förderer Index == 1" />
+							<SET Id="RDK:19545772" VarRef="cpId">
+								<EXP><![CDATA[$=$Param.Input[1].connectionPointID]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+							<SET Id="RDK:19545773" VarRef="kreiselhoehe">
+								<EXP><![CDATA[$=$item_0.KreiselDefinition.Hoehe]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+							<SET_STRUCT Id="RDK:19545774" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+								<PAR Name="Key">
+									<EXP><![CDATA[$C$ShapeId]]></EXP>
+								</PAR>
+								<PAR Name="Str">
+									<EXP><![CDATA[$=$item_1.id]]></EXP>
+								</PAR>
+								<PAR Name="Dbl" />
+								<PAR Name="Int" />
+								<PAR Name="Boo" />
+							</SET_STRUCT>
+							<SET_STRUCT Id="RDK:19545775" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+								<PAR Name="Key">
+									<EXP><![CDATA[$C$Hoehe]]></EXP>
+								</PAR>
+								<PAR Name="Str" />
+								<PAR Name="Dbl">
+									<EXP><![CDATA[$=$kreiselhoehe]]></EXP>
+								</PAR>
+								<PAR Name="Int" />
+								<PAR Name="Boo" />
+							</SET_STRUCT>
+							<SET Id="RDK:19545776" VarRef="cp_kreiselpartner" DesignTimeNotes="ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].connectionPoints[&quot;cpId=&quot;+cpId]">
+								<EXP><![CDATA[$=$FromJSON(ShapeList["id="+Param.Input[1].shapeID].connectionPoints)["cpId="+cpId]]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+							<SET_STRUCT Id="RDK:19545777" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+								<PAR Name="Key">
+									<EXP><![CDATA[$C$Label]]></EXP>
+								</PAR>
+								<PAR Name="Str">
+									<EXP><![CDATA[$=$cp_kreiselpartner.label]]></EXP>
+								</PAR>
+								<PAR Name="Dbl" />
+								<PAR Name="Int" />
+								<PAR Name="Boo" />
+							</SET_STRUCT>
+							<CALLFUNCTION Id="RDK:19545784">
+								<PAR Name="FuncName">
+									<EXP><![CDATA[$C$SetFoerdererHeight]]></EXP>
+								</PAR>
+								<PAR Name="InputExp">
+									<EXP><![CDATA[$=$UebergabeListe]]></EXP>
+								</PAR>
+								<PAR Name="ResultRef">
+									<EXP><![CDATA[$V$]]></EXP>
+								</PAR>
+								<PAR Name="Options" />
+							</CALLFUNCTION>
+							<SET_STRUCT Id="RDK:19545785" VarRef="SSGParameter" ClearAll="True" ListRef="RueckgabeListe">
+								<PAR Name="Key">
+									<EXP><![CDATA[$C$ShapeId]]></EXP>
+								</PAR>
+								<PAR Name="Str">
+									<EXP><![CDATA[$=$item_1.id]]></EXP>
+								</PAR>
+								<PAR Name="Dbl" />
+								<PAR Name="Int" />
+								<PAR Name="Boo" />
+							</SET_STRUCT>
+							<SET_STRUCT Id="RDK:19545786" VarRef="SSGParameter" ClearAll="True" ListRef="RueckgabeListe">
+								<PAR Name="Key">
+									<EXP><![CDATA[$C$Hoehe]]></EXP>
+								</PAR>
+								<PAR Name="Str">
+									<EXP><![CDATA[$=$item_0.KreiselDefinition.Hoehe]]></EXP>
+								</PAR>
+								<PAR Name="Dbl" />
+								<PAR Name="Int" />
+								<PAR Name="Boo" />
+							</SET_STRUCT>
+						</GROUP>
+						<GROUP Id="RDK:19545804" SubType="Else">
+							<COMMENTS Id="RDK:19545788" DesignTimeRemark="//Förderer Index == 0" />
+							<SET Id="RDK:19545789" VarRef="cpId">
+								<EXP><![CDATA[$=$Param.Input[0].connectionPointID]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+							<SET Id="RDK:19545790" VarRef="kreiselhoehe">
+								<EXP><![CDATA[$=$item_1.KreiselDefinition.Hoehe]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+							<SET_STRUCT Id="RDK:19545791" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+								<PAR Name="Key">
+									<EXP><![CDATA[$C$ShapeId]]></EXP>
+								</PAR>
+								<PAR Name="Str">
+									<EXP><![CDATA[$=$item_0.id]]></EXP>
+								</PAR>
+								<PAR Name="Dbl" />
+								<PAR Name="Int" />
+								<PAR Name="Boo" />
+							</SET_STRUCT>
+							<SET_STRUCT Id="RDK:19545792" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+								<PAR Name="Key">
+									<EXP><![CDATA[$C$Hoehe]]></EXP>
+								</PAR>
+								<PAR Name="Str" />
+								<PAR Name="Dbl">
+									<EXP><![CDATA[$=$kreiselhoehe]]></EXP>
+								</PAR>
+								<PAR Name="Int" />
+								<PAR Name="Boo" />
+							</SET_STRUCT>
+							<SET Id="RDK:19545793" VarRef="cp_kreiselpartner" DesignTimeNotes="ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].connectionPoints[&quot;cpId=&quot;+cpId]">
+								<EXP><![CDATA[$=$FromJSON(ShapeList["id="+Param.Input[0].shapeID].connectionPoints)["cpId="+cpId]]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+							<SET_STRUCT Id="RDK:19545794" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+								<PAR Name="Key">
+									<EXP><![CDATA[$C$Label]]></EXP>
+								</PAR>
+								<PAR Name="Str">
+									<EXP><![CDATA[$=$cp_kreiselpartner.label]]></EXP>
+								</PAR>
+								<PAR Name="Dbl" />
+								<PAR Name="Int" />
+								<PAR Name="Boo" />
+							</SET_STRUCT>
+							<CALLFUNCTION Id="RDK:19545801">
+								<PAR Name="FuncName">
+									<EXP><![CDATA[$C$SetFoerdererHeight]]></EXP>
+								</PAR>
+								<PAR Name="InputExp">
+									<EXP><![CDATA[$=$UebergabeListe]]></EXP>
+								</PAR>
+								<PAR Name="ResultRef">
+									<EXP><![CDATA[$V$]]></EXP>
+								</PAR>
+								<PAR Name="Options" />
+							</CALLFUNCTION>
+							<SET_STRUCT Id="RDK:19545802" VarRef="SSGParameter" ClearAll="True" ListRef="RueckgabeListe">
+								<PAR Name="Key">
+									<EXP><![CDATA[$C$ShapeId]]></EXP>
+								</PAR>
+								<PAR Name="Str">
+									<EXP><![CDATA[$=$item_0.id]]></EXP>
+								</PAR>
+								<PAR Name="Dbl" />
+								<PAR Name="Int" />
+								<PAR Name="Boo" />
+							</SET_STRUCT>
+							<SET_STRUCT Id="RDK:19545803" VarRef="SSGParameter" ClearAll="True" ListRef="RueckgabeListe">
+								<PAR Name="Key">
+									<EXP><![CDATA[$C$Hoehe]]></EXP>
+								</PAR>
+								<PAR Name="Str">
+									<EXP><![CDATA[$=$item_1.KreiselDefinition.Hoehe]]></EXP>
+								</PAR>
+								<PAR Name="Dbl" />
+								<PAR Name="Int" />
+								<PAR Name="Boo" />
+							</SET_STRUCT>
+						</GROUP>
+					</IFTHENELSE>
+				</GROUP>
 				<GROUP Id="RDK:19493690" Name="Filter" SubType="Generic" DesignTimeNotes="(ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].family=&quot;Gefaellestrecke&quot; And  (ShapeList[&quot;id=&quot;+Param.Input[1].shapeID].Rotationsklasse=&quot;Rotationsobjekt&quot;and IsTagInString(Param.Input[1].connectionPointID, &quot;defcp&quot;)))  &#xA;Or &#xA;(ShapeList[&quot;id=&quot;+Param.Input[1].shapeID].family=&quot;Gefaellestrecke&quot; And  (ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].Rotationsklasse=&quot;Rotationsobjekt&quot; and IsTagInString(Param.Input[0].connectionPointID, &quot;defcp&quot;)))  &#xA;">
 					<VALUECONDITION Value="true">
 						<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family="Kreisel" and ShapeList["id="+Param.Input[1].shapeID].family="Kreisel"]]></EXP>
@@ -16660,7 +16983,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								</SET>
 								<CALLFUNCTION Id="RDK:18895245">
 									<PAR Name="FuncName">
-										<EXP><![CDATA[$C$Check_LH_fits_gefaelle]]></EXP>
+										<EXP><![CDATA[$C$Calculate Gefaellestrecke]]></EXP>
 									</PAR>
 									<PAR Name="InputExp">
 										<EXP><![CDATA[$=$Param.Input[0].shapeID]]></EXP>
@@ -16682,7 +17005,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								</SET>
 								<CALLFUNCTION Id="RDK:18895247">
 									<PAR Name="FuncName">
-										<EXP><![CDATA[$C$Check_LH_fits_gefaelle]]></EXP>
+										<EXP><![CDATA[$C$Calculate Gefaellestrecke]]></EXP>
 									</PAR>
 									<PAR Name="InputExp">
 										<EXP><![CDATA[$=$Param.Input[0].shapeID]]></EXP>