diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index cbcfd96..8952eb8 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="dre [NBDELP3561-04C]" ModDate="2023-11-13T13:03:49" LanguageVersion="2014.1.3.611" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="dre [NBDELP3561-04C]" ModDate="2023-11-20T14:58:18" LanguageVersion="2014.1.3.618" />
 	<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">
@@ -45,23 +45,10 @@
 				<TYPE Id="RDK:1520433" Name="EckradType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:1520415" Name="Beschreibung" Type="string" />
-					<FIELD Id="RDK:1520416" Name="AbstandMS" Type="double" />
+					<FIELD Id="RDK:1520416" Name="AbstandMS" Type="double" Suppressed="True" />
 					<FIELD Id="RDK:1520417" Name="Hoehe" Type="double" />
-					<FIELD Id="RDK:1520418" Name="OrientierungHV" Type="double" Suppressed="True" DesignTimeNotes="90=Horizontal&#xD;&#xA;0=Vertikal" />
-					<FIELD Id="RDK:1520419" Name="n_Sep" Type="integer" Suppressed="True" />
-					<FIELD Id="RDK:1520420" Name="n_Scan" Type="integer" Suppressed="True" />
 					<FIELD Id="RDK:1520421" Name="Drehung" Type="integer" DesignTimeNotes="1= im Uhrzeigersinn=rechts&#xD;&#xA;-1= Gegen Uhrzeigersinn=links" />
-					<FIELD Id="RDK:1520422" Name="Typ" Type="string" Suppressed="True" DesignTimeNotes="Standard, Pin (Kreiselfarbe in Grün)" />
-					<FIELD Id="RDK:1520423" Name="n_Rampen" Type="integer" Suppressed="True" />
 					<FIELD Id="RDK:1520424" Name="Durchmesser" Type="double" />
-					<FIELD Id="RDK:1520425" Name="M_Strecke" Type="SSGConnectionPoint[]" Suppressed="True" />
-					<FIELD Id="RDK:1520426" Name="M_Strecke_selected" Type="string[]" Suppressed="True" />
-					<FIELD Id="RDK:1520427" Name="S_Strecke" Type="SSGConnectionPoint[]" Suppressed="True" />
-					<FIELD Id="RDK:1520428" Name="S_Strecke_selected" Type="string[]" Suppressed="True" />
-					<FIELD Id="RDK:1520429" Name="d_min" Type="double" Suppressed="True" DesignTimeNotes="Mindestabstand für den ersten und den letzten CP" />
-					<FIELD Id="RDK:1520430" Name="d_cp" Type="double" Suppressed="True" DesignTimeNotes="Default Wert für den Abstand weiterer CPs" />
-					<FIELD Id="RDK:1520431" Name="x" Type="double" Suppressed="True" />
-					<FIELD Id="RDK:1520432" Name="y" Type="double" Suppressed="True" />
 				</TYPE>
 				<TYPE Id="RDK:302581" Name="GefaelleType" SubType="structure">
 					<TYPE_VALUES />
@@ -78,7 +65,7 @@
 					<FIELD Id="RDK:973716" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:973714" Name="Weichenart" Type="string" />
 				</TYPE>
-				<TYPE Id="RDK:79642" Name="SSG_ShapeType" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:79642" Name="SSG_ShapeType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:79643" Name="SivasNummer" Type="string" />
 					<FIELD Id="RDK:1561689" Name="Rotationsklasse" Type="string" />
@@ -3222,7 +3209,9 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="outShapeIdList">
 											<EXP><![CDATA[$V$]]></EXP>
 										</PAR>
-										<PAR Name="Options" />
+										<PAR Name="Options">
+											<EXP><![CDATA[$C$(OVERWRITE)]]></EXP>
+										</PAR>
 									</ACTION_CALL>
 								</GROUP>
 								<GROUP Id="RDK:1551620" Name="Eckrad platzieren" SubType="Generic">
@@ -3330,6 +3319,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="pinned" />
 										<PAR Name="selected" />
 										<PAR Name="includeInBOM" />
+										<PAR Name="Rotationsklasse" />
 									</SET_STRUCT>
 								</GROUP>
 							</CASEGROUP>
@@ -3553,7 +3543,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 							<PAR Name="AdvancedOptions" />
 						</SET>
 					</FUNCTION>
-					<FUNCTION Id="RDK:529490" Name="Inherit Children rotation" Bookmarked="True">
+					<FUNCTION Id="RDK:529490" Name="Inherit Children rotation">
 						<FOREACHLOOP Id="RDK:513506" ItemVarRef="Link">
 							<PAR Name="ArrayValueExp">
 								<EXP><![CDATA[$=$LinkedShapeIDs]]></EXP>
@@ -3561,52 +3551,96 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 							<PAR Name="ExitCondExp">
 								<EXP><![CDATA[$V$]]></EXP>
 							</PAR>
-							<SET Id="RDK:514784" VarRef="ShapeList[&quot;id=&quot;+Link].KreiselDefinition.Drehung">
-								<EXP><![CDATA[$=$ShapeList["id="+Link].KreiselDefinition.Drehung*(-1)]]></EXP>
-								<PAR Name="AdvancedOptions" />
-							</SET>
-							<SET Id="RDK:519388" VarRef="Shape_Prototype">
-								<EXP><![CDATA[$=$ShapeList["id="+Link]]]></EXP>
-								<PAR Name="AdvancedOptions" />
-							</SET>
-							<SET Id="RDK:942570" VarRef="Shape_Prototype.KreiselDefinition.OrientierungHV" Bookmarked="True">
-								<EXP><![CDATA[$=$Shape_Prototype.rotation]]></EXP>
-								<PAR Name="AdvancedOptions" />
-							</SET>
-							<CALLFUNCTION Id="RDK:514786">
-								<PAR Name="FuncName">
-									<EXP><![CDATA[$C$CreatePrototype_Kreisel]]></EXP>
-								</PAR>
-								<PAR Name="InputExp">
-									<EXP><![CDATA[$=$Link]]></EXP>
-								</PAR>
-								<PAR Name="ResultRef">
-									<EXP><![CDATA[$V$]]></EXP>
-								</PAR>
-								<PAR Name="Options" />
-							</CALLFUNCTION>
-							<CALLFUNCTION Id="RDK:1073126" Bookmarked="True">
-								<PAR Name="FuncName">
-									<EXP><![CDATA[$C$Write CPs From Data to Prototype]]></EXP>
-								</PAR>
-								<PAR Name="InputExp" />
-								<PAR Name="ResultRef">
-									<EXP><![CDATA[$V$]]></EXP>
-								</PAR>
-								<PAR Name="Options" />
-							</CALLFUNCTION>
-							<CALLFUNCTION Id="RDK:514788">
-								<PAR Name="FuncName">
-									<EXP><![CDATA[$C$Create/Update Shape]]></EXP>
-								</PAR>
-								<PAR Name="InputExp">
-									<EXP><![CDATA[$=$Link]]></EXP>
-								</PAR>
-								<PAR Name="ResultRef">
-									<EXP><![CDATA[$V$]]></EXP>
-								</PAR>
-								<PAR Name="Options" />
-							</CALLFUNCTION>
+							<SELECTCASE Id="RDK:1568370">
+								<EXP><![CDATA[$=$ShapeList["id="+Link].family]]></EXP>
+								<CASEGROUP Id="RDK:1568371" CaseType="0">
+									<EXP><![CDATA[$C$Kreisel]]></EXP>
+									<SET Id="RDK:514784" VarRef="ShapeList[&quot;id=&quot;+Link].KreiselDefinition.Drehung">
+										<EXP><![CDATA[$=$ShapeList["id="+Link].KreiselDefinition.Drehung*(-1)]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+									<SET Id="RDK:519388" VarRef="Shape_Prototype">
+										<EXP><![CDATA[$=$ShapeList["id="+Link]]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+									<SET Id="RDK:942570" VarRef="Shape_Prototype.KreiselDefinition.OrientierungHV">
+										<EXP><![CDATA[$=$Shape_Prototype.rotation]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+									<CALLFUNCTION Id="RDK:514786">
+										<PAR Name="FuncName">
+											<EXP><![CDATA[$C$CreatePrototype_Kreisel]]></EXP>
+										</PAR>
+										<PAR Name="InputExp">
+											<EXP><![CDATA[$=$Link]]></EXP>
+										</PAR>
+										<PAR Name="ResultRef">
+											<EXP><![CDATA[$V$]]></EXP>
+										</PAR>
+										<PAR Name="Options" />
+									</CALLFUNCTION>
+									<CALLFUNCTION Id="RDK:1073126">
+										<PAR Name="FuncName">
+											<EXP><![CDATA[$C$Write CPs From Data to Prototype]]></EXP>
+										</PAR>
+										<PAR Name="InputExp" />
+										<PAR Name="ResultRef">
+											<EXP><![CDATA[$V$]]></EXP>
+										</PAR>
+										<PAR Name="Options" />
+									</CALLFUNCTION>
+									<CALLFUNCTION Id="RDK:514788">
+										<PAR Name="FuncName">
+											<EXP><![CDATA[$C$Create/Update Shape]]></EXP>
+										</PAR>
+										<PAR Name="InputExp">
+											<EXP><![CDATA[$=$Link]]></EXP>
+										</PAR>
+										<PAR Name="ResultRef">
+											<EXP><![CDATA[$V$]]></EXP>
+										</PAR>
+										<PAR Name="Options" />
+									</CALLFUNCTION>
+								</CASEGROUP>
+								<CASEGROUP Id="RDK:1568374" CaseType="0">
+									<EXP><![CDATA[$C$Eckrad]]></EXP>
+									<SET Id="RDK:1568376" VarRef="ShapeList[&quot;id=&quot;+Link].EckradDefinition.Drehung">
+										<EXP><![CDATA[$=$ShapeList["id="+Link].EckradDefinition.Drehung*(-1)]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+									<SET Id="RDK:1568378" VarRef="Shape_Prototype">
+										<EXP><![CDATA[$=$ShapeList["id="+Link]]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+									<CALLFUNCTION Id="RDK:1568379">
+										<PAR Name="FuncName">
+											<EXP><![CDATA[$C$CreatePrototype_Eckrad]]></EXP>
+										</PAR>
+										<PAR Name="InputExp">
+											<EXP><![CDATA[$=$Link]]></EXP>
+										</PAR>
+										<PAR Name="ResultRef">
+											<EXP><![CDATA[$V$]]></EXP>
+										</PAR>
+										<PAR Name="Options" />
+									</CALLFUNCTION>
+									<CALLFUNCTION Id="RDK:1568380">
+										<PAR Name="FuncName">
+											<EXP><![CDATA[$C$Create/Update Shape]]></EXP>
+										</PAR>
+										<PAR Name="InputExp">
+											<EXP><![CDATA[$=$Link]]></EXP>
+										</PAR>
+										<PAR Name="ResultRef">
+											<EXP><![CDATA[$V$]]></EXP>
+										</PAR>
+										<PAR Name="Options" />
+									</CALLFUNCTION>
+								</CASEGROUP>
+								<CASEGROUP Id="RDK:1568372" CaseType="1">
+									<EXP />
+								</CASEGROUP>
+							</SELECTCASE>
 						</FOREACHLOOP>
 					</FUNCTION>
 					<FUNCTION Id="RDK:260964" Name="CollectLinkedShapes" InputTypeName="string[]">
@@ -7886,8 +7920,8 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 					</CASEGROUP>
 					<CASEGROUP Id="RDK:1520393" CaseType="0">
 						<EXP><![CDATA[$C$Eckrad]]></EXP>
-						<SET Id="RDK:1520395" VarRef="Shape_Prototype.KreiselDefinition">
-							<EXP><![CDATA[$=$KreiselData_defaults]]></EXP>
+						<SET Id="RDK:1520395" VarRef="Shape_Prototype.EckradDefinition">
+							<EXP><![CDATA[$=$EckradData_defaults]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
 						<SET Id="RDK:1561693" VarRef="Shape_Prototype.Rotationsklasse">
@@ -7906,14 +7940,6 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 							<EXP><![CDATA[$=$Shape_Prototype.name]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
-						<SET Id="RDK:1551045" VarRef="Shape_Prototype.EckradDefinition.Hoehe">
-							<EXP><![CDATA[$C$2000]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:1551047" VarRef="Shape_Prototype.EckradDefinition.Drehung">
-							<EXP><![CDATA[$C$1]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
 						<CALLFUNCTION Id="RDK:1520549">
 							<PAR Name="FuncName">
 								<EXP><![CDATA[$C$CreatePrototype_Eckrad]]></EXP>
@@ -8233,6 +8259,8 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 					<PAR Name="pinned" />
 					<PAR Name="selected" />
 					<PAR Name="includeInBOM" />
+					<PAR Name="Rotationsklasse" />
+					<PAR Name="EckradDefinition" />
 				</EXEC_ON_VALUES>
 			</FUNCTION>
 			<FUNCTION Id="RDK:295" Name="OnEditor2DDoubleClick" InputTypeName="Editor2DEventArgumentsTypeList" Options="(TYPEFUNCTION)">
@@ -8754,43 +8782,273 @@ me.x
 					<VAR Id="RDK:506783" Name="PrototypeLink" Type="string" DesignTimeRemark="Generated by RD" />
 					<VAR Id="RDK:514766" Name="OriginalRatation" Type="integer" />
 				</GROUP>
-				<GROUP Id="RDK:304141" Name="Kreisel Operations" SubType="Generic">
-					<VALUECONDITION Value="true">
-						<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family="Kreisel"]]></EXP>
-					</VALUECONDITION>
-					<VALUECONDITION Value="true">
-						<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Kreisel"]]></EXP>
-					</VALUECONDITION>
-					<GROUP Id="RDK:132804" Name="Ihnerit rotation" SubType="Generic">
-						<COMMENTS Id="RDK:111081" DesignTimeRemark="Rotationsausrichtung wird von jungerem an den älterem invertiert weitergegeben" />
-						<SET Id="RDK:461948" VarRef="Shape_Prototype">
-							<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID]]]></EXP>
+				<SET Id="RDK:1578954" VarRef="Shape_Prototype">
+					<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID]]]></EXP>
+					<PAR Name="AdvancedOptions" />
+				</SET>
+				<SELECTCASE Id="RDK:1576706">
+					<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family]]></EXP>
+					<CASEGROUP Id="RDK:1576707" CaseType="0">
+						<EXP><![CDATA[$C$Kreisel]]></EXP>
+						<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>
+							<GROUP Id="RDK:132804" Name="Ihnerit rotation" SubType="Generic">
+								<SET Id="RDK:514767" VarRef="OriginalRatation">
+									<EXP><![CDATA[$=$Shape_Prototype.KreiselDefinition.Drehung]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SELECTCASE Id="RDK:1583464">
+									<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family]]></EXP>
+									<CASEGROUP Id="RDK:1583461" CaseType="0">
+										<EXP><![CDATA[$C$Kreisel]]></EXP>
+										<SET Id="RDK:1583460" VarRef="Shape_Prototype.KreiselDefinition.Drehung">
+											<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].KreiselDefinition.Drehung*(-1)]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+									</CASEGROUP>
+									<CASEGROUP Id="RDK:1583463" CaseType="0">
+										<EXP><![CDATA[$C$Eckrad]]></EXP>
+										<SET Id="RDK:1583462" VarRef="Shape_Prototype.KreiselDefinition.Drehung">
+											<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].EckradDefinition.Drehung*(-1)]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+									</CASEGROUP>
+								</SELECTCASE>
+								<GROUP Id="RDK:230196" Name="Group" SubType="Generic">
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$Shape_Prototype.rotation=""]]></EXP>
+									</VALUECONDITION>
+									<SET Id="RDK:230195" VarRef="Shape_Prototype.rotation">
+										<EXP><![CDATA[$C$0]]></EXP>
+										<PAR Name="AdvancedOptions" />
+									</SET>
+								</GROUP>
+								<SET Id="RDK:207415" VarRef="Shape_Prototype.KreiselDefinition.OrientierungHV">
+									<EXP><![CDATA[$=$Shape_Prototype.rotation]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<CALLFUNCTION Id="RDK:459015">
+									<PAR Name="FuncName">
+										<EXP><![CDATA[$C$CreatePrototype_Kreisel]]></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:1068910">
+									<PAR Name="FuncName">
+										<EXP><![CDATA[$C$Write CPs From Data to Prototype]]></EXP>
+									</PAR>
+									<PAR Name="InputExp" />
+									<PAR Name="ResultRef">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+									<PAR Name="Options" />
+								</CALLFUNCTION>
+								<CALLFUNCTION Id="RDK:459016">
+									<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:514768">
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$OriginalRatation<>Shape_Prototype.KreiselDefinition.Drehung]]></EXP>
+									</VALUECONDITION>
+									<GROUP Id="RDK:514769" SubType="Then">
+										<GROUP Id="RDK:500485" Name="Find Children" SubType="Generic">
+											<SET Id="RDK:509305" VarRef="LinkedShapeIDs">
+												<EXP><![CDATA[$C$NOTHING]]></EXP>
+												<PAR Name="AdvancedOptions" />
+											</SET>
+											<FOREACHLOOP Id="RDK:506782" ItemVarRef="Link">
+												<PAR Name="ArrayValueExp">
+													<EXP><![CDATA[$=$Shape_Prototype.links]]></EXP>
+												</PAR>
+												<PAR Name="ExitCondExp">
+													<EXP><![CDATA[$V$]]></EXP>
+												</PAR>
+												<SET Id="RDK:506787" VarRef="Link">
+													<EXP><![CDATA[$=$StrAfter(Link, ";")]]></EXP>
+													<PAR Name="AdvancedOptions" />
+												</SET>
+												<GROUP Id="RDK:509306" Name="Group" SubType="Generic">
+													<VALUECONDITION Value="true">
+														<EXP><![CDATA[$=$Not (Link=Param.Input[1].shapeID)]]></EXP>
+													</VALUECONDITION>
+													<LIST_ADD Id="RDK:506785" ListRef="LinkedShapeIDs">
+														<PAR Name="VALUE_TO_ADD">
+															<EXP><![CDATA[$=$Link]]></EXP>
+														</PAR>
+														<PAR Name="POS_TO_ADD" />
+													</LIST_ADD>
+												</GROUP>
+											</FOREACHLOOP>
+											<CALLFUNCTION Id="RDK:497140">
+												<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:529491">
+											<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:514770" SubType="Else">
+										<COMMENTS Id="RDK:514775" DesignTimeRemark="No children rotation needed" />
+									</GROUP>
+								</IFTHENELSE>
+								<CALLFUNCTION Id="RDK:1592928">
+									<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>
+						</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>
+					</CASEGROUP>
+					<CASEGROUP Id="RDK:1576710" CaseType="0">
+						<EXP><![CDATA[$C$Eckrad]]></EXP>
+						<SET Id="RDK:1578956" VarRef="OriginalRatation">
+							<EXP><![CDATA[$=$Shape_Prototype.EckradDefinition.Drehung]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
-						<SET Id="RDK:514767" VarRef="OriginalRatation">
-							<EXP><![CDATA[$=$Shape_Prototype.KreiselDefinition.Drehung]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:461950" VarRef="Shape_Prototype.KreiselDefinition.Drehung">
-							<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].KreiselDefinition.Drehung*(-1)]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<GROUP Id="RDK:230196" Name="Group" 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:230195" VarRef="Shape_Prototype.rotation">
+							<SET Id="RDK:1578971" VarRef="Shape_Prototype.rotation">
 								<EXP><![CDATA[$C$0]]></EXP>
 								<PAR Name="AdvancedOptions" />
 							</SET>
 						</GROUP>
-						<SET Id="RDK:207415" VarRef="Shape_Prototype.KreiselDefinition.OrientierungHV">
-							<EXP><![CDATA[$=$Shape_Prototype.rotation]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<CALLFUNCTION Id="RDK:459015">
+						<CALLFUNCTION Id="RDK:1578976">
 							<PAR Name="FuncName">
-								<EXP><![CDATA[$C$CreatePrototype_Kreisel]]></EXP>
+								<EXP><![CDATA[$C$CreatePrototype_Eckrad]]></EXP>
 							</PAR>
 							<PAR Name="InputExp">
 								<EXP><![CDATA[$=$Param.Input[0].shapeID]]></EXP>
@@ -8800,17 +9058,7 @@ me.x
 							</PAR>
 							<PAR Name="Options" />
 						</CALLFUNCTION>
-						<CALLFUNCTION Id="RDK:1068910" Bookmarked="True">
-							<PAR Name="FuncName">
-								<EXP><![CDATA[$C$Write CPs From Data to Prototype]]></EXP>
-							</PAR>
-							<PAR Name="InputExp" />
-							<PAR Name="ResultRef">
-								<EXP><![CDATA[$V$]]></EXP>
-							</PAR>
-							<PAR Name="Options" />
-						</CALLFUNCTION>
-						<CALLFUNCTION Id="RDK:459016">
+						<CALLFUNCTION Id="RDK:1578978">
 							<PAR Name="FuncName">
 								<EXP><![CDATA[$C$Create/Update Shape]]></EXP>
 							</PAR>
@@ -8822,32 +9070,32 @@ me.x
 							</PAR>
 							<PAR Name="Options" />
 						</CALLFUNCTION>
-						<IFTHENELSE Id="RDK:514768">
+						<IFTHENELSE Id="RDK:1579006">
 							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$OriginalRatation<>Shape_Prototype.KreiselDefinition.Drehung]]></EXP>
+								<EXP><![CDATA[$=$OriginalRatation<>Shape_Prototype.EckradDefinition.Drehung]]></EXP>
 							</VALUECONDITION>
-							<GROUP Id="RDK:514769" SubType="Then">
-								<GROUP Id="RDK:500485" Name="Find Children" SubType="Generic">
-									<SET Id="RDK:509305" VarRef="LinkedShapeIDs">
+							<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:506782" ItemVarRef="Link">
+									<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:506787" VarRef="Link">
+										<SET Id="RDK:1578996" VarRef="Link">
 											<EXP><![CDATA[$=$StrAfter(Link, ";")]]></EXP>
 											<PAR Name="AdvancedOptions" />
 										</SET>
-										<GROUP Id="RDK:509306" Name="Group" SubType="Generic">
+										<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:506785" ListRef="LinkedShapeIDs">
+											<LIST_ADD Id="RDK:1578997" ListRef="LinkedShapeIDs">
 												<PAR Name="VALUE_TO_ADD">
 													<EXP><![CDATA[$=$Link]]></EXP>
 												</PAR>
@@ -8855,7 +9103,7 @@ me.x
 											</LIST_ADD>
 										</GROUP>
 									</FOREACHLOOP>
-									<CALLFUNCTION Id="RDK:497140">
+									<CALLFUNCTION Id="RDK:1579000">
 										<PAR Name="FuncName">
 											<EXP><![CDATA[$C$CollectLinkedShapes]]></EXP>
 										</PAR>
@@ -8868,7 +9116,7 @@ me.x
 										<PAR Name="Options" />
 									</CALLFUNCTION>
 								</GROUP>
-								<CALLFUNCTION Id="RDK:529491">
+								<CALLFUNCTION Id="RDK:1579002">
 									<PAR Name="FuncName">
 										<EXP><![CDATA[$C$Inherit Children rotation]]></EXP>
 									</PAR>
@@ -8879,261 +9127,42 @@ me.x
 									<PAR Name="Options" />
 								</CALLFUNCTION>
 							</GROUP>
-							<GROUP Id="RDK:514770" SubType="Else">
-								<COMMENTS Id="RDK:514775" DesignTimeRemark="No children rotation needed" />
+							<GROUP Id="RDK:1579005" SubType="Else">
+								<COMMENTS Id="RDK:1579004" DesignTimeRemark="No children rotation needed" />
 							</GROUP>
 						</IFTHENELSE>
-					</GROUP>
-				</GROUP>
-				<COMMENTS Id="RDK:1002231" DesignTimeRemark="WIP" />
-				<GROUP Id="RDK:953218" Name="AddWeiche" SubType="Generic">
-					<GROUP Id="RDK:1016219" Name="Filter" SubType="Generic">
-						<VALUECONDITION Value="true" Oper="OR">
-							<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family="Kreisel" And  ShapeList["id="+Param.Input[1].shapeID].family="Kreisel"]]></EXP>
-						</VALUECONDITION>
-						<VALUECONDITION Value="true">
-							<EXP><![CDATA[$=$(ShapeList["id="+Param.Input[0].shapeID].family="Gefaellestrecke" And  (ShapeList["id="+Param.Input[1].shapeID].family="Kreisel" and IsTagInString(Param.Input[1].connectionPointID, "defcp")))  
-Or 
-(ShapeList["id="+Param.Input[1].shapeID].family="Gefaellestrecke" And  (ShapeList["id="+Param.Input[0].shapeID].family="Kreisel" and IsTagInString(Param.Input[0].connectionPointID, "defcp")))  
-
-
-]]></EXP>
-						</VALUECONDITION>
-						<SET Id="RDK:961788" VarRef="Shape_Prototype">
-							<EXP><![CDATA[$C$NOTHING]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<ACTION_CALL Id="RDK:953227" Name="RDEngineering_E2DManageShape">
-							<PAR Name="RDLibraryName">
-								<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+						<CALLFUNCTION Id="RDK:1592919">
+							<PAR Name="FuncName">
+								<EXP><![CDATA[$C$AddWeiche]]></EXP>
 							</PAR>
-							<PAR Name="e2dMode">
-								<EXP><![CDATA[$C$0]]></EXP>
+							<PAR Name="InputExp">
+								<EXP><![CDATA[$=$Param.Input]]></EXP>
 							</PAR>
-							<PAR Name="libraryID">
-								<EXP><![CDATA[$=$GS2DLibraryName]]></EXP>
-							</PAR>
-							<PAR Name="operType">
-								<EXP><![CDATA[$C$0]]></EXP>
-							</PAR>
-							<PAR Name="shpId">
-								<EXP><![CDATA[$C$s_weiche_aktiv]]></EXP>
-							</PAR>
-							<PAR Name="catId">
-								<EXP><![CDATA[$C$c_Parts]]></EXP>
-							</PAR>
-							<PAR Name="shpItemId" />
-							<PAR Name="shpItem">
-								<EXP><![CDATA[$=$Shape_Prototype]]></EXP>
-							</PAR>
-							<PAR Name="shpItemList">
-								<EXP><![CDATA[$V$]]></EXP>
-							</PAR>
-							<PAR Name="shpList">
-								<EXP><![CDATA[$V$]]></EXP>
-							</PAR>
-							<PAR Name="outShapeIdList">
+							<PAR Name="ResultRef">
 								<EXP><![CDATA[$V$]]></EXP>
 							</PAR>
 							<PAR Name="Options" />
-						</ACTION_CALL>
-						<SET Id="RDK:984518" VarRef="Shape_Prototype.WeicheDefinition.Weichenart">
-							<EXP><![CDATA[$C$Aktiv]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:973730" VarRef="Shape_Prototype.name">
-							<EXP><![CDATA[$=$Shape_Prototype.family+" :"+(Count(FilterByFieldValue(ShapeList, "family", Shape_Prototype.family))+1)]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:986051" VarRef="Shape_Prototype.WeicheDefinition.Beschreibung" Bookmarked="True">
-							<EXP><![CDATA[$=$" zw. "+
-ShapeList["id="+Param.Input[0].shapeID].name+" und "+
-ShapeList["id="+Param.Input[1].shapeID].name
-
-]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET_STRUCT Id="RDK:1065214" VarRef="Shape_Prototype" ListRef="ShapeList">
-							<PAR Name="SivasNummer" />
-							<PAR Name="KreiselDefinition" />
-							<PAR Name="EckradDefinition" />
-							<PAR Name="GefaelleDefinition" />
-							<PAR Name="WeicheDefinition" />
-							<PAR Name="source">
-								<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
+						</CALLFUNCTION>
+					</CASEGROUP>
+					<CASEGROUP Id="RDK:1606858" CaseType="0">
+						<EXP><![CDATA[$C$Gefaellestrecke]]></EXP>
+						<CALLFUNCTION Id="RDK:1608528">
+							<PAR Name="FuncName">
+								<EXP><![CDATA[$C$AddWeiche]]></EXP>
 							</PAR>
-							<PAR Name="sourceLibrary" />
-							<PAR Name="signature" />
-							<PAR Name="id">
-								<EXP><![CDATA[$=$"Weiche_"+CreateGUID()]]></EXP>
+							<PAR Name="InputExp">
+								<EXP><![CDATA[$=$Param.Input]]></EXP>
 							</PAR>
-							<PAR Name="name" />
-							<PAR Name="family" />
-							<PAR Name="description" />
-							<PAR Name="x" />
-							<PAR Name="y" />
-							<PAR Name="z" />
-							<PAR Name="width">
-								<EXP><![CDATA[$=$ConvertFromPixel(Shape_Prototype.width, "mm", 96)
-]]></EXP>
-							</PAR>
-							<PAR Name="height">
-								<EXP><![CDATA[$=$ConvertFromPixel(Shape_Prototype.height, "mm", 96)]]></EXP>
-							</PAR>
-							<PAR Name="depth">
-								<EXP><![CDATA[$=$ConvertFromPixel(Shape_Prototype.depth, "mm", 96)]]></EXP>
-							</PAR>
-							<PAR Name="rotation" />
-							<PAR Name="text" />
-							<PAR Name="behaviour" />
-							<PAR Name="datadump" />
-							<PAR Name="path" />
-							<PAR Name="ctrl1x" />
-							<PAR Name="ctrl1y" />
-							<PAR Name="ctrl2x" />
-							<PAR Name="ctrl2y" />
-							<PAR Name="shapeFromId">
-								<EXP><![CDATA[$=$Param.Input[0].shapeID]]></EXP>
-							</PAR>
-							<PAR Name="shapeFromPointIndex">
-								<EXP><![CDATA[$=$Param.Input[0].connectionPointID]]></EXP>
-							</PAR>
-							<PAR Name="shapeToId">
-								<EXP><![CDATA[$=$Param.Input[1].shapeID]]></EXP>
-							</PAR>
-							<PAR Name="shapeToPointIndex">
-								<EXP><![CDATA[$=$Param.Input[1].connectionPointID]]></EXP>
-							</PAR>
-							<PAR Name="dimStack" />
-							<PAR Name="dimType" />
-							<PAR Name="dimDriving" />
-							<PAR Name="dimValue" />
-							<PAR Name="color" />
-							<PAR Name="colorOpacity" />
-							<PAR Name="color3D" />
-							<PAR Name="colorOpacity3D" />
-							<PAR Name="lineWidth" />
-							<PAR Name="lineColor" />
-							<PAR Name="lineOpacity" />
-							<PAR Name="lineColor3D" />
-							<PAR Name="lineOpacity3D" />
-							<PAR Name="links" />
-							<PAR Name="group" />
-							<PAR Name="layer">
-								<EXP><![CDATA[$C$Weiche]]></EXP>
-							</PAR>
-							<PAR Name="connectionPoints" />
-							<PAR Name="modified" />
-							<PAR Name="pinned" />
-							<PAR Name="selected" />
-							<PAR Name="includeInBOM" />
-						</SET_STRUCT>
-						<ACTION_CALL Id="RDK:996598" Name="RDEngineering_E2DLinkShapes" Bookmarked="True">
-							<PAR Name="RDLibraryName">
-								<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
-							</PAR>
-							<PAR Name="libraryID">
-								<EXP><![CDATA[$=$GS2DLibraryName]]></EXP>
-							</PAR>
-							<PAR Name="shapeList">
-								<EXP><![CDATA[$=$ShapeList]]></EXP>
-							</PAR>
-							<PAR Name="shapeFromID">
-								<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
-							</PAR>
-							<PAR Name="shapeFromPointID">
-								<EXP><![CDATA[$C$cp0]]></EXP>
-							</PAR>
-							<PAR Name="shapeToID">
-								<EXP><![CDATA[$=$Param.Input[0].shapeID]]></EXP>
-							</PAR>
-							<PAR Name="shapeToPointID">
-								<EXP><![CDATA[$=$Param.Input[0].connectionPointID]]></EXP>
-							</PAR>
-							<PAR Name="shapeFromEventHandler">
-								<EXP><![CDATA[$V$]]></EXP>
-							</PAR>
-							<PAR Name="shapeToEventHandler">
+							<PAR Name="ResultRef">
 								<EXP><![CDATA[$V$]]></EXP>
 							</PAR>
 							<PAR Name="Options" />
-						</ACTION_CALL>
-					</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>
+					</CASEGROUP>
+					<CASEGROUP Id="RDK:1576708" CaseType="1">
+						<EXP />
+					</CASEGROUP>
+				</SELECTCASE>
 			</FUNCTION>
 			<FUNCTION Id="RDK:296" Name="OnEditor2DRegrouped" InputTypeName="Editor2DShapePropertyType" Options="(TYPEFUNCTION)">
 				<COMMENTS Id="RDK:32100" />
@@ -9447,6 +9476,173 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					</ACTION_CALL>
 				</GROUP>
 			</FUNCTION>
+			<FUNCTION Id="RDK:1592918" Name="AddWeiche" InputTypeName="Editor2DEventArgumentsTypeList">
+				<GROUP Id="RDK:1611859" 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[$=$Not ((ShapeList["id="+Param.Input[0].shapeID].family="Gefaellestrecke" or ShapeList["id="+Param.Input[1].shapeID].family="Gefaellestrecke") And
+(IsTagInString(Param.Input[0].connectionPointID, "ncp") or IsTagInString(Param.Input[1].connectionPointID, "ncp")))]]></EXP>
+					</VALUECONDITION>
+					<SET Id="RDK:1589022" VarRef="Shape_Prototype">
+						<EXP><![CDATA[$C$NOTHING]]></EXP>
+						<PAR Name="AdvancedOptions" />
+					</SET>
+					<ACTION_CALL Id="RDK:1589023" Name="RDEngineering_E2DManageShape">
+						<PAR Name="RDLibraryName">
+							<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+						</PAR>
+						<PAR Name="e2dMode">
+							<EXP><![CDATA[$C$0]]></EXP>
+						</PAR>
+						<PAR Name="libraryID">
+							<EXP><![CDATA[$=$GS2DLibraryName]]></EXP>
+						</PAR>
+						<PAR Name="operType">
+							<EXP><![CDATA[$C$0]]></EXP>
+						</PAR>
+						<PAR Name="shpId">
+							<EXP><![CDATA[$C$s_weiche_aktiv]]></EXP>
+						</PAR>
+						<PAR Name="catId">
+							<EXP><![CDATA[$C$c_Parts]]></EXP>
+						</PAR>
+						<PAR Name="shpItemId" />
+						<PAR Name="shpItem">
+							<EXP><![CDATA[$=$Shape_Prototype]]></EXP>
+						</PAR>
+						<PAR Name="shpItemList">
+							<EXP><![CDATA[$V$]]></EXP>
+						</PAR>
+						<PAR Name="shpList">
+							<EXP><![CDATA[$V$]]></EXP>
+						</PAR>
+						<PAR Name="outShapeIdList">
+							<EXP><![CDATA[$V$]]></EXP>
+						</PAR>
+						<PAR Name="Options" />
+					</ACTION_CALL>
+					<SET Id="RDK:1589024" VarRef="Shape_Prototype.WeicheDefinition.Weichenart">
+						<EXP><![CDATA[$C$Aktiv]]></EXP>
+						<PAR Name="AdvancedOptions" />
+					</SET>
+					<SET Id="RDK:1589025" VarRef="Shape_Prototype.name">
+						<EXP><![CDATA[$=$Shape_Prototype.family+" :"+(Count(FilterByFieldValue(ShapeList, "family", Shape_Prototype.family))+1)]]></EXP>
+						<PAR Name="AdvancedOptions" />
+					</SET>
+					<SET Id="RDK:1589026" VarRef="Shape_Prototype.WeicheDefinition.Beschreibung">
+						<EXP><![CDATA[$=$" zw. "+
+ShapeList["id="+Param.Input[0].shapeID].name+" und "+
+ShapeList["id="+Param.Input[1].shapeID].name
+]]></EXP>
+						<PAR Name="AdvancedOptions" />
+					</SET>
+					<SET_STRUCT Id="RDK:1589027" VarRef="Shape_Prototype" ListRef="ShapeList">
+						<PAR Name="SivasNummer" />
+						<PAR Name="Rotationsklasse" />
+						<PAR Name="KreiselDefinition" />
+						<PAR Name="EckradDefinition" />
+						<PAR Name="GefaelleDefinition" />
+						<PAR Name="WeicheDefinition" />
+						<PAR Name="source">
+							<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
+						</PAR>
+						<PAR Name="sourceLibrary" />
+						<PAR Name="signature" />
+						<PAR Name="id">
+							<EXP><![CDATA[$=$"Weiche_"+CreateGUID()]]></EXP>
+						</PAR>
+						<PAR Name="name" />
+						<PAR Name="family" />
+						<PAR Name="description" />
+						<PAR Name="x" />
+						<PAR Name="y" />
+						<PAR Name="z" />
+						<PAR Name="width">
+							<EXP><![CDATA[$=$ConvertFromPixel(Shape_Prototype.width, "mm", 96)
+]]></EXP>
+						</PAR>
+						<PAR Name="height">
+							<EXP><![CDATA[$=$ConvertFromPixel(Shape_Prototype.height, "mm", 96)]]></EXP>
+						</PAR>
+						<PAR Name="depth">
+							<EXP><![CDATA[$=$ConvertFromPixel(Shape_Prototype.depth, "mm", 96)]]></EXP>
+						</PAR>
+						<PAR Name="rotation" />
+						<PAR Name="text" />
+						<PAR Name="behaviour" />
+						<PAR Name="datadump" />
+						<PAR Name="path" />
+						<PAR Name="ctrl1x" />
+						<PAR Name="ctrl1y" />
+						<PAR Name="ctrl2x" />
+						<PAR Name="ctrl2y" />
+						<PAR Name="shapeFromId">
+							<EXP><![CDATA[$=$Param.Input[0].shapeID]]></EXP>
+						</PAR>
+						<PAR Name="shapeFromPointIndex">
+							<EXP><![CDATA[$=$Param.Input[0].connectionPointID]]></EXP>
+						</PAR>
+						<PAR Name="shapeToId">
+							<EXP><![CDATA[$=$Param.Input[1].shapeID]]></EXP>
+						</PAR>
+						<PAR Name="shapeToPointIndex">
+							<EXP><![CDATA[$=$Param.Input[1].connectionPointID]]></EXP>
+						</PAR>
+						<PAR Name="dimStack" />
+						<PAR Name="dimType" />
+						<PAR Name="dimDriving" />
+						<PAR Name="dimValue" />
+						<PAR Name="color" />
+						<PAR Name="colorOpacity" />
+						<PAR Name="color3D" />
+						<PAR Name="colorOpacity3D" />
+						<PAR Name="lineWidth" />
+						<PAR Name="lineColor" />
+						<PAR Name="lineOpacity" />
+						<PAR Name="lineColor3D" />
+						<PAR Name="lineOpacity3D" />
+						<PAR Name="links" />
+						<PAR Name="group" />
+						<PAR Name="layer">
+							<EXP><![CDATA[$C$Weiche]]></EXP>
+						</PAR>
+						<PAR Name="connectionPoints" />
+						<PAR Name="modified" />
+						<PAR Name="pinned" />
+						<PAR Name="selected" />
+						<PAR Name="includeInBOM" />
+					</SET_STRUCT>
+					<ACTION_CALL Id="RDK:1589028" Name="RDEngineering_E2DLinkShapes">
+						<PAR Name="RDLibraryName">
+							<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+						</PAR>
+						<PAR Name="libraryID">
+							<EXP><![CDATA[$=$GS2DLibraryName]]></EXP>
+						</PAR>
+						<PAR Name="shapeList">
+							<EXP><![CDATA[$=$ShapeList]]></EXP>
+						</PAR>
+						<PAR Name="shapeFromID">
+							<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
+						</PAR>
+						<PAR Name="shapeFromPointID">
+							<EXP><![CDATA[$C$cp0]]></EXP>
+						</PAR>
+						<PAR Name="shapeToID">
+							<EXP><![CDATA[$=$Param.Input[0].shapeID]]></EXP>
+						</PAR>
+						<PAR Name="shapeToPointID">
+							<EXP><![CDATA[$=$Param.Input[0].connectionPointID]]></EXP>
+						</PAR>
+						<PAR Name="shapeFromEventHandler">
+							<EXP><![CDATA[$V$]]></EXP>
+						</PAR>
+						<PAR Name="shapeToEventHandler">
+							<EXP><![CDATA[$V$]]></EXP>
+						</PAR>
+						<PAR Name="Options" />
+					</ACTION_CALL>
+				</GROUP>
+			</FUNCTION>
 		</GROUP>
 	</GROUP>
 	<GROUP Id="RDK:0008" Name="Main Group" SubType="Generic" Expanded="True">
@@ -12350,6 +12546,20 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<PAR Name="AdvancedOptions" />
 				</SET>
 			</GROUP>
+			<GROUP Id="RDK:1567814" Name="Eckrad" SubType="Generic">
+				<SET_STRUCT Id="RDK:1567816" VarRef="EckradData_defaults" ClearAll="True">
+					<PAR Name="Beschreibung" />
+					<PAR Name="Hoehe">
+						<EXP><![CDATA[$C$2000]]></EXP>
+					</PAR>
+					<PAR Name="Drehung">
+						<EXP><![CDATA[$C$1]]></EXP>
+					</PAR>
+					<PAR Name="Durchmesser">
+						<EXP><![CDATA[$C$800]]></EXP>
+					</PAR>
+				</SET_STRUCT>
+			</GROUP>
 		</GROUP>
 		<GROUP Id="RDK:326" Name="UI" SubType="Generic">
 			<WHILELOOP Id="RDK:328">