diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index fcd0190..cca4dcf 100644
--- a/MAIN_SSG.rdx
+++ b/MAIN_SSG.rdx
@@ -987,14 +987,6 @@
 			<VAR Id="RDK:1007447" Name="Point2DList" Type="Point2D[]" />
 			<VAR Id="RDK:1007444" Name="Point2D" Type="Point2D" />
 			<VAR Id="RDK:1519830" Name="SessionZip" Type="string" />
-			<VAR Id="RDK:20514758" Name="cpId" Type="string" Suppressed="True" DesignTimeRemark="Generated by RD" />
-			<VAR Id="RDK:20518135" Name="shapeI" Type="string" Suppressed="True" DesignTimeRemark="Generated by RD" />
-			<VAR Id="RDK:20549716" Name="RueckgabeListe" Type="string" Suppressed="True" DesignTimeRemark="Generated by RD" />
-			<VAR Id="RDK:20578895" Name="searchedTypes" Type="string[]" Suppressed="True" DesignTimeRemark="Generated by RD" />
-			<VAR Id="RDK:20579082" Name="shapeId" Type="string" Suppressed="True" DesignTimeRemark="Generated by RD" />
-			<VAR Id="RDK:20579085" Name="shapeList_idx_0" Type="string" Suppressed="True" DesignTimeRemark="Generated by RD" />
-			<VAR Id="RDK:20579088" Name="shape_index" Type="string" Suppressed="True" DesignTimeRemark="Generated by RD" />
-			<VAR Id="RDK:20647980" Name="ID" Type="string" DesignTimeRemark="Generated by RD" />
 		</GROUP>
 		<GROUP Id="RDK:0006" Name="Profiles" SubType="ProfileSet">
 			<PROFILE Id="RDK:383" Name="ImportBackgroundProfile" TypeName="ImportBackgroundType" />
@@ -3617,7 +3609,6 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 						<GROUP Id="RDK:439268" Name="Local Variables" SubType="VarSet" IncludeDate="0">
 							<VAR Id="RDK:439269" Name="ID" Type="string" />
 							<VAR Id="RDK:476605" Name="i" Type="integer" />
-							<VAR Id="RDK:19265050" Name="isDefined" Type="boolean" />
 						</GROUP>
 						<SET Id="RDK:439276" VarRef="ID">
 							<EXP><![CDATA[$=$Param.Input]]></EXP>
@@ -3627,18 +3618,6 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 							<EXP><![CDATA[$=$IndexOfByFieldValue(ShapeList, "id", ID)]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
-						<CALLFUNCTION Id="RDK:19269861">
-							<PAR Name="FuncName">
-								<EXP><![CDATA[$C$Check_is_defined]]></EXP>
-							</PAR>
-							<PAR Name="InputExp">
-								<EXP><![CDATA[$=$ID]]></EXP>
-							</PAR>
-							<PAR Name="ResultRef">
-								<EXP><![CDATA[$V$isDefined]]></EXP>
-							</PAR>
-							<PAR Name="Options" />
-						</CALLFUNCTION>
 						<SELECTCASE Id="RDK:439273">
 							<EXP><![CDATA[$=$Shape_Prototype.family]]></EXP>
 							<CASEGROUP Id="RDK:439275" CaseType="0">
@@ -4276,6 +4255,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="pinned" />
 										<PAR Name="selected" />
 										<PAR Name="includeInBOM" />
+										<PAR Name="isDefined" />
 									</SET_STRUCT>
 									<SET_STRUCT Id="RDK:20164888" VarRef="Shape_Prototype" ListRef="ShapeList" Options="$=$&quot;(REPLACEIDX=&quot;+i+&quot;)&quot;" Bookmarked="True" DesignTimeNotes="Shape.depth*Inch/DPI&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;Shape_Prototype.KreiselDefinition.OrientierungHV&#xD;&#xA;IIF(Shape_Prototype.KreiselDefinition.OrientierungHV&lt;&gt;Shape_Prototype.rotation,Shape_Prototype.rotation,Shape_Prototype.KreiselDefinition.OrientierungHV)&#xD;&#xA;&#xD;&#xA;depth&#xD;&#xA;">
 										<PAR Name="SivasNummer" />
@@ -4289,6 +4269,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="WeicheDefinition" />
 										<PAR Name="BTMTBeladungDefinition" />
 										<PAR Name="BTMTEntladungDefinition" />
+										<PAR Name="isDefined" />
 										<PAR Name="source">
 											<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
 										</PAR>
@@ -4593,7 +4574,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="Options" />
 									</ACTION_CALL>
 									<COMMENTS Id="RDK:1653127" Bookmarked="True" DesignTimeRemark="Inherit Rotation" />
-									<SET_STRUCT Id="RDK:1653128" VarRef="Shape_Prototype" ListRef="ShapeList" Options="$=$&quot;(REPLACEIDX=&quot;+i+&quot;)&quot;" Suppressed="True" Bookmarked="True" DesignTimeNotes="Shape.depth*Inch/DPI&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;Shape_Prototype.KreiselDefinition.OrientierungHV&#xD;&#xA;IIF(Shape_Prototype.KreiselDefinition.OrientierungHV&lt;&gt;Shape_Prototype.rotation,Shape_Prototype.rotation,Shape_Prototype.KreiselDefinition.OrientierungHV)">
+									<SET_STRUCT Id="RDK:1653128" VarRef="Shape_Prototype" ListRef="ShapeList" Options="$=$&quot;(REPLACEIDX=&quot;+i+&quot;)&quot;" Bookmarked="True" DesignTimeNotes="Shape.depth*Inch/DPI&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;Shape_Prototype.KreiselDefinition.OrientierungHV&#xD;&#xA;IIF(Shape_Prototype.KreiselDefinition.OrientierungHV&lt;&gt;Shape_Prototype.rotation,Shape_Prototype.rotation,Shape_Prototype.KreiselDefinition.OrientierungHV)">
 										<PAR Name="SivasNummer" />
 										<PAR Name="Rotationsklasse" />
 										<PAR Name="IDCounter" />
@@ -4605,6 +4586,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="WeicheDefinition" />
 										<PAR Name="BTMTBeladungDefinition" />
 										<PAR Name="BTMTEntladungDefinition" />
+										<PAR Name="isDefined" />
 										<PAR Name="source">
 											<EXP><![CDATA[$=$IIF(Shape_Prototype.BTMTBeladungDefinition.Drehung=1,"BTMTBeladung_Rechts","BTMTBeladung_Links")]]></EXP>
 										</PAR>
@@ -4667,7 +4649,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="selected" />
 										<PAR Name="includeInBOM" />
 									</SET_STRUCT>
-									<SET_STRUCT Id="RDK:19615244" VarRef="Shape_Prototype" ListRef="ShapeList" Options="$=$&quot;(REPLACEIDX=&quot;+i+&quot;)&quot;" Bookmarked="True" DesignTimeNotes="Shape.depth*Inch/DPI&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;Shape_Prototype.KreiselDefinition.OrientierungHV&#xD;&#xA;IIF(Shape_Prototype.KreiselDefinition.OrientierungHV&lt;&gt;Shape_Prototype.rotation,Shape_Prototype.rotation,Shape_Prototype.KreiselDefinition.OrientierungHV)">
+									<SET_STRUCT Id="RDK:19615244" VarRef="Shape_Prototype" ListRef="ShapeList" Options="$=$&quot;(REPLACEIDX=&quot;+i+&quot;)&quot;" Suppressed="True" Bookmarked="True" DesignTimeNotes="Shape.depth*Inch/DPI&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;Shape_Prototype.KreiselDefinition.OrientierungHV&#xD;&#xA;IIF(Shape_Prototype.KreiselDefinition.OrientierungHV&lt;&gt;Shape_Prototype.rotation,Shape_Prototype.rotation,Shape_Prototype.KreiselDefinition.OrientierungHV)">
 										<PAR Name="SivasNummer" />
 										<PAR Name="Rotationsklasse" />
 										<PAR Name="IDCounter" />
@@ -4740,6 +4722,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="pinned" />
 										<PAR Name="selected" />
 										<PAR Name="includeInBOM" />
+										<PAR Name="isDefined" />
 									</SET_STRUCT>
 								</GROUP>
 							</CASEGROUP>
@@ -4832,10 +4815,12 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="KreiselDefinition" />
 										<PAR Name="EckradDefinition" />
 										<PAR Name="GefaelleDefinition" />
+										<PAR Name="StreckeDefinition" />
 										<PAR Name="FoerdererDefinition" />
 										<PAR Name="WeicheDefinition" />
 										<PAR Name="BTMTBeladungDefinition" />
 										<PAR Name="BTMTEntladungDefinition" />
+										<PAR Name="isDefined" />
 										<PAR Name="source">
 											<EXP><![CDATA[$=$IIF(Shape_Prototype.BTMTEntladungDefinition.Drehung=1,"BTMTEntladung_Rechts","BTMTEntladung_Links")]]></EXP>
 										</PAR>
@@ -4897,8 +4882,6 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="pinned" />
 										<PAR Name="selected" />
 										<PAR Name="includeInBOM" />
-										<PAR Name="StreckeDefinition" />
-										<PAR Name="isDefined" />
 									</SET_STRUCT>
 								</GROUP>
 							</CASEGROUP>
@@ -5061,7 +5044,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 								</GROUP>
 							</CASEGROUP>
 						</SELECTCASE>
-						<CALLFUNCTION Id="RDK:19615241" Suppressed="True">
+						<CALLFUNCTION Id="RDK:19615241">
 							<PAR Name="FuncName">
 								<EXP><![CDATA[$C$SetStatus]]></EXP>
 							</PAR>
@@ -5073,39 +5056,6 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 							</PAR>
 							<PAR Name="Options" />
 						</CALLFUNCTION>
-						<IFTHENELSE Id="RDK:19866094">
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$(isDefined= True)]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:19866091" SubType="Then">
-								<CALLFUNCTION Id="RDK:19866090">
-									<PAR Name="FuncName">
-										<EXP><![CDATA[$C$SetStatus_Ok]]></EXP>
-									</PAR>
-									<PAR Name="InputExp">
-										<EXP><![CDATA[$=$ID]]></EXP>
-									</PAR>
-									<PAR Name="ResultRef">
-										<EXP><![CDATA[$V$]]></EXP>
-									</PAR>
-									<PAR Name="Options" />
-								</CALLFUNCTION>
-							</GROUP>
-							<GROUP Id="RDK:19866093" SubType="Else">
-								<CALLFUNCTION Id="RDK:19866092">
-									<PAR Name="FuncName">
-										<EXP><![CDATA[$C$SetStatus_False]]></EXP>
-									</PAR>
-									<PAR Name="InputExp">
-										<EXP><![CDATA[$=$ID]]></EXP>
-									</PAR>
-									<PAR Name="ResultRef">
-										<EXP><![CDATA[$V$]]></EXP>
-									</PAR>
-									<PAR Name="Options" />
-								</CALLFUNCTION>
-							</GROUP>
-						</IFTHENELSE>
 					</FUNCTION>
 					<FUNCTION Id="RDK:604706" Name="Write CPs From Data to Prototype">
 						<SET Id="RDK:592704" VarRef="ConnectionPointList">
@@ -5709,9 +5659,20 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 							</IFTHENELSE>
 						</FOREACHLOOP>
 					</FUNCTION>
-					<FUNCTION Id="RDK:1280515" Name="CollectKreiselGroup" DesignTimeNotes="20230928 -1-" InputTypeName="string[]" ResultTypeName="string[]">
+					<FUNCTION Id="RDK:1280515" Name="CollectKreiselGroup" DesignTimeNotes="20230928 -1-" InputTypeName="string" ResultTypeName="string[]">
 						<GROUP Id="RDK:1280524" Name="Local Variables" SubType="VarSet" IncludeDate="0">
-							<VAR Id="RDK:1280523" Name="ID" Type="string" />
+							<VAR Id="RDK:1280523" Name="Parent_Id" Type="string">
+								<SET Id="RDK:20511423" VarRef="Me">
+									<EXP><![CDATA[$=$Param.Input]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</VAR>
+							<VAR Id="RDK:20511425" Name="Parent_Shape" Type="Editor2DShapeType">
+								<SET Id="RDK:20511426" VarRef="Me">
+									<EXP><![CDATA[$=$ShapeList["id="+Parent_Id]]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</VAR>
 							<VAR Id="RDK:1286433" Name="KreiselList" Type="string[]" />
 							<VAR Id="RDK:1280577" Name="Kreisel" Type="string" />
 							<VAR Id="RDK:1280556" Name="TempLink" Type="string" />
@@ -5724,8 +5685,8 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 							<EXP><![CDATA[$C$NOTHING]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
-						<SET Id="RDK:1461340" VarRef="KreiselList">
-							<EXP><![CDATA[$=$Param.Input]]></EXP>
+						<SET Id="RDK:1461340" VarRef="KreiselList" DesignTimeTip="ExecOnValues(Shape_List[&quot;id=&quot;+Param.Input].links, &quot;StrAfter(Me, &quot;&quot;;&quot;&quot;)&quot;, &quot;&quot;)">
+							<EXP><![CDATA[$=$ExecOnValues(Parent_Shape.links, "StrAfter(Me, "";"")", "")]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
 						<WHILELOOP Id="RDK:1280559">
@@ -5741,7 +5702,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 								</PAR>
 								<GROUP Id="RDK:1442601" Name="Remove for Gefaellestrecke" SubType="Generic" DesignTimeNotes="20231005 -1-">
 									<VALUECONDITION Value="true">
-										<EXP><![CDATA[$=$Shape_Prototype.family = "Gefaellestrecke"]]></EXP>
+										<EXP><![CDATA[$=$Parent_Shape.family = "Gefaellestrecke"]]></EXP>
 									</VALUECONDITION>
 									<VALUECONDITION Value="false">
 										<EXP><![CDATA[$=$Contains(AddedKreiselList, Kreisel)]]></EXP>
@@ -5751,10 +5712,10 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									</VALUECONDITION>
 									<GROUP Id="RDK:1442613" Name="Group" SubType="Generic" DesignTimeNotes="If NOT HoeheOben changed &amp; Linked to cp1 (top point)&#xD;&#xA;If NOT HoeheUnten changed &amp; Linked to cp2 (bottom point)">
 										<VALUECONDITION Value="false">
-											<EXP><![CDATA[$=$Contains(Shape_Prototype.links, "cp1;" + Kreisel) AND ShapeList["id=" + Shape_Prototype.id].GefaelleDefinition.HoeheOben <> Shape_Prototype.GefaelleDefinition.HoeheOben]]></EXP>
+											<EXP><![CDATA[$=$Contains(Parent_Shape.links, "cp1;" + Kreisel)]]></EXP>
 										</VALUECONDITION>
 										<VALUECONDITION Value="false">
-											<EXP><![CDATA[$=$Contains(Shape_Prototype.links, "cp2;" + Kreisel) AND ShapeList["id=" + Shape_Prototype.id].GefaelleDefinition.HoeheUnten <> Shape_Prototype.GefaelleDefinition.HoeheUnten]]></EXP>
+											<EXP><![CDATA[$=$Contains(Parent_Shape.links, "cp2;" + Kreisel)]]></EXP>
 										</VALUECONDITION>
 										<REMOVE_ADD Id="RDK:1442648" ListRef="KreiselList" Value="$=$Kreisel">
 											<EXP />
@@ -5768,13 +5729,16 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<EXIT_PROCESS Id="RDK:1442654" BreakType="2" ExitStatus="0" />
 									</GROUP>
 								</GROUP>
-								<GROUP Id="RDK:1293979" Name="If NOT Kreisel" SubType="Generic">
+								<GROUP Id="RDK:1293979" Name="If NOT Kreisel / Eckrad" SubType="Generic">
 									<VALUECONDITION Value="false">
 										<EXP><![CDATA[$=$ShapeList["id=" + Kreisel].family = "Kreisel"]]></EXP>
 									</VALUECONDITION>
 									<VALUECONDITION Value="false">
 										<EXP><![CDATA[$=$Contains(RemovedKreiselList, Kreisel)]]></EXP>
 									</VALUECONDITION>
+									<VALUECONDITION Value="false">
+										<EXP><![CDATA[$=$ShapeList["id=" + Kreisel].family = "Eckrad"]]></EXP>
+									</VALUECONDITION>
 									<REMOVE_ADD Id="RDK:1293997" ListRef="KreiselList" Value="$=$Kreisel">
 										<EXP />
 									</REMOVE_ADD>
@@ -5789,7 +5753,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 											<EXP><![CDATA[$=$ShapeList["id=" + Kreisel].family = "Gefaellestrecke"]]></EXP>
 										</VALUECONDITION>
 										<VALUECONDITION Value="false">
-											<EXP><![CDATA[$=$Kreisel = Shape_Prototype.id]]></EXP>
+											<EXP><![CDATA[$=$Kreisel = Parent_Id]]></EXP>
 										</VALUECONDITION>
 										<VALUECONDITION Value="false">
 											<EXP><![CDATA[$=$Contains(RemovedGefaellestreckeList, Kreisel)]]></EXP>
@@ -5811,7 +5775,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<EXP><![CDATA[$=$Contains(RemovedKreiselList, Kreisel)]]></EXP>
 									</VALUECONDITION>
 									<VALUECONDITION Value="false">
-										<EXP><![CDATA[$=$Kreisel = Shape_Prototype.id]]></EXP>
+										<EXP><![CDATA[$=$Kreisel = Parent_Id]]></EXP>
 									</VALUECONDITION>
 									<LIST_ADD Id="RDK:1280583" ListRef="Param.Result">
 										<PAR Name="VALUE_TO_ADD">
@@ -5835,15 +5799,15 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									<PAR Name="ExitCondExp">
 										<EXP><![CDATA[$V$]]></EXP>
 									</PAR>
-									<GROUP Id="RDK:1280595" Name="Only for Kreisel" SubType="Generic">
+									<GROUP Id="RDK:1280595" Name="Only for Kreisel / Eckrad" SubType="Generic">
 										<VALUECONDITION Value="true">
-											<EXP><![CDATA[$=$ShapeList["id=" + TempLink].family = "Kreisel"]]></EXP>
+											<EXP><![CDATA[$=$ShapeList["id=" + TempLink].family = "Kreisel" or ShapeList["id=" + TempLink].family = "Eckrad"]]></EXP>
 										</VALUECONDITION>
 										<VALUECONDITION Value="false">
 											<EXP><![CDATA[$=$Contains(Param.Result, TempLink)]]></EXP>
 										</VALUECONDITION>
 										<VALUECONDITION Value="false">
-											<EXP><![CDATA[$=$TempLink = Shape_Prototype.id]]></EXP>
+											<EXP><![CDATA[$=$TempLink = Parent_Id]]></EXP>
 										</VALUECONDITION>
 										<LIST_ADD Id="RDK:1280571" ListRef="Param.Result">
 											<PAR Name="VALUE_TO_ADD">
@@ -5877,7 +5841,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 											<EXP><![CDATA[$=$ShapeList["id=" + TempLink].family = "Gefaellestrecke"]]></EXP>
 										</VALUECONDITION>
 										<VALUECONDITION Value="false">
-											<EXP><![CDATA[$=$TempLink = Shape_Prototype.id]]></EXP>
+											<EXP><![CDATA[$=$TempLink = Parent_Id]]></EXP>
 										</VALUECONDITION>
 										<VALUECONDITION Value="false">
 											<EXP><![CDATA[$=$Contains(RemovedGefaellestreckeList, TempLink)]]></EXP>
@@ -6219,6 +6183,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 								<PAR Name="BTMTEntladungDefinition" />
 								<PAR Name="FoerdererDefinition" />
 								<PAR Name="StreckeDefinition" />
+								<PAR Name="isDefined" />
 							</SET_STRUCT>
 						</FOREACHLOOP>
 					</FUNCTION>
@@ -9471,28 +9436,52 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 					</FOREACHLOOP>
 				</FUNCTION>
 			</GROUP>
-			<FUNCTION Id="RDK:1332780" Name="InheritHeight" DesignTimeNotes="20231005 -1-" InputTypeName="InheritHeightType">
+			<FUNCTION Id="RDK:1332780" Name="InheritHeight" DesignTimeNotes="20231005 -1-" InputTypeName="string">
+				<COMMENTS Id="RDK:20494467" DesignTimeRemark="Bekommt als Parameter ParentId (ID zum Shape, dessen Höhe an alle anderen (direkt und über weitere Kreisel) angebundenen Shapes vererbt werden soll (Param.Input[0])" DesignTimeTip="ParentId bzw. Item0 ist das Objekt, dessen Höhe weitergegeben wird." />
 				<GROUP Id="RDK:1219232" Name="Inherit height" SubType="Generic" DesignTimeNotes="20230928 -1-">
 					<VALUECONDITION Value="false">
-						<EXP><![CDATA[$=$Count(ShapeList[Param.Input.ParentIndex].links) = 0]]></EXP>
+						<EXP><![CDATA[$=$Count(ShapeList["id="+Param.Input].links) = 0]]></EXP>
 					</VALUECONDITION>
 					<GROUP Id="RDK:1143994" Name="Local Vars" SubType="VarSet" IncludeDate="0" DesignTimeNotes="20230928 -1-">
 						<VAR Id="RDK:1528242" Name="parent_links" Type="string[]">
-							<SET Id="RDK:19945395" VarRef="Me">
-								<EXP><![CDATA[$=$ShapeList[Param.Input.ParentIndex].links]]></EXP>
+							<SET Id="RDK:19945395" VarRef="Me" DesignTimeRemark="Hole alle verbundenen Items (links) des ParentItems (ParentId = Param.Input)">
+								<EXP><![CDATA[$=$ShapeList["id="+Param.Input].links ]]></EXP>
 								<PAR Name="AdvancedOptions" />
 							</SET>
 						</VAR>
-						<VAR Id="RDK:19942027" Name="TempKreisel" Type="string" />
+						<VAR Id="RDK:20494466" Name="parentHeight" Type="double" />
+						<VAR Id="RDK:20497858" Name="TempKreisel" Type="string" />
 						<VAR Id="RDK:19795588" Name="TempKreiselLink" Type="string" />
 						<VAR Id="RDK:19866065" Name="KreiselGroupList" Type="string[]" DesignTimeNotes="20230928 -1-" />
 					</GROUP>
-					<CALLFUNCTION Id="RDK:1280616">
+					<COMMENTS Id="RDK:20497856" DesignTimeRemark="ParentHeight als Höhe des Parent Objekts (muss Kreisel oder Eckrad sein)" DesignTimeTip="ParentId bzw. Item0 ist das Objekt, dessen Höhe weitergegeben wird." />
+					<SELECTCASE Id="RDK:20607516">
+						<EXP><![CDATA[$=$ShapeList["id="+Param.Input].family]]></EXP>
+						<CASEGROUP Id="RDK:20607517" CaseType="0">
+							<EXP><![CDATA[$C$Kreisel]]></EXP>
+							<SET Id="RDK:20497886" VarRef="parentHeight">
+								<EXP><![CDATA[$=$ShapeList["id="+Param.Input].KreiselDefinition.Hoehe]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+						</CASEGROUP>
+						<CASEGROUP Id="RDK:20607520" CaseType="0">
+							<EXP><![CDATA[$C$Eckrad]]></EXP>
+							<SET Id="RDK:20607522" VarRef="parentHeight">
+								<EXP><![CDATA[$=$ShapeList["id="+Param.Input].EckradDefinition.Hoehe]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+						</CASEGROUP>
+						<CASEGROUP Id="RDK:20607518" CaseType="1">
+							<EXP />
+							<EXIT_PROCESS Id="RDK:20683219" DesignTimeRemark="Es wird die Höhe nur von zusammenhängenden Kreiseln oder Eckrädern vererbt. Von allen anderen Elementen nicht." ExitStatus="0" />
+						</CASEGROUP>
+					</SELECTCASE>
+					<CALLFUNCTION Id="RDK:1280616" DesignTimeTip="old input value: ExecOnValues(parent_links, &quot;StrAfter(Me, &quot;&quot;;&quot;&quot;)&quot;, &quot;&quot;)">
 						<PAR Name="FuncName">
 							<EXP><![CDATA[$C$CollectKreiselGroup]]></EXP>
 						</PAR>
 						<PAR Name="InputExp">
-							<EXP><![CDATA[$=$ExecOnValues(parent_links, "StrAfter(Me, "";"")", "")]]></EXP>
+							<EXP><![CDATA[$=$Param.Input]]></EXP>
 						</PAR>
 						<PAR Name="ResultRef">
 							<EXP><![CDATA[$V$KreiselGroupList]]></EXP>
@@ -9511,6 +9500,10 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 								<VAR Id="RDK:19787415" Name="UebergabeListe" Type="SSGParameter[]" />
 								<VAR Id="RDK:19790136" Name="shape_item" Type="Editor2DShapeType" />
 							</GROUP>
+							<SET Id="RDK:20623826" VarRef="UebergabeListe">
+								<EXP><![CDATA[$C$NOTHING]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
 							<SET_STRUCT Id="RDK:19795624" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
 								<PAR Name="Key">
 									<EXP><![CDATA[$C$ShapeId]]></EXP>
@@ -9528,7 +9521,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 								</PAR>
 								<PAR Name="Str" />
 								<PAR Name="Dbl">
-									<EXP><![CDATA[$=$Param.Input.NewHoehe]]></EXP>
+									<EXP><![CDATA[$=$parentHeight]]></EXP>
 								</PAR>
 								<PAR Name="Int" />
 								<PAR Name="Boo" />
@@ -9582,6 +9575,10 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									<EXP><![CDATA[$=$ShapeList["id=" + StrAfter(TempKreiselLink, ";")]]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
+								<SET Id="RDK:20563558" VarRef="UebergabeListe">
+									<EXP><![CDATA[$C$NOTHING]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
 								<IFTHENELSE Id="RDK:19795600">
 									<VALUECONDITION Value="true" Oper="OR">
 										<EXP><![CDATA[$=$shape_item.family = "Gefaellestrecke"]]></EXP>
@@ -9669,11 +9666,15 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 								<EXP><![CDATA[$=$ShapeList["id=" + StrAfter(Link, ";")]]]></EXP>
 								<PAR Name="AdvancedOptions" />
 							</SET>
+							<SET Id="RDK:20573688" VarRef="UebergabeListe">
+								<EXP><![CDATA[$C$NOTHING]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
 							<IFTHENELSE Id="RDK:19841630">
 								<VALUECONDITION Value="true" Oper="OR">
 									<EXP><![CDATA[$=$shape_item.family = "Gefaellestrecke"]]></EXP>
 								</VALUECONDITION>
-								<VALUECONDITION Value="true">
+								<VALUECONDITION Value="true" Oper="OR">
 									<EXP><![CDATA[$=$shape_item.family = "Foerderer"]]></EXP>
 								</VALUECONDITION>
 								<GROUP Id="RDK:19841629" SubType="Then">
@@ -9682,7 +9683,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 											<EXP><![CDATA[$C$shapeId_0]]></EXP>
 										</PAR>
 										<PAR Name="Str">
-											<EXP><![CDATA[$=$ShapeList[Param.Input.ParentIndex].id]]></EXP>
+											<EXP><![CDATA[$=$Param.Input]]></EXP>
 										</PAR>
 										<PAR Name="Dbl" />
 										<PAR Name="Int" />
@@ -9967,23 +9968,12 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 								<VALUECONDITION Value="false">
 									<EXP><![CDATA[$=$IndexOf(ShapeList, Shape_Prototype) = -1]]></EXP>
 								</VALUECONDITION>
-								<SET_STRUCT Id="RDK:1345491" VarRef="InheritHeightData" ClearAll="True" DesignTimeNotes="Results in -1:&#xD;&#xA;IndexOfByFieldValue(ShapeList, &quot;id&quot;, Shape_Prototype.id)&#xD;&#xA;But element is in list">
-									<PAR Name="ParentIndex">
-										<EXP><![CDATA[$=$IndexOf(ShapeList, Shape_Prototype)]]></EXP>
-									</PAR>
-									<PAR Name="NewHoehe">
-										<EXP><![CDATA[$=$Shape_Prototype.KreiselDefinition.Hoehe]]></EXP>
-									</PAR>
-									<PAR Name="NewHoeheOben" />
-									<PAR Name="NewHoeheUnten" />
-									<PAR Name="Text" />
-								</SET_STRUCT>
 								<CALLFUNCTION Id="RDK:1332781" DesignTimeNotes="20231005 -1-">
 									<PAR Name="FuncName">
 										<EXP><![CDATA[$C$InheritHeight]]></EXP>
 									</PAR>
 									<PAR Name="InputExp">
-										<EXP><![CDATA[$=$InheritHeightData]]></EXP>
+										<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
 									</PAR>
 									<PAR Name="ResultRef">
 										<EXP><![CDATA[$V$]]></EXP>
@@ -10000,15 +9990,6 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									<EXP><![CDATA[$=$FieldAffected="AbstandMS"]]></EXP>
 								</VALUECONDITION>
 								<EXEC_ON_VALUES Id="RDK:812296" VarRef="Shape_Prototype.KreiselDefinition.M_Strecke">
-									<PAR Name="id" />
-									<PAR Name="x_M" />
-									<PAR Name="x_S" />
-									<PAR Name="x" />
-									<PAR Name="y" />
-									<PAR Name="z" />
-									<PAR Name="direction" />
-									<PAR Name="linkClass" />
-									<PAR Name="label" />
 									<PAR Name="aktiv">
 										<EXP><![CDATA[$=$IIF(me.x_M<=(Shape_Prototype.KreiselDefinition.AbstandMS-Shape_Prototype.KreiselDefinition.d_min),TRUE,FALSE)]]></EXP>
 									</PAR>
@@ -11361,6 +11342,23 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									</GROUP>
 								</IFTHENELSE>
 							</GROUP>
+							<GROUP Id="RDK:20612257" Name="Eckrad exists" SubType="Generic" DesignTimeNotes="Inherit height to direct Shaps and set others to Gelb (except Kreisel Groups).&#xD;&#xA;&#xD;&#xA;ShapeList[&quot;id=&quot; + Shape_Prototype.id].KreiselDefinition.Hoehe is not working here (returns empty or wrong value).&#xD;&#xA;Because of this use TempIndex instead.">
+								<VALUECONDITION Value="false">
+									<EXP><![CDATA[$=$IndexOf(ShapeList, Shape_Prototype) = -1]]></EXP>
+								</VALUECONDITION>
+								<CALLFUNCTION Id="RDK:20612256" DesignTimeNotes="20231005 -1-">
+									<PAR Name="FuncName">
+										<EXP><![CDATA[$C$InheritHeight]]></EXP>
+									</PAR>
+									<PAR Name="InputExp">
+										<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
+									</PAR>
+									<PAR Name="ResultRef">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+									<PAR Name="Options" />
+								</CALLFUNCTION>
+							</GROUP>
 							<EXIT_PROCESS Id="RDK:1546000" BreakType="3" ExitStatus="0" />
 						</CASEGROUP>
 						<CASEGROUP Id="RDK:1546094" CaseType="0">
@@ -11520,7 +11518,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									<PAR Name="Options" />
 								</CALLFUNCTION>
 							</GROUP>
-							<GROUP Id="RDK:1332808" Name="Gefaellestrecke HoeheOben OR HoeheUnten was changed" SubType="Generic" DesignTimeNotes="20231005 -1-&#xD;&#xA;&#xD;&#xA;Inherit height to direct Shaps and set others to Gelb (except Kreisel Groups).">
+							<GROUP Id="RDK:1332808" Name="Gefaellestrecke HoeheOben OR HoeheUnten was changed" SubType="Generic" Suppressed="True" DesignTimeNotes="20231005 -1-&#xD;&#xA;&#xD;&#xA;Inherit height to direct Shaps and set others to Gelb (except Kreisel Groups).">
 								<VALUECONDITION Value="true" Oper="OR">
 									<EXP><![CDATA[$=$ShapeList["id=" + Shape_Prototype.id].GefaelleDefinition.HoeheOben <> Shape_Prototype.GefaelleDefinition.HoeheOben]]></EXP>
 								</VALUECONDITION>
@@ -11673,7 +11671,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									<PAR Name="Options" />
 								</CALLFUNCTION>
 							</GROUP>
-							<GROUP Id="RDK:18732404" Name="Strecke HoeheOben OR HoeheUnten was changed" SubType="Generic" DesignTimeNotes="20231005 -1-&#xD;&#xA;&#xD;&#xA;Inherit height to direct Shaps and set others to Gelb (except Kreisel Groups).">
+							<GROUP Id="RDK:18732404" Name="Strecke HoeheOben OR HoeheUnten was changed" SubType="Generic" Suppressed="True" DesignTimeNotes="20231005 -1-&#xD;&#xA;&#xD;&#xA;Inherit height to direct Shaps and set others to Gelb (except Kreisel Groups).">
 								<VALUECONDITION Value="true" Oper="OR">
 									<EXP><![CDATA[$=$ShapeList["id=" + Shape_Prototype.id].StreckeDefinition.HoeheOben <> Shape_Prototype.StreckeDefinition.HoeheOben]]></EXP>
 								</VALUECONDITION>
@@ -11891,7 +11889,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									</GROUP>
 								</IFTHENELSE>
 							</GROUP>
-							<GROUP Id="RDK:18116642" Name="Gefaellestrecke HoeheOben OR HoeheUnten was changed" SubType="Generic" DesignTimeNotes="20231005 -1-&#xD;&#xA;&#xD;&#xA;Inherit height to direct Shaps and set others to Gelb (except Kreisel Groups).">
+							<GROUP Id="RDK:18116642" Name="Gefaellestrecke HoeheOben OR HoeheUnten was changed" SubType="Generic" Suppressed="True" DesignTimeNotes="20231005 -1-&#xD;&#xA;&#xD;&#xA;Inherit height to direct Shaps and set others to Gelb (except Kreisel Groups).">
 								<VALUECONDITION Value="true" Oper="OR">
 									<EXP><![CDATA[$=$ShapeList["id=" + Shape_Prototype.id].FoerdererDefinition.H_1 <> Shape_Prototype.FoerdererDefinition.H_1]]></EXP>
 								</VALUECONDITION>
@@ -13057,6 +13055,18 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 							<EXP><![CDATA[$=$Shape_Prototype.name]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
+						<CALLFUNCTION Id="RDK:20670302">
+							<PAR Name="FuncName">
+								<EXP><![CDATA[$C$CreatePrototype_Gefaellestrecke]]></EXP>
+							</PAR>
+							<PAR Name="InputExp">
+								<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
+							</PAR>
+							<PAR Name="ResultRef">
+								<EXP><![CDATA[$V$]]></EXP>
+							</PAR>
+							<PAR Name="Options" />
+						</CALLFUNCTION>
 						<GROUP Id="RDK:837502" Name="UI" SubType="Generic">
 							<VALUECONDITION Value="true">
 								<EXP><![CDATA[$=$Param.Input[0].class<>"OnPasted"]]></EXP>
@@ -13228,6 +13238,18 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 							<EXP><![CDATA[$=$Shape_Prototype.name]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
+						<CALLFUNCTION Id="RDK:20670304">
+							<PAR Name="FuncName">
+								<EXP><![CDATA[$C$CreatePrototype_Foerderer]]></EXP>
+							</PAR>
+							<PAR Name="InputExp">
+								<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
+							</PAR>
+							<PAR Name="ResultRef">
+								<EXP><![CDATA[$V$]]></EXP>
+							</PAR>
+							<PAR Name="Options" />
+						</CALLFUNCTION>
 						<GROUP Id="RDK:18116663" Name="UI" SubType="Generic">
 							<VALUECONDITION Value="true">
 								<EXP><![CDATA[$=$Param.Input[0].class<>"OnPasted"]]></EXP>
@@ -14293,10 +14315,38 @@ me.x
 						<EXP><![CDATA[$C$ShapeList["id="+ID].family]]></EXP>
 						<CASEGROUP Id="RDK:1690660" CaseType="0">
 							<EXP><![CDATA[$C$Kreisel]]></EXP>
+							<CALLFUNCTION Id="RDK:1667887" Suppressed="True">
+								<PAR Name="FuncName">
+									<EXP><![CDATA[$C$CreatePrototype_Kreisel]]></EXP>
+								</PAR>
+								<PAR Name="InputExp">
+									<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
+								</PAR>
+								<PAR Name="ResultRef">
+									<EXP><![CDATA[$V$]]></EXP>
+								</PAR>
+								<PAR Name="Options" />
+							</CALLFUNCTION>
+							<SET Id="RDK:1691232" VarRef="ShapeList[&quot;id=&quot;+ID].KreiselDefinition.Beschreibung" Suppressed="True">
+								<EXP><![CDATA[$=$Shape_Prototype.family+" :"+Shape_Prototype.IDCounter]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
 						</CASEGROUP>
 						<CASEGROUP Id="RDK:1691228" CaseType="0">
 							<EXP><![CDATA[$C$Gefaellestrecke]]></EXP>
-							<SET Id="RDK:1691232" VarRef="ShapeList[&quot;id=&quot;+ID].KreiselDefinition.Beschreibung">
+							<CALLFUNCTION Id="RDK:20657449">
+								<PAR Name="FuncName">
+									<EXP><![CDATA[$C$CreatePrototype_Gefaellestrecke]]></EXP>
+								</PAR>
+								<PAR Name="InputExp">
+									<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
+								</PAR>
+								<PAR Name="ResultRef">
+									<EXP><![CDATA[$V$]]></EXP>
+								</PAR>
+								<PAR Name="Options" />
+							</CALLFUNCTION>
+							<SET Id="RDK:20657451" VarRef="ShapeList[&quot;id=&quot;+ID].GefaellestreckeDefinition.Beschreibung">
 								<EXP><![CDATA[$=$Shape_Prototype.family+" :"+Shape_Prototype.IDCounter]]></EXP>
 								<PAR Name="AdvancedOptions" />
 							</SET>
@@ -14306,18 +14356,6 @@ me.x
 							<COMMENTS Id="RDK:1692364" DesignTimeRemark="ShapeList[&quot;id=&quot;+ID].family" DesignTimeTip="test" />
 						</CASEGROUP>
 					</SELECTCASE>
-					<CALLFUNCTION Id="RDK:1667887">
-						<PAR Name="FuncName">
-							<EXP><![CDATA[$C$CreatePrototype_Kreisel]]></EXP>
-						</PAR>
-						<PAR Name="InputExp">
-							<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
-						</PAR>
-						<PAR Name="ResultRef">
-							<EXP><![CDATA[$V$]]></EXP>
-						</PAR>
-						<PAR Name="Options" />
-					</CALLFUNCTION>
 					<CALLFUNCTION Id="RDK:1668452">
 						<PAR Name="FuncName">
 							<EXP><![CDATA[$C$Create/Update Shape]]></EXP>
@@ -14358,6 +14396,7 @@ me.x
 					<VAR Id="RDK:18399128" Name="shape_id" Type="string" />
 					<VAR Id="RDK:19089175" Name="item_1" Type="Editor2DShapeType" />
 					<VAR Id="RDK:19474689" Name="LH_fits" Type="boolean" />
+					<VAR Id="RDK:20494435" Name="InheritHeight_Data" Type="string[]" />
 				</GROUP>
 				<SET Id="RDK:1578954" VarRef="Shape_Prototype">
 					<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID]]]></EXP>
@@ -14389,35 +14428,52 @@ me.x
 					<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family]]></EXP>
 					<CASEGROUP Id="RDK:1576707" CaseType="0">
 						<EXP><![CDATA[$C$Kreisel]]></EXP>
-						<COMMENTS Id="RDK:19602905" Suppressed="True" DesignTimeRemark="InheritHeight wird hier nicht benötigt; Höhe wird durch Funktion SetHeightOnConnect gesetzt" />
-						<SET_STRUCT Id="RDK:19937317" VarRef="InheritHeightData" ClearAll="True" DesignTimeNotes="Results in -1:&#xD;&#xA;IndexOfByFieldValue(ShapeList, &quot;id&quot;, Shape_Prototype.id)&#xD;&#xA;But element is in list">
-							<PAR Name="ParentIndex">
-								<EXP><![CDATA[$=$IndexOf(ShapeList, ShapeList["id="+Param.Input[1].shapeID])]]></EXP>
-							</PAR>
-							<PAR Name="NewHoehe">
-								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].KreiselDefinition.Hoehe]]></EXP>
-							</PAR>
-							<PAR Name="NewHoeheOben" />
-							<PAR Name="NewHoeheUnten" />
-							<PAR Name="Text" />
-						</SET_STRUCT>
-						<CALLFUNCTION Id="RDK:19927916" DesignTimeNotes="20231005 -1-">
-							<PAR Name="FuncName">
-								<EXP><![CDATA[$C$InheritHeight]]></EXP>
-							</PAR>
-							<PAR Name="InputExp">
-								<EXP><![CDATA[$=$InheritHeightData]]></EXP>
-							</PAR>
-							<PAR Name="ResultRef">
-								<EXP><![CDATA[$V$]]></EXP>
-							</PAR>
-							<PAR Name="Options" />
-						</CALLFUNCTION>
+						<IFTHENELSE Id="RDK:20683220">
+							<VALUECONDITION Value="true" Oper="OR">
+								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family = "Kreisel"]]></EXP>
+							</VALUECONDITION>
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family = "Eckrad"]]></EXP>
+							</VALUECONDITION>
+							<GROUP Id="RDK:20683221" SubType="Then">
+								<CALLFUNCTION Id="RDK:19927916" DesignTimeNotes="20231005 -1-">
+									<PAR Name="FuncName">
+										<EXP><![CDATA[$C$InheritHeight]]></EXP>
+									</PAR>
+									<PAR Name="InputExp">
+										<EXP><![CDATA[$=$Param.Input[1].shapeID]]></EXP>
+									</PAR>
+									<PAR Name="ResultRef">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+									<PAR Name="Options" />
+								</CALLFUNCTION>
+							</GROUP>
+							<GROUP Id="RDK:20683222" SubType="Else">
+								<CALLFUNCTION Id="RDK:20683231">
+									<PAR Name="FuncName">
+										<EXP><![CDATA[$C$SetHeightOnConnect]]></EXP>
+									</PAR>
+									<PAR Name="InputExp">
+										<EXP><![CDATA[$=$UebergabeListe]]></EXP>
+									</PAR>
+									<PAR Name="ResultRef">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+									<PAR Name="Options" />
+								</CALLFUNCTION>
+							</GROUP>
+						</IFTHENELSE>
 						<GROUP Id="RDK:304141" Name="Kreisel Operations" SubType="Generic" DesignTimeNotes="ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].family=&quot;Kreisel&quot;&#xD;&#xA;ShapeList[&quot;id=&quot;+Param.Input[1].shapeID].family=&quot;Kreisel&quot;">
 							<VALUECONDITION Value="true">
 								<EXP><![CDATA[$=$(ShapeList["id="+Param.Input[0].shapeID].Rotationsklasse="Rotationsobjekt")  Or 
 (ShapeList["id="+Param.Input[1].shapeID].Rotationsklasse="Rotationsobjekt")]]></EXP>
 							</VALUECONDITION>
+							<COMMENTS Id="RDK:20502617" DesignTimeRemark="Aktualisiere Shape_Prototype (Element, das an das Parent Element verbunden wurde) für nachfolgende Inherit Rotation" />
+							<SET Id="RDK:20539885" VarRef="Shape_Prototype">
+								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID]]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
 							<GROUP Id="RDK:132804" Name="Ihnerit rotation" SubType="Generic">
 								<SET Id="RDK:514767" VarRef="OriginalRatation">
 									<EXP><![CDATA[$=$Shape_Prototype.KreiselDefinition.Drehung]]></EXP>
@@ -14562,104 +14618,6 @@ me.x
 								</CALLFUNCTION>
 							</GROUP>
 						</GROUP>
-						<GROUP Id="RDK:1002232" Name="InheritHeight" SubType="Generic">
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$Count(ListDiff(NewListStr("Gefaellestrecke", "Kreisel"),NewListStr(ShapeList["id="+Param.Input[0].shapeID].family, ShapeList["id="+Param.Input[1].shapeID].family)))=0]]></EXP>
-							</VALUECONDITION>
-							<IFTHENELSE Id="RDK:1003282">
-								<VALUECONDITION Value="true">
-									<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family="Kreisel"]]></EXP>
-								</VALUECONDITION>
-								<GROUP Id="RDK:1003283" SubType="Then">
-									<SET Id="RDK:1003270" VarRef="Shape_Kreisel">
-										<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID]]]></EXP>
-										<PAR Name="AdvancedOptions" />
-									</SET>
-									<SET Id="RDK:1003296" VarRef="Shape_Gefaellestrecke">
-										<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID]]]></EXP>
-										<PAR Name="AdvancedOptions" />
-									</SET>
-								</GROUP>
-								<GROUP Id="RDK:1003284" SubType="Else">
-									<SET Id="RDK:1003298" VarRef="Shape_Kreisel">
-										<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID]]]></EXP>
-										<PAR Name="AdvancedOptions" />
-									</SET>
-									<SET Id="RDK:1003300" VarRef="Shape_Gefaellestrecke">
-										<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID]]]></EXP>
-										<PAR Name="AdvancedOptions" />
-									</SET>
-								</GROUP>
-							</IFTHENELSE>
-							<COMMENTS Id="RDK:1158774" DesignTimeRemark="Annahme cp1: Gefällestrecke Connection Point (graphisch) oben" DesignTimeNotes="20230928 -1-" />
-							<COMMENTS Id="RDK:1158776" DesignTimeRemark="Annahme cp2: Gefällestrecke Connection Point (graphisch) unten" DesignTimeNotes="20230928 -1-" />
-							<GROUP Id="RDK:1163027" Name="To Gefällestrecke cp1 (top point)" SubType="Generic" DesignTimeNotes="20230928 -1-">
-								<VALUECONDITION Value="true" Oper="OR">
-									<EXP><![CDATA[$=$Param.Input[0].connectionPointID = "cp1" AND Param.Input[0].shapeID = Shape_Gefaellestrecke.id]]></EXP>
-								</VALUECONDITION>
-								<VALUECONDITION Value="true">
-									<EXP><![CDATA[$=$Param.Input[1].connectionPointID = "cp1" AND Param.Input[1].shapeID = Shape_Gefaellestrecke.id]]></EXP>
-								</VALUECONDITION>
-								<SET Id="RDK:1158798" VarRef="ShapeList[&quot;id=&quot;+Shape_Gefaellestrecke.id].GefaelleDefinition.HoeheOben">
-									<EXP><![CDATA[$=$Shape_Kreisel.KreiselDefinition.Hoehe]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</GROUP>
-							<GROUP Id="RDK:1163049" Name="To Gefällestrecke cp2 (bottom point)" SubType="Generic" DesignTimeNotes="20230928 -1-">
-								<VALUECONDITION Value="true" Oper="OR">
-									<EXP><![CDATA[$=$Param.Input[0].connectionPointID = "cp2" AND Param.Input[0].shapeID = Shape_Gefaellestrecke.id]]></EXP>
-								</VALUECONDITION>
-								<VALUECONDITION Value="true">
-									<EXP><![CDATA[$=$Param.Input[1].connectionPointID = "cp2" AND Param.Input[1].shapeID = Shape_Gefaellestrecke.id]]></EXP>
-								</VALUECONDITION>
-								<SET Id="RDK:1158803" VarRef="ShapeList[&quot;id=&quot;+Shape_Gefaellestrecke.id].GefaelleDefinition.HoeheUnten">
-									<EXP><![CDATA[$=$Shape_Kreisel.KreiselDefinition.Hoehe]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</GROUP>
-							<COMMENTS Id="RDK:1155597" DesignTimeRemark="Hier wird immer zuerst die Höhe oben gesetzt egal welcher der Punkte zum verbinden genommen wird. Ok?" DesignTimeNotes="20230928 -1-" />
-							<IFTHENELSE Id="RDK:1004841" Suppressed="True" DesignTimeNotes="20230928 -1-&#xD;&#xA;suppressed">
-								<VALUECONDITION Value="true">
-									<EXP><![CDATA[$=$ShapeList["id="+Shape_Gefaellestrecke.id].GefaelleDefinition.HoeheOben=""]]></EXP>
-								</VALUECONDITION>
-								<GROUP Id="RDK:1004842" SubType="Then">
-									<SET Id="RDK:1003301" VarRef="ShapeList[&quot;id=&quot;+Shape_Gefaellestrecke.id].GefaelleDefinition.HoeheOben">
-										<EXP><![CDATA[$=$Shape_Kreisel.KreiselDefinition.Hoehe]]></EXP>
-										<PAR Name="AdvancedOptions" />
-									</SET>
-								</GROUP>
-								<GROUP Id="RDK:1004843" SubType="Else">
-									<SET Id="RDK:1004849" VarRef="ShapeList[&quot;id=&quot;+Shape_Gefaellestrecke.id].GefaelleDefinition.HoeheUnten">
-										<EXP><![CDATA[$=$Shape_Kreisel.KreiselDefinition.Hoehe]]></EXP>
-										<PAR Name="AdvancedOptions" />
-									</SET>
-								</GROUP>
-							</IFTHENELSE>
-						</GROUP>
-						<CALLFUNCTION Id="RDK:1698068" Suppressed="True">
-							<PAR Name="FuncName">
-								<EXP><![CDATA[$C$SetHeightOnConnect]]></EXP>
-							</PAR>
-							<PAR Name="InputExp">
-								<EXP><![CDATA[$=$UebergabeListe]]></EXP>
-							</PAR>
-							<PAR Name="ResultRef">
-								<EXP><![CDATA[$V$]]></EXP>
-							</PAR>
-							<PAR Name="Options" />
-						</CALLFUNCTION>
-						<CALLFUNCTION Id="RDK:19474698" Suppressed="True">
-							<PAR Name="FuncName">
-								<EXP><![CDATA[$C$SetStatus_Ok]]></EXP>
-							</PAR>
-							<PAR Name="InputExp">
-								<EXP><![CDATA[$=$Param.Input[0].shapeID]]></EXP>
-							</PAR>
-							<PAR Name="ResultRef">
-								<EXP><![CDATA[$V$]]></EXP>
-							</PAR>
-							<PAR Name="Options" />
-						</CALLFUNCTION>
 					</CASEGROUP>
 					<CASEGROUP Id="RDK:1576710" CaseType="0">
 						<EXP><![CDATA[$C$Eckrad]]></EXP>
@@ -14667,141 +14625,167 @@ me.x
 							<EXP><![CDATA[$=$Shape_Prototype.EckradDefinition.Drehung]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
-						<SELECTCASE Id="RDK:1578960">
-							<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family]]></EXP>
-							<CASEGROUP Id="RDK:1578962" CaseType="0">
-								<EXP><![CDATA[$C$Kreisel]]></EXP>
-								<SET Id="RDK:1578958" VarRef="Shape_Prototype.EckradDefinition.Drehung">
-									<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].KreiselDefinition.Drehung*(-1)]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</CASEGROUP>
-							<CASEGROUP Id="RDK:1578964" CaseType="0">
-								<EXP><![CDATA[$C$Eckrad]]></EXP>
-								<SET Id="RDK:1578966" VarRef="Shape_Prototype.EckradDefinition.Drehung">
-									<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].EckradDefinition.Drehung*(-1)]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</CASEGROUP>
-						</SELECTCASE>
-						<GROUP Id="RDK:1578972" Name="Group" SubType="Generic">
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$Shape_Prototype.rotation=""]]></EXP>
+						<IFTHENELSE Id="RDK:20683251">
+							<VALUECONDITION Value="true" Oper="OR">
+								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family = "Kreisel"]]></EXP>
 							</VALUECONDITION>
-							<SET Id="RDK:1578971" VarRef="Shape_Prototype.rotation">
-								<EXP><![CDATA[$C$0]]></EXP>
-								<PAR Name="AdvancedOptions" />
-							</SET>
-						</GROUP>
-						<CALLFUNCTION Id="RDK:1578976">
-							<PAR Name="FuncName">
-								<EXP><![CDATA[$C$CreatePrototype_Eckrad]]></EXP>
-							</PAR>
-							<PAR Name="InputExp">
-								<EXP><![CDATA[$=$Param.Input[0].shapeID]]></EXP>
-							</PAR>
-							<PAR Name="ResultRef">
-								<EXP><![CDATA[$V$]]></EXP>
-							</PAR>
-							<PAR Name="Options" />
-						</CALLFUNCTION>
-						<CALLFUNCTION Id="RDK:1578978">
-							<PAR Name="FuncName">
-								<EXP><![CDATA[$C$Create/Update Shape]]></EXP>
-							</PAR>
-							<PAR Name="InputExp">
-								<EXP><![CDATA[$=$Param.Input[0].shapeID]]></EXP>
-							</PAR>
-							<PAR Name="ResultRef">
-								<EXP><![CDATA[$V$]]></EXP>
-							</PAR>
-							<PAR Name="Options" />
-						</CALLFUNCTION>
-						<IFTHENELSE Id="RDK:1579006">
 							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$OriginalRatation<>Shape_Prototype.EckradDefinition.Drehung]]></EXP>
+								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family = "Eckrad"]]></EXP>
 							</VALUECONDITION>
-							<GROUP Id="RDK:1579003" SubType="Then">
-								<GROUP Id="RDK:1579001" Name="Find Children" SubType="Generic">
-									<SET Id="RDK:1578995" VarRef="LinkedShapeIDs">
-										<EXP><![CDATA[$C$NOTHING]]></EXP>
-										<PAR Name="AdvancedOptions" />
-									</SET>
-									<FOREACHLOOP Id="RDK:1578999" ItemVarRef="Link">
-										<PAR Name="ArrayValueExp">
-											<EXP><![CDATA[$=$Shape_Prototype.links]]></EXP>
-										</PAR>
-										<PAR Name="ExitCondExp">
-											<EXP><![CDATA[$V$]]></EXP>
-										</PAR>
-										<SET Id="RDK:1578996" VarRef="Link">
-											<EXP><![CDATA[$=$StrAfter(Link, ";")]]></EXP>
-											<PAR Name="AdvancedOptions" />
-										</SET>
-										<GROUP Id="RDK:1578998" Name="Group" SubType="Generic">
-											<VALUECONDITION Value="true">
-												<EXP><![CDATA[$=$Not (Link=Param.Input[1].shapeID)]]></EXP>
-											</VALUECONDITION>
-											<LIST_ADD Id="RDK:1578997" ListRef="LinkedShapeIDs">
-												<PAR Name="VALUE_TO_ADD">
-													<EXP><![CDATA[$=$Link]]></EXP>
-												</PAR>
-												<PAR Name="POS_TO_ADD" />
-											</LIST_ADD>
-										</GROUP>
-									</FOREACHLOOP>
-									<CALLFUNCTION Id="RDK:1579000">
-										<PAR Name="FuncName">
-											<EXP><![CDATA[$C$CollectLinkedShapes]]></EXP>
-										</PAR>
-										<PAR Name="InputExp">
-											<EXP><![CDATA[$=$LinkedShapeIDs]]></EXP>
-										</PAR>
-										<PAR Name="ResultRef">
-											<EXP><![CDATA[$V$]]></EXP>
-										</PAR>
-										<PAR Name="Options" />
-									</CALLFUNCTION>
-								</GROUP>
-								<CALLFUNCTION Id="RDK:1579002">
+							<GROUP Id="RDK:20683248" SubType="Then">
+								<CALLFUNCTION Id="RDK:20683247" DesignTimeNotes="20231005 -1-">
 									<PAR Name="FuncName">
-										<EXP><![CDATA[$C$Inherit Children rotation]]></EXP>
+										<EXP><![CDATA[$C$InheritHeight]]></EXP>
+									</PAR>
+									<PAR Name="InputExp">
+										<EXP><![CDATA[$=$Param.Input[1].shapeID]]></EXP>
 									</PAR>
-									<PAR Name="InputExp" />
 									<PAR Name="ResultRef">
 										<EXP><![CDATA[$V$]]></EXP>
 									</PAR>
 									<PAR Name="Options" />
 								</CALLFUNCTION>
 							</GROUP>
-							<GROUP Id="RDK:1579005" SubType="Else">
-								<COMMENTS Id="RDK:1579004" DesignTimeRemark="No children rotation needed" />
+							<GROUP Id="RDK:20683250" SubType="Else">
+								<CALLFUNCTION Id="RDK:20683249">
+									<PAR Name="FuncName">
+										<EXP><![CDATA[$C$SetHeightOnConnect]]></EXP>
+									</PAR>
+									<PAR Name="InputExp">
+										<EXP><![CDATA[$=$UebergabeListe]]></EXP>
+									</PAR>
+									<PAR Name="ResultRef">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+									<PAR Name="Options" />
+								</CALLFUNCTION>
 							</GROUP>
 						</IFTHENELSE>
-						<CALLFUNCTION Id="RDK:1592919">
-							<PAR Name="FuncName">
-								<EXP><![CDATA[$C$AddWeiche]]></EXP>
-							</PAR>
-							<PAR Name="InputExp">
-								<EXP><![CDATA[$=$Param.Input]]></EXP>
-							</PAR>
-							<PAR Name="ResultRef">
-								<EXP><![CDATA[$V$]]></EXP>
-							</PAR>
-							<PAR Name="Options" />
-						</CALLFUNCTION>
-						<CALLFUNCTION Id="RDK:1701482">
-							<PAR Name="FuncName">
-								<EXP><![CDATA[$C$SetHeightOnConnect]]></EXP>
-							</PAR>
-							<PAR Name="InputExp">
-								<EXP><![CDATA[$=$UebergabeListe]]></EXP>
-							</PAR>
-							<PAR Name="ResultRef">
-								<EXP><![CDATA[$V$]]></EXP>
-							</PAR>
-							<PAR Name="Options" />
-						</CALLFUNCTION>
+						<GROUP Id="RDK:20683267" Name="Eckrad Operations" SubType="Generic">
+							<SELECTCASE Id="RDK:1578960">
+								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family]]></EXP>
+								<CASEGROUP Id="RDK:1578962" CaseType="0">
+									<EXP><![CDATA[$C$Kreisel]]></EXP>
+									<SET Id="RDK:1578958" VarRef="Shape_Prototype.EckradDefinition.Drehung">
+										<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].KreiselDefinition.Drehung*(-1)]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+								</CASEGROUP>
+								<CASEGROUP Id="RDK:1578964" CaseType="0">
+									<EXP><![CDATA[$C$Eckrad]]></EXP>
+									<SET Id="RDK:1578966" VarRef="Shape_Prototype.EckradDefinition.Drehung">
+										<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].EckradDefinition.Drehung*(-1)]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+								</CASEGROUP>
+							</SELECTCASE>
+							<GROUP Id="RDK:1578972" Name="Group" SubType="Generic">
+								<VALUECONDITION Value="true">
+									<EXP><![CDATA[$=$Shape_Prototype.rotation=""]]></EXP>
+								</VALUECONDITION>
+								<SET Id="RDK:1578971" VarRef="Shape_Prototype.rotation">
+									<EXP><![CDATA[$C$0]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</GROUP>
+							<CALLFUNCTION Id="RDK:1578976">
+								<PAR Name="FuncName">
+									<EXP><![CDATA[$C$CreatePrototype_Eckrad]]></EXP>
+								</PAR>
+								<PAR Name="InputExp">
+									<EXP><![CDATA[$=$Param.Input[0].shapeID]]></EXP>
+								</PAR>
+								<PAR Name="ResultRef">
+									<EXP><![CDATA[$V$]]></EXP>
+								</PAR>
+								<PAR Name="Options" />
+							</CALLFUNCTION>
+							<CALLFUNCTION Id="RDK:1578978">
+								<PAR Name="FuncName">
+									<EXP><![CDATA[$C$Create/Update Shape]]></EXP>
+								</PAR>
+								<PAR Name="InputExp">
+									<EXP><![CDATA[$=$Param.Input[0].shapeID]]></EXP>
+								</PAR>
+								<PAR Name="ResultRef">
+									<EXP><![CDATA[$V$]]></EXP>
+								</PAR>
+								<PAR Name="Options" />
+							</CALLFUNCTION>
+							<IFTHENELSE Id="RDK:1579006">
+								<VALUECONDITION Value="true">
+									<EXP><![CDATA[$=$OriginalRatation<>Shape_Prototype.EckradDefinition.Drehung]]></EXP>
+								</VALUECONDITION>
+								<GROUP Id="RDK:1579003" SubType="Then">
+									<GROUP Id="RDK:1579001" Name="Find Children" SubType="Generic">
+										<SET Id="RDK:1578995" VarRef="LinkedShapeIDs">
+											<EXP><![CDATA[$C$NOTHING]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+										<FOREACHLOOP Id="RDK:1578999" ItemVarRef="Link">
+											<PAR Name="ArrayValueExp">
+												<EXP><![CDATA[$=$Shape_Prototype.links]]></EXP>
+											</PAR>
+											<PAR Name="ExitCondExp">
+												<EXP><![CDATA[$V$]]></EXP>
+											</PAR>
+											<SET Id="RDK:1578996" VarRef="Link">
+												<EXP><![CDATA[$=$StrAfter(Link, ";")]]></EXP>
+												<PAR Name="AdvancedOptions" />
+											</SET>
+											<GROUP Id="RDK:1578998" Name="Group" SubType="Generic">
+												<VALUECONDITION Value="true">
+													<EXP><![CDATA[$=$Not (Link=Param.Input[1].shapeID)]]></EXP>
+												</VALUECONDITION>
+												<LIST_ADD Id="RDK:1578997" ListRef="LinkedShapeIDs">
+													<PAR Name="VALUE_TO_ADD">
+														<EXP><![CDATA[$=$Link]]></EXP>
+													</PAR>
+													<PAR Name="POS_TO_ADD" />
+												</LIST_ADD>
+											</GROUP>
+										</FOREACHLOOP>
+										<CALLFUNCTION Id="RDK:1579000">
+											<PAR Name="FuncName">
+												<EXP><![CDATA[$C$CollectLinkedShapes]]></EXP>
+											</PAR>
+											<PAR Name="InputExp">
+												<EXP><![CDATA[$=$LinkedShapeIDs]]></EXP>
+											</PAR>
+											<PAR Name="ResultRef">
+												<EXP><![CDATA[$V$]]></EXP>
+											</PAR>
+											<PAR Name="Options" />
+										</CALLFUNCTION>
+									</GROUP>
+									<CALLFUNCTION Id="RDK:1579002">
+										<PAR Name="FuncName">
+											<EXP><![CDATA[$C$Inherit Children rotation]]></EXP>
+										</PAR>
+										<PAR Name="InputExp" />
+										<PAR Name="ResultRef">
+											<EXP><![CDATA[$V$]]></EXP>
+										</PAR>
+										<PAR Name="Options" />
+									</CALLFUNCTION>
+								</GROUP>
+								<GROUP Id="RDK:1579005" SubType="Else">
+									<COMMENTS Id="RDK:1579004" DesignTimeRemark="No children rotation needed" />
+								</GROUP>
+							</IFTHENELSE>
+							<CALLFUNCTION Id="RDK:1592919">
+								<PAR Name="FuncName">
+									<EXP><![CDATA[$C$AddWeiche]]></EXP>
+								</PAR>
+								<PAR Name="InputExp">
+									<EXP><![CDATA[$=$Param.Input]]></EXP>
+								</PAR>
+								<PAR Name="ResultRef">
+									<EXP><![CDATA[$V$]]></EXP>
+								</PAR>
+								<PAR Name="Options" />
+							</CALLFUNCTION>
+						</GROUP>
 					</CASEGROUP>
 					<CASEGROUP Id="RDK:1606858" CaseType="0">
 						<EXP><![CDATA[$C$Gefaellestrecke]]></EXP>
@@ -14837,6 +14821,18 @@ me.x
 									</PAR>
 									<PAR Name="Options" />
 								</CALLFUNCTION>
+								<CALLFUNCTION Id="RDK:20690134">
+									<PAR Name="FuncName">
+										<EXP><![CDATA[$C$UpdateShape]]></EXP>
+									</PAR>
+									<PAR Name="InputExp">
+										<EXP><![CDATA[$=$Param.Input[0].shapeID]]></EXP>
+									</PAR>
+									<PAR Name="ResultRef">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+									<PAR Name="Options" />
+								</CALLFUNCTION>
 								<CALLFUNCTION Id="RDK:19633575">
 									<PAR Name="FuncName">
 										<EXP><![CDATA[$C$SetStatus]]></EXP>
@@ -14873,32 +14869,6 @@ me.x
 								</CALLFUNCTION>
 							</GROUP>
 						</IFTHENELSE>
-						<GROUP Id="RDK:20540423" Name="Update" SubType="Generic" Bookmarked="True">
-							<CALLFUNCTION Id="RDK:20540427">
-								<PAR Name="FuncName">
-									<EXP><![CDATA[$C$CreatePrototype_Gefaellestrecke]]></EXP>
-								</PAR>
-								<PAR Name="InputExp">
-									<EXP><![CDATA[$=$Param.Input[0].shapeID]]></EXP>
-								</PAR>
-								<PAR Name="ResultRef">
-									<EXP><![CDATA[$V$]]></EXP>
-								</PAR>
-								<PAR Name="Options" />
-							</CALLFUNCTION>
-							<CALLFUNCTION Id="RDK:20540429">
-								<PAR Name="FuncName">
-									<EXP><![CDATA[$C$Create/Update Shape]]></EXP>
-								</PAR>
-								<PAR Name="InputExp">
-									<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
-								</PAR>
-								<PAR Name="ResultRef">
-									<EXP><![CDATA[$V$]]></EXP>
-								</PAR>
-								<PAR Name="Options" />
-							</CALLFUNCTION>
-						</GROUP>
 					</CASEGROUP>
 					<CASEGROUP Id="RDK:18732456" CaseType="0">
 						<EXP><![CDATA[$C$Strecke]]></EXP>
@@ -14963,6 +14933,18 @@ me.x
 									</PAR>
 									<PAR Name="Options" />
 								</CALLFUNCTION>
+								<CALLFUNCTION Id="RDK:20673034" DesignTimeNotes="20231005 -1-">
+									<PAR Name="FuncName">
+										<EXP><![CDATA[$C$InheritHeight]]></EXP>
+									</PAR>
+									<PAR Name="InputExp">
+										<EXP><![CDATA[$=$Param.Input[1].shapeID]]></EXP>
+									</PAR>
+									<PAR Name="ResultRef">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+									<PAR Name="Options" />
+								</CALLFUNCTION>
 								<CALLFUNCTION Id="RDK:18221763">
 									<PAR Name="FuncName">
 										<EXP><![CDATA[$C$SetHeightOnConnect]]></EXP>
@@ -15548,7 +15530,6 @@ me.x
 			</FUNCTION>
 			<FUNCTION Id="RDK:20579036" Name="doPattern" DesignTimeRemark="erzeugt ein Muster dieser Gefällestrecke / Förderers an den verbundenen Kreise(ln)" InputTypeName="string[]">
 				<GROUP Id="RDK:20579050" Name="Local Variables" SubType="VarSet" IncludeDate="0">
-					<VAR Id="RDK:20579045" Name="shapeItem" Type="Editor2DShapeType" />
 					<VAR Id="RDK:20579046" Name="selectedIds" Type="string[]">
 						<SET Id="RDK:20579047" VarRef="me">
 							<EXP><![CDATA[$=$Param.Input]]></EXP>
@@ -15556,7 +15537,6 @@ me.x
 						</SET>
 					</VAR>
 					<VAR Id="RDK:20579049" Name="shapeId" Type="string" />
-					<VAR Id="RDK:20579090" Name="shape_index" Type="string" />
 				</GROUP>
 				<FOREACHLOOP Id="RDK:20579072" ItemVarRef="shapeId">
 					<PAR Name="ArrayValueExp">
@@ -15565,6 +15545,13 @@ me.x
 					<PAR Name="ExitCondExp">
 						<EXP><![CDATA[$V$]]></EXP>
 					</PAR>
+					<GROUP Id="RDK:20689948" Name="Local Variables" SubType="VarSet" IncludeDate="0">
+						<VAR Id="RDK:20689950" Name="shape_index" Type="string" />
+						<VAR Id="RDK:20689944" Name="shapeId_kreisel1" Type="string" />
+						<VAR Id="RDK:20689945" Name="shapeId_kreisel2" Type="string" />
+						<VAR Id="RDK:20689946" Name="shape_kreisel1" Type="Editor2DShapeType" />
+						<VAR Id="RDK:20689947" Name="shape_kreisel2" Type="Editor2DShapeType" />
+					</GROUP>
 					<CALLFUNCTION Id="RDK:20579087">
 						<PAR Name="FuncName">
 							<EXP><![CDATA[$C$IndexOfByFieldValue_SSG]]></EXP>
@@ -15581,6 +15568,25 @@ me.x
 						<EXP><![CDATA[$=$ShapeList["id="+shapeId]]]></EXP>
 						<PAR Name="AdvancedOptions" />
 					</SET>
+					<COMMENTS Id="RDK:20689223" DesignTimeRemark="hole beide angebundenen Kreisel " DesignTimeNotes="Process Name:&#xD;&#xA;MAIN_SSG.rdx&#xD;&#xA;&#xD;&#xA;Process Requires:&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;Author:&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;Creation Date:&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;Functionality:&#xD;&#xA;&#xD;&#xA;Changes:&#xD;&#xA;20231005 -1- \DVR&#xD;&#xA;ERK-47&#xD;&#xA;Höhenänderung Gefällestrecke (Pufferstrecke)&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;20230928 -1- \DVR&#xD;&#xA;ERK-47&#xD;&#xA;Höhenänderung Kreisel" />
+					<SET Id="RDK:20689231" VarRef="shapeId_kreisel1">
+						<EXP><![CDATA[$=$StrAfter(ShapeList[shape_index].links[0], ";")]]></EXP>
+						<PAR Name="AdvancedOptions" />
+					</SET>
+					<SET Id="RDK:20689233" VarRef="shapeId_kreisel2">
+						<EXP><![CDATA[$=$StrAfter(ShapeList[shape_index].links[1], ";")]]></EXP>
+						<PAR Name="AdvancedOptions" />
+					</SET>
+					<SET Id="RDK:20689918" VarRef="shape_kreisel1">
+						<EXP><![CDATA[$=$ShapeList["id=" shapeId_kreisel1]]]></EXP>
+						<PAR Name="AdvancedOptions" />
+					</SET>
+					<SET Id="RDK:20689928" VarRef="shape_kreisel2">
+						<EXP><![CDATA[$=$ShapeList["id=" shapeId_kreisel2]]]></EXP>
+						<PAR Name="AdvancedOptions" />
+					</SET>
+					<COMMENTS Id="RDK:20689952" DesignTimeRemark="daraus die Connection points der Verbindenden Strecke" DesignTimeNotes="Process Name:&#xD;&#xA;MAIN_SSG.rdx&#xD;&#xA;&#xD;&#xA;Process Requires:&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;Author:&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;Creation Date:&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;Functionality:&#xD;&#xA;&#xD;&#xA;Changes:&#xD;&#xA;20231005 -1- \DVR&#xD;&#xA;ERK-47&#xD;&#xA;Höhenänderung Gefällestrecke (Pufferstrecke)&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;20230928 -1- \DVR&#xD;&#xA;ERK-47&#xD;&#xA;Höhenänderung Kreisel" />
+					<COMMENTS Id="RDK:20689954" DesignTimeRemark="Prüfe ob die Distanzen und hole die Connection points die gegenüberliegen" DesignTimeNotes="Process Name:&#xD;&#xA;MAIN_SSG.rdx&#xD;&#xA;&#xD;&#xA;Process Requires:&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;Author:&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;Creation Date:&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;Functionality:&#xD;&#xA;&#xD;&#xA;Changes:&#xD;&#xA;20231005 -1- \DVR&#xD;&#xA;ERK-47&#xD;&#xA;Höhenänderung Gefällestrecke (Pufferstrecke)&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;20230928 -1- \DVR&#xD;&#xA;ERK-47&#xD;&#xA;Höhenänderung Kreisel" />
 					<SELECTCASE Id="RDK:20579308">
 						<EXP><![CDATA[$=$Shape_Prototype.family]]></EXP>
 						<CASEGROUP Id="RDK:20579229" CaseType="0">
@@ -15984,7 +15990,7 @@ me.x
 								<EXP><![CDATA[$C$Strecke]]></EXP>
 								<GROUP Id="RDK:19251777" Name="TeileArt" SubType="Generic">
 									<SET Id="RDK:19251776" VarRef="CSV_Item.TeileArt">
-										<EXP><![CDATA[$=$ToJSON("ILS 2.0 Gefällestrecke")]]></EXP>
+										<EXP><![CDATA[$=$ToJSON("ILS 2.0 Strecke")]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
@@ -17054,20 +17060,17 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<CASEGROUP Id="RDK:19265777" CaseType="0">
 						<EXP><![CDATA[$C$Gefaellestrecke]]></EXP>
 						<IFTHENELSE Id="RDK:19265776">
-							<VALUECONDITION Value="true" Oper="OR">
-								<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[$=$shape_item.GefaelleDefinition.HoeheUnten = 0]]></EXP>
-							</VALUECONDITION>
 							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$shape_item.GefaelleDefinition.HoeheOben = 0]]></EXP>
+								<EXP><![CDATA[$=$Count(shape_item.links) = 2]]></EXP>
 							</VALUECONDITION>
 							<GROUP Id="RDK:19265775" SubType="Then">
 								<SET Id="RDK:19265774" VarRef="Param.Result">
+									<EXP><![CDATA[$=$True]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</GROUP>
+							<GROUP Id="RDK:20700362" SubType="Else">
+								<SET Id="RDK:20700364" VarRef="Param.Result">
 									<EXP><![CDATA[$=$False]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
@@ -17353,6 +17356,176 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<PAR Name="AdvancedOptions" />
 				</SET>
 			</FUNCTION>
+			<FUNCTION Id="RDK:20690034" Name="UpdateShape" InputTypeName="string">
+				<GROUP Id="RDK:20690054" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
+					<VAR Id="RDK:20690046" Name="shapeId" Type="string">
+						<SET Id="RDK:20690045" VarRef="Me">
+							<EXP><![CDATA[$=$Param.Input]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+					</VAR>
+					<VAR Id="RDK:20690052" Name="shape_item" Type="Editor2DShapeType">
+						<SET Id="RDK:20690051" VarRef="Me">
+							<EXP><![CDATA[$=$ShapeList["id="+shapeId]]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+					</VAR>
+				</GROUP>
+				<SET Id="RDK:20694868" VarRef="Shape_Prototype">
+					<EXP><![CDATA[$=$ShapeList["id="+shapeId]]]></EXP>
+					<PAR Name="AdvancedOptions" />
+				</SET>
+				<SELECTCASE Id="RDK:20690124">
+					<EXP><![CDATA[$=$Shape_Prototype.family]]></EXP>
+					<CASEGROUP Id="RDK:20690092" CaseType="0">
+						<EXP><![CDATA[$C$Kreisel]]></EXP>
+						<CALLFUNCTION Id="RDK:20700295">
+							<PAR Name="FuncName">
+								<EXP><![CDATA[$C$CreatePrototype_Kreisel]]></EXP>
+							</PAR>
+							<PAR Name="InputExp">
+								<EXP><![CDATA[$=$shapeId]]></EXP>
+							</PAR>
+							<PAR Name="ResultRef">
+								<EXP><![CDATA[$V$]]></EXP>
+							</PAR>
+							<PAR Name="Options" />
+						</CALLFUNCTION>
+						<CALLFUNCTION Id="RDK:20700297">
+							<PAR Name="FuncName">
+								<EXP><![CDATA[$C$Create/Update Shape]]></EXP>
+							</PAR>
+							<PAR Name="InputExp">
+								<EXP><![CDATA[$=$shapeId]]></EXP>
+							</PAR>
+							<PAR Name="ResultRef">
+								<EXP><![CDATA[$V$]]></EXP>
+							</PAR>
+							<PAR Name="Options" />
+						</CALLFUNCTION>
+					</CASEGROUP>
+					<CASEGROUP Id="RDK:20690122" CaseType="0">
+						<EXP><![CDATA[$C$Eckrad]]></EXP>
+						<CALLFUNCTION Id="RDK:20700299">
+							<PAR Name="FuncName">
+								<EXP><![CDATA[$C$CreatePrototype_Eckrad]]></EXP>
+							</PAR>
+							<PAR Name="InputExp">
+								<EXP><![CDATA[$=$shapeId]]></EXP>
+							</PAR>
+							<PAR Name="ResultRef">
+								<EXP><![CDATA[$V$]]></EXP>
+							</PAR>
+							<PAR Name="Options" />
+						</CALLFUNCTION>
+						<CALLFUNCTION Id="RDK:20700301">
+							<PAR Name="FuncName">
+								<EXP><![CDATA[$C$Create/Update Shape]]></EXP>
+							</PAR>
+							<PAR Name="InputExp">
+								<EXP><![CDATA[$=$shapeId]]></EXP>
+							</PAR>
+							<PAR Name="ResultRef">
+								<EXP><![CDATA[$V$]]></EXP>
+							</PAR>
+							<PAR Name="Options" />
+						</CALLFUNCTION>
+					</CASEGROUP>
+					<CASEGROUP Id="RDK:20690104" CaseType="0">
+						<EXP><![CDATA[$C$Gefaellestrecke]]></EXP>
+						<CALLFUNCTION Id="RDK:20690128">
+							<PAR Name="FuncName">
+								<EXP><![CDATA[$C$CreatePrototype_Gefaellestrecke]]></EXP>
+							</PAR>
+							<PAR Name="InputExp">
+								<EXP><![CDATA[$=$shapeId]]></EXP>
+							</PAR>
+							<PAR Name="ResultRef">
+								<EXP><![CDATA[$V$]]></EXP>
+							</PAR>
+							<PAR Name="Options" />
+						</CALLFUNCTION>
+						<CALLFUNCTION Id="RDK:20690132">
+							<PAR Name="FuncName">
+								<EXP><![CDATA[$C$Create/Update Shape]]></EXP>
+							</PAR>
+							<PAR Name="InputExp">
+								<EXP><![CDATA[$=$shapeId]]></EXP>
+							</PAR>
+							<PAR Name="ResultRef">
+								<EXP><![CDATA[$V$]]></EXP>
+							</PAR>
+							<PAR Name="Options" />
+						</CALLFUNCTION>
+					</CASEGROUP>
+					<CASEGROUP Id="RDK:20690117" CaseType="0">
+						<EXP><![CDATA[$C$Foerderer]]></EXP>
+						<CALLFUNCTION Id="RDK:20700305">
+							<PAR Name="FuncName">
+								<EXP><![CDATA[$C$CreatePrototype_Foerderer]]></EXP>
+							</PAR>
+							<PAR Name="InputExp">
+								<EXP><![CDATA[$=$shapeId]]></EXP>
+							</PAR>
+							<PAR Name="ResultRef">
+								<EXP><![CDATA[$V$]]></EXP>
+							</PAR>
+							<PAR Name="Options" />
+						</CALLFUNCTION>
+						<CALLFUNCTION Id="RDK:20700307">
+							<PAR Name="FuncName">
+								<EXP><![CDATA[$C$Create/Update Shape]]></EXP>
+							</PAR>
+							<PAR Name="InputExp">
+								<EXP><![CDATA[$=$shapeId]]></EXP>
+							</PAR>
+							<PAR Name="ResultRef">
+								<EXP><![CDATA[$V$]]></EXP>
+							</PAR>
+							<PAR Name="Options" />
+						</CALLFUNCTION>
+					</CASEGROUP>
+					<CASEGROUP Id="RDK:20700303" CaseType="0">
+						<EXP><![CDATA[$C$Strecke]]></EXP>
+						<CALLFUNCTION Id="RDK:20700309">
+							<PAR Name="FuncName">
+								<EXP><![CDATA[$C$CreatePrototype_Strecke]]></EXP>
+							</PAR>
+							<PAR Name="InputExp">
+								<EXP><![CDATA[$=$shapeId]]></EXP>
+							</PAR>
+							<PAR Name="ResultRef">
+								<EXP><![CDATA[$V$]]></EXP>
+							</PAR>
+							<PAR Name="Options" />
+						</CALLFUNCTION>
+						<CALLFUNCTION Id="RDK:20700311">
+							<PAR Name="FuncName">
+								<EXP><![CDATA[$C$Create/Update Shape]]></EXP>
+							</PAR>
+							<PAR Name="InputExp">
+								<EXP><![CDATA[$=$shapeId]]></EXP>
+							</PAR>
+							<PAR Name="ResultRef">
+								<EXP><![CDATA[$V$]]></EXP>
+							</PAR>
+							<PAR Name="Options" />
+						</CALLFUNCTION>
+					</CASEGROUP>
+					<CASEGROUP Id="RDK:20690118" CaseType="0">
+						<EXP><![CDATA[$C$Weiche]]></EXP>
+					</CASEGROUP>
+					<CASEGROUP Id="RDK:20690119" CaseType="0">
+						<EXP><![CDATA[$C$BTMTBeladung]]></EXP>
+					</CASEGROUP>
+					<CASEGROUP Id="RDK:20690120" CaseType="0">
+						<EXP><![CDATA[$C$BTMTEntladung]]></EXP>
+					</CASEGROUP>
+					<CASEGROUP Id="RDK:20690123" CaseType="1">
+						<EXP />
+					</CASEGROUP>
+				</SELECTCASE>
+			</FUNCTION>
 			<FUNCTION Id="RDK:19595231" Name="SetHeight" InputTypeName="SSGParameter[]">
 				<GROUP Id="RDK:19595239" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
 					<VAR Id="RDK:19595236" Name="shapeId" Type="string">
@@ -17425,30 +17598,10 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							</PAR>
 							<PAR Name="Options" />
 						</CALLFUNCTION>
-						<COMMENTS Id="RDK:19937420" DesignTimeRemark="Höhe des Shapes der Gefällestrecke erst setzen, wenn beide Anschlusspunkte definiert wurden" />
-						<CALLFUNCTION Id="RDK:19937393">
-							<PAR Name="FuncName">
-								<EXP><![CDATA[$C$Check_is_defined]]></EXP>
-							</PAR>
-							<PAR Name="InputExp">
-								<EXP><![CDATA[$=$shapeId]]></EXP>
-							</PAR>
-							<PAR Name="ResultRef">
-								<EXP><![CDATA[$V$isDefined]]></EXP>
-							</PAR>
-							<PAR Name="Options" />
-						</CALLFUNCTION>
-						<IFTHENELSE Id="RDK:19937405">
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$(isDefined= True)]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:19937402" SubType="Then">
-								<SET Id="RDK:19937409" VarRef="ShapeList[&quot;id=&quot;+shapeId].z">
-									<EXP><![CDATA[$=$ShapeList["id="+shapeId].GefaelleDefinition.HoeheOben/2 + ShapeList["id="+shapeId].GefaelleDefinition.HoeheUnten/2]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</GROUP>
-						</IFTHENELSE>
+						<SET Id="RDK:19937409" VarRef="ShapeList[&quot;id=&quot;+shapeId].z">
+							<EXP><![CDATA[$=$ShapeList["id="+shapeId].GefaelleDefinition.HoeheOben/2 + ShapeList["id="+shapeId].GefaelleDefinition.HoeheUnten/2]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
 					</CASEGROUP>
 					<CASEGROUP Id="RDK:19595364" CaseType="0">
 						<EXP><![CDATA[$C$Foerderer]]></EXP>
@@ -17483,30 +17636,10 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							</PAR>
 							<PAR Name="Options" />
 						</CALLFUNCTION>
-						<COMMENTS Id="RDK:19943506" DesignTimeRemark="Höhe des Shapes des Förderers erst setzen, wenn beide Anschlusspunkte definiert wurden" />
-						<CALLFUNCTION Id="RDK:19943508">
-							<PAR Name="FuncName">
-								<EXP><![CDATA[$C$Check_is_defined]]></EXP>
-							</PAR>
-							<PAR Name="InputExp">
-								<EXP><![CDATA[$=$shapeId]]></EXP>
-							</PAR>
-							<PAR Name="ResultRef">
-								<EXP><![CDATA[$V$isDefined]]></EXP>
-							</PAR>
-							<PAR Name="Options" />
-						</CALLFUNCTION>
-						<IFTHENELSE Id="RDK:19943516">
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$(isDefined= True)]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:19943515" SubType="Then">
-								<SET Id="RDK:19943514" VarRef="ShapeList[&quot;id=&quot;+shapeId].z">
-									<EXP><![CDATA[$=$ShapeList["id="+shapeId].FoerdererDefinition.H_1/2 + ShapeList["id="+shapeId].FoerdererDefinition.H_0/2]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</GROUP>
-						</IFTHENELSE>
+						<SET Id="RDK:19943514" VarRef="ShapeList[&quot;id=&quot;+shapeId].z">
+							<EXP><![CDATA[$=$ShapeList["id="+shapeId].FoerdererDefinition.H_1/2 + ShapeList["id="+shapeId].FoerdererDefinition.H_0/2]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
 					</CASEGROUP>
 					<CASEGROUP Id="RDK:19595347" CaseType="0">
 						<EXP><![CDATA[$C$Weiche]]></EXP>
@@ -17519,7 +17652,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					</CASEGROUP>
 					<CASEGROUP Id="RDK:19595375" CaseType="0">
 						<EXP><![CDATA[$C$Eckrad]]></EXP>
-						<SET Id="RDK:19943522" VarRef="ShapeList[&quot;id=&quot;+shapeId].KreiselDefinition.Hoehe">
+						<SET Id="RDK:19943522" VarRef="ShapeList[&quot;id=&quot;+shapeId].EckradDefinition.Hoehe">
 							<EXP><![CDATA[$=$hoehe]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
@@ -17543,36 +17676,12 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<VAR Id="RDK:19664798" Name="cps_verbunden" Type="string[]" />
 					<VAR Id="RDK:19682385" Name="cp_0" Type="structure" />
 				</GROUP>
-				<CALLFUNCTION Id="RDK:19866001">
-					<PAR Name="FuncName">
-						<EXP><![CDATA[$C$IndexOfByFieldValue_SSG]]></EXP>
-					</PAR>
-					<PAR Name="InputExp">
-						<EXP><![CDATA[$=$Param.Input["key=shapeId_0"].Str]]></EXP>
-					</PAR>
-					<PAR Name="ResultRef">
-						<EXP><![CDATA[$V$shapeList_idx_0]]></EXP>
-					</PAR>
-					<PAR Name="Options" />
-				</CALLFUNCTION>
-				<CALLFUNCTION Id="RDK:19866007">
-					<PAR Name="FuncName">
-						<EXP><![CDATA[$C$IndexOfByFieldValue_SSG]]></EXP>
-					</PAR>
-					<PAR Name="InputExp">
-						<EXP><![CDATA[$=$Param.Input["key=shapeId_1"].Str]]></EXP>
-					</PAR>
-					<PAR Name="ResultRef">
-						<EXP><![CDATA[$V$shapeList_idx_1]]></EXP>
-					</PAR>
-					<PAR Name="Options" />
-				</CALLFUNCTION>
 				<SET Id="RDK:19710796" VarRef="item_0">
-					<EXP><![CDATA[$=$ShapeList[shapeList_idx_0]]]></EXP>
+					<EXP><![CDATA[$=$ShapeList["id="+Param.Input["key=shapeId_0"].Str]]]></EXP>
 					<PAR Name="AdvancedOptions" />
 				</SET>
 				<SET Id="RDK:19710798" VarRef="item_1">
-					<EXP><![CDATA[$=$ShapeList[shapeList_idx_1]]]></EXP>
+					<EXP><![CDATA[$=$ShapeList["id="+Param.Input["key=shapeId_1"].Str]]]></EXP>
 					<PAR Name="AdvancedOptions" />
 				</SET>
 				<CALLFUNCTION Id="RDK:19710799">
@@ -18214,6 +18323,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 						</SET>
 					</VAR>
 					<VAR Id="RDK:19632172" Name="shapeList_idx" Type="integer" />
+					<VAR Id="RDK:20700337" Name="isDefined" Type="boolean" />
 				</GROUP>
 				<CALLFUNCTION Id="RDK:19632170">
 					<PAR Name="FuncName">
@@ -18227,6 +18337,38 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					</PAR>
 					<PAR Name="Options" />
 				</CALLFUNCTION>
+				<CALLFUNCTION Id="RDK:20700335">
+					<PAR Name="FuncName">
+						<EXP><![CDATA[$C$Check_is_defined]]></EXP>
+					</PAR>
+					<PAR Name="InputExp">
+						<EXP><![CDATA[$=$shapeId]]></EXP>
+					</PAR>
+					<PAR Name="ResultRef">
+						<EXP><![CDATA[$V$isDefined]]></EXP>
+					</PAR>
+					<PAR Name="Options" />
+				</CALLFUNCTION>
+				<IFTHENELSE Id="RDK:20700339">
+					<VALUECONDITION Value="false">
+						<EXP><![CDATA[$=$isDefined]]></EXP>
+					</VALUECONDITION>
+					<GROUP Id="RDK:20700340" SubType="Then">
+						<CALLFUNCTION Id="RDK:20700349">
+							<PAR Name="FuncName">
+								<EXP><![CDATA[$C$SetStatus_Undef]]></EXP>
+							</PAR>
+							<PAR Name="InputExp">
+								<EXP><![CDATA[$=$shapeId]]></EXP>
+							</PAR>
+							<PAR Name="ResultRef">
+								<EXP><![CDATA[$V$]]></EXP>
+							</PAR>
+							<PAR Name="Options" />
+						</CALLFUNCTION>
+						<EXIT_PROCESS Id="RDK:20701718" BreakType="4" ExitStatus="0" />
+					</GROUP>
+				</IFTHENELSE>
 				<SELECTCASE Id="RDK:19602982">
 					<EXP><![CDATA[$=$ShapeList[shapeList_idx].family]]></EXP>
 					<CASEGROUP Id="RDK:19602961" CaseType="0">
@@ -18248,7 +18390,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 						<EXP><![CDATA[$C$Gefaellestrecke]]></EXP>
 						<IFTHENELSE Id="RDK:19603003">
 							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$(ShapeList[shapeList_idx].GefaelleDefinition.LH_fits = True)]]></EXP>
+								<EXP><![CDATA[$=$(ShapeList["id="+shapeId].GefaelleDefinition.LH_fits = True)]]></EXP>
 							</VALUECONDITION>
 							<GROUP Id="RDK:19603000" SubType="Then">
 								<CALLFUNCTION Id="RDK:19602999">