diff --git a/Editor2DLibrary/SSG/shapes/img/BTMTBeladung_32.png b/Editor2DLibrary/SSG/shapes/img/BTMTBeladung_32.png
index 02ea543..67145e5 100644
Binary files a/Editor2DLibrary/SSG/shapes/img/BTMTBeladung_32.png and b/Editor2DLibrary/SSG/shapes/img/BTMTBeladung_32.png differ
diff --git a/Editor2DLibrary/SSG/shapes/img/BTMTBeladung_64.png b/Editor2DLibrary/SSG/shapes/img/BTMTBeladung_64.png
index 09c7e47..6ed2908 100644
Binary files a/Editor2DLibrary/SSG/shapes/img/BTMTBeladung_64.png and b/Editor2DLibrary/SSG/shapes/img/BTMTBeladung_64.png differ
diff --git a/Editor2DLibrary/SSG/shapes/props/BTMTBeladung_Links.txt b/Editor2DLibrary/SSG/shapes/props/BTMTBeladung_Links.txt
index bc3630d..b91a01a 100644
--- a/Editor2DLibrary/SSG/shapes/props/BTMTBeladung_Links.txt
+++ b/Editor2DLibrary/SSG/shapes/props/BTMTBeladung_Links.txt
@@ -27,5 +27,6 @@
       "label": "",
       "isDimension": true
     }
-  ]
+  ],
+  "eventClass": "OnDoubleclick,OnInserted,OnPasted,OnLinked"
 }
\ No newline at end of file
diff --git a/Editor2DLibrary/SSG/shapes/props/BTMTBeladung_Rechts.txt b/Editor2DLibrary/SSG/shapes/props/BTMTBeladung_Rechts.txt
index 165deec..235dbd6 100644
--- a/Editor2DLibrary/SSG/shapes/props/BTMTBeladung_Rechts.txt
+++ b/Editor2DLibrary/SSG/shapes/props/BTMTBeladung_Rechts.txt
@@ -27,5 +27,6 @@
       "label": "",
       "isDimension": true
     }
-  ]
+  ],
+  "eventClass": "OnDoubleclick,OnInserted,OnPasted,OnLinked"
 }
\ No newline at end of file
diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index d1d3ba8..fe16b4b 100644
--- a/MAIN_SSG.rdx
+++ b/MAIN_SSG.rdx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PROCESS Id="RDK:0001" Name="MAIN_SSG" ModernUI="True" Options="(GITSAVEMODE)(NOUPDATEINCLUDEFILES)" Expanded="True">
-	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="s.schmutzler [ANGEBOT-NB06]" ModDate="2024-01-31T16:24:02" LanguageVersion="2014.1.3.627" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="s.schmutzler [ANGEBOT-NB06]" ModDate="2024-02-05T11:14:44" LanguageVersion="2014.1.3.627" />
 	<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">
@@ -65,7 +65,7 @@
 					<FIELD Id="RDK:973716" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:973714" Name="Weichenart" Type="string" />
 				</TYPE>
-				<TYPE Id="RDK:1652525" Name="BTMTBeladungType" SubType="structure">
+				<TYPE Id="RDK:1652525" Name="BTMTBeladungType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:1652521" Name="AbstandMS" Type="double" Suppressed="True" />
 					<FIELD Id="RDK:1652522" Name="Hoehe" Type="double" />
@@ -73,7 +73,7 @@
 					<FIELD Id="RDK:1657744" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:1652524" Name="Durchmesser" Type="double" Suppressed="True" />
 				</TYPE>
-				<TYPE Id="RDK:79642" Name="SSG_ShapeType" SubType="structure">
+				<TYPE Id="RDK:79642" Name="SSG_ShapeType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:79643" Name="SivasNummer" Type="string" />
 					<FIELD Id="RDK:1561689" Name="Rotationsklasse" Type="string" />
@@ -84,7 +84,7 @@
 					<FIELD Id="RDK:973719" Name="WeicheDefinition" Type="WeicheType" />
 					<FIELD Id="RDK:1652536" Name="BTMTBeladungDefinition" Type="BTMTBeladungType" />
 				</TYPE>
-				<TYPE Id="RDK:1783792" Name="SSGParameter" Expanded="True" SubType="structure" HasArrayType="True">
+				<TYPE Id="RDK:1783792" Name="SSGParameter" SubType="structure" HasArrayType="True">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:1783794" Name="Key" Type="string" />
 					<FIELD Id="RDK:1789531" Name="Str" Type="string" />
@@ -186,7 +186,7 @@
 					<FIELD Id="RDK:1013892" Name="userFilter" Type="string" />
 					<FIELD Id="RDK:1013893" Name="styleTags" Type="string" />
 				</TYPE>
-				<TYPE Id="RDK:1013942" Name="Editor2DShapeType" Expanded="True" SubType="structure" InheritTypeName="SSG_ShapeType">
+				<TYPE Id="RDK:1013942" Name="Editor2DShapeType" SubType="structure" InheritTypeName="SSG_ShapeType">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:1013895" Name="source" Type="string" />
 					<FIELD Id="RDK:1013896" Name="sourceLibrary" Type="string" />
@@ -701,7 +701,7 @@
 					<TYPE_VALUES />
 					<FIELD Id="RDK:1664607" Name="Höhe in m" Type="string" />
 				</TYPE>
-				<TYPE Id="RDK:1668585" Name="BTMTBeladungMerkmaleType" SubType="structure" DesignTimeNotes="{ &quot;Abstand (Kreiselachse A - Kreiselachse) in Meter&quot;: &quot;4.5&quot;, &quot;Anzahl der Separatoren&quot;:&quot;2&quot;, &quot;Anzahl der Scanner&quot;:&quot;1&quot;, &quot;Anzahl der Scanner&quot;:&quot;1&quot;, &quot;Anzahl der Weichen&quot;: &quot;4&quot;  }">
+				<TYPE Id="RDK:1668585" Name="BTMTBeladungMerkmaleType" Expanded="True" SubType="structure" DesignTimeNotes="{ &quot;Abstand (Kreiselachse A - Kreiselachse) in Meter&quot;: &quot;4.5&quot;, &quot;Anzahl der Separatoren&quot;:&quot;2&quot;, &quot;Anzahl der Scanner&quot;:&quot;1&quot;, &quot;Anzahl der Scanner&quot;:&quot;1&quot;, &quot;Anzahl der Weichen&quot;: &quot;4&quot;  }">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:1668591" Name="Höhe in m" Type="string" Suppressed="True" />
 				</TYPE>
@@ -768,6 +768,7 @@
 				<VAR Id="RDK:112239" Name="KreiselData_defaults" Type="KreiselType" />
 				<VAR Id="RDK:1520435" Name="EckradData_defaults" Type="EckradType" />
 				<VAR Id="RDK:837487" Name="GefaelleData_defaults" Type="GefaelleType" />
+				<VAR Id="RDK:1652538" Name="BTMTBeladungData_defaults" Type="BTMTBeladungType" />
 				<GROUP Id="RDK:93797" Name="Background" SubType="VarSet" IncludeDate="0">
 					<VAR Id="RDK:382" Name="ImportBackgroundData" Type="ImportBackgroundType" />
 				</GROUP>
@@ -777,15 +778,16 @@
 				</GROUP>
 				<VAR Id="RDK:439249" Name="ConnectionPointItem" Type="Editor2DConnectionPointType" />
 				<VAR Id="RDK:591734" Name="ConnectionPointList" Type="Editor2DConnectionPointTypeList" />
-				<VAR Id="RDK:1652538" Name="BTMTBeladungData_defaults" Type="BTMTBeladungType" />
 				<VAR Id="RDK:1789532" Name="SSGParameterList" Type="SSGParameter[]" />
 				<VAR Id="RDK:1789534" Name="SSGParameter" Type="SSGParameter" />
 			</GROUP>
 			<GROUP Id="RDK:314272" Name="MUI" SubType="VarSet" IncludeDate="0">
 				<VAR Id="RDK:426767" Name="KreiselData" Type="KreiselType" />
 				<VAR Id="RDK:1520551" Name="EckradData" Type="EckradType" />
+				<VAR Id="RDK:1810763" Name="BTMTBeladungData" Type="BTMTBeladungType" />
 				<VAR Id="RDK:397366" Name="Render_Kreisel" Type="MUIPanelType[]" />
 				<VAR Id="RDK:1545832" Name="Render_Eckrad" Type="MUIPanelType[]" />
+				<VAR Id="RDK:1810765" Name="Render_BTMTBeladung" Type="MUIPanelType[]" />
 				<VAR Id="RDK:397368" Name="Render_Gefaelle" Type="MUIPanelType[]" />
 				<VAR Id="RDK:973744" Name="Render_Weiche" Type="MUIPanelType[]" />
 				<VAR Id="RDK:532690" Name="Render_CP" Type="MUIPanelType[]" />
@@ -3049,6 +3051,59 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 							<PAR Name="eventHandlers" />
 						</SET_STRUCT>
 					</FUNCTION>
+					<FUNCTION Id="RDK:1653110" Name="CreatePrototype_BTMTBeladung">
+						<GROUP Id="RDK:1653106" Name="Local Variables" SubType="VarSet" IncludeDate="0" />
+						<COMMENTS Id="RDK:1653107" DesignTimeRemark="Angle definition in GS2D" DesignTimeNotes="           0&#xD;&#xA;            |&#xD;&#xA;270 &lt;-------&gt;90&#xD;&#xA;            |&#xD;&#xA;          180&#xD;&#xA;" />
+						<SET Id="RDK:1653108" VarRef="Property_Prototype">
+							<EXP><![CDATA[$=$Shape_Prototype]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<SET_STRUCT Id="RDK:1653109" VarRef="Property_Prototype">
+							<PAR Name="id" />
+							<PAR Name="name" />
+							<PAR Name="family" />
+							<PAR Name="description" />
+							<PAR Name="text" />
+							<PAR Name="shapeMode" />
+							<PAR Name="icon" />
+							<PAR Name="iconBig" />
+							<PAR Name="image" />
+							<PAR Name="srcSVG" />
+							<PAR Name="src3D" />
+							<PAR Name="srcTexture3D" />
+							<PAR Name="width">
+								<EXP><![CDATA[$=$ConvertToPixel(Property_Prototype.width, "mm", 96)]]></EXP>
+							</PAR>
+							<PAR Name="height">
+								<EXP><![CDATA[$=$ConvertToPixel(Property_Prototype.height, "mm", 96)]]></EXP>
+							</PAR>
+							<PAR Name="depth">
+								<EXP><![CDATA[$=$ConvertToPixel(Property_Prototype.depth, "mm", 96)]]></EXP>
+							</PAR>
+							<PAR Name="behaviour" />
+							<PAR Name="help" />
+							<PAR Name="eventClass" />
+							<PAR Name="linkClass" />
+							<PAR Name="collisionClass" />
+							<PAR Name="containerClass" />
+							<PAR Name="snapClass" />
+							<PAR Name="color" />
+							<PAR Name="colorOpacity" />
+							<PAR Name="lineColor" />
+							<PAR Name="lineColorOpacity" />
+							<PAR Name="color3D" />
+							<PAR Name="colorOpacity3D" />
+							<PAR Name="lineColor3D" />
+							<PAR Name="lineColorOpacity3D" />
+							<PAR Name="custom" />
+							<PAR Name="connectionPoints" />
+							<PAR Name="group2dShapes" />
+							<PAR Name="group2dConnectors" />
+							<PAR Name="group3d" />
+							<PAR Name="eventHandler" />
+							<PAR Name="eventHandlers" />
+						</SET_STRUCT>
+					</FUNCTION>
 					<FUNCTION Id="RDK:439270" Name="Create/Update Shape">
 						<GROUP Id="RDK:439268" Name="Local Variables" SubType="VarSet" IncludeDate="0">
 							<VAR Id="RDK:439269" Name="ID" Type="string" />
@@ -3148,12 +3203,15 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 									<COMMENTS Id="RDK:1013816" Bookmarked="True" DesignTimeRemark="Inherit Rotation" />
 									<SET_STRUCT Id="RDK:93829" 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" />
 										<PAR Name="KreiselDefinition">
 											<EXP><![CDATA[$=$KreiselData]]></EXP>
 										</PAR>
 										<PAR Name="EckradDefinition" />
 										<PAR Name="GefaelleDefinition" />
 										<PAR Name="WeicheDefinition" />
+										<PAR Name="BTMTBeladungDefinition" />
 										<PAR Name="source">
 											<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
 										</PAR>
@@ -4304,59 +4362,6 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 							</FOREACHLOOP>
 						</WHILELOOP>
 					</FUNCTION>
-					<FUNCTION Id="RDK:1653110" Name="CreatePrototype_BTMTBeladung">
-						<GROUP Id="RDK:1653106" Name="Local Variables" SubType="VarSet" IncludeDate="0" />
-						<COMMENTS Id="RDK:1653107" DesignTimeRemark="Angle definition in GS2D" DesignTimeNotes="           0&#xD;&#xA;            |&#xD;&#xA;270 &lt;-------&gt;90&#xD;&#xA;            |&#xD;&#xA;          180&#xD;&#xA;" />
-						<SET Id="RDK:1653108" VarRef="Property_Prototype">
-							<EXP><![CDATA[$=$Shape_Prototype]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET_STRUCT Id="RDK:1653109" VarRef="Property_Prototype">
-							<PAR Name="id" />
-							<PAR Name="name" />
-							<PAR Name="family" />
-							<PAR Name="description" />
-							<PAR Name="text" />
-							<PAR Name="shapeMode" />
-							<PAR Name="icon" />
-							<PAR Name="iconBig" />
-							<PAR Name="image" />
-							<PAR Name="srcSVG" />
-							<PAR Name="src3D" />
-							<PAR Name="srcTexture3D" />
-							<PAR Name="width">
-								<EXP><![CDATA[$=$ConvertToPixel(Property_Prototype.width, "mm", 96)]]></EXP>
-							</PAR>
-							<PAR Name="height">
-								<EXP><![CDATA[$=$ConvertToPixel(Property_Prototype.height, "mm", 96)]]></EXP>
-							</PAR>
-							<PAR Name="depth">
-								<EXP><![CDATA[$=$ConvertToPixel(Property_Prototype.depth, "mm", 96)]]></EXP>
-							</PAR>
-							<PAR Name="behaviour" />
-							<PAR Name="help" />
-							<PAR Name="eventClass" />
-							<PAR Name="linkClass" />
-							<PAR Name="collisionClass" />
-							<PAR Name="containerClass" />
-							<PAR Name="snapClass" />
-							<PAR Name="color" />
-							<PAR Name="colorOpacity" />
-							<PAR Name="lineColor" />
-							<PAR Name="lineColorOpacity" />
-							<PAR Name="color3D" />
-							<PAR Name="colorOpacity3D" />
-							<PAR Name="lineColor3D" />
-							<PAR Name="lineColorOpacity3D" />
-							<PAR Name="custom" />
-							<PAR Name="connectionPoints" />
-							<PAR Name="group2dShapes" />
-							<PAR Name="group2dConnectors" />
-							<PAR Name="group3d" />
-							<PAR Name="eventHandler" />
-							<PAR Name="eventHandlers" />
-						</SET_STRUCT>
-					</FUNCTION>
 				</GROUP>
 				<FUNCTION Id="RDK:900059" Name="GetPlanquadratPosition">
 					<GROUP Id="RDK:900057" Name="Local Variables" SubType="VarSet" IncludeDate="0">
@@ -6085,6 +6090,7 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 							<EXP><![CDATA[$V$EventData]]></EXP>
 						</PAR>
 						<PAR Name="Options" />
+						<PAR Name="ProfileName" />
 					</ACTION_CALL>
 					<SELECTCASE Id="RDK:618333">
 						<EXP><![CDATA[$=$Button]]></EXP>
@@ -8560,7 +8566,7 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 								<EXP><![CDATA[$C$CreatePrototype_BTMTBeladung]]></EXP>
 							</PAR>
 							<PAR Name="InputExp">
-								<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
+								<EXP><![CDATA[$=$]]></EXP>
 							</PAR>
 							<PAR Name="ResultRef">
 								<EXP><![CDATA[$V$]]></EXP>
@@ -8614,13 +8620,14 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 					</CALLFUNCTION>
 				</GROUP>
 				<EXEC_ON_VALUES Id="RDK:1007425" VarRef="ShapeList" Suppressed="True">
-					<PAR Name="layer">
-						<EXP><![CDATA[$=$me.family]]></EXP>
-					</PAR>
 					<PAR Name="SivasNummer" />
+					<PAR Name="Rotationsklasse" />
+					<PAR Name="IDCounter" />
 					<PAR Name="KreiselDefinition" />
+					<PAR Name="EckradDefinition" />
 					<PAR Name="GefaelleDefinition" />
 					<PAR Name="WeicheDefinition" />
+					<PAR Name="BTMTBeladungDefinition" />
 					<PAR Name="source" />
 					<PAR Name="sourceLibrary" />
 					<PAR Name="signature" />
@@ -8662,13 +8669,14 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 					<PAR Name="lineOpacity3D" />
 					<PAR Name="links" />
 					<PAR Name="group" />
+					<PAR Name="layer">
+						<EXP><![CDATA[$=$me.family]]></EXP>
+					</PAR>
 					<PAR Name="connectionPoints" />
 					<PAR Name="modified" />
 					<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)">
@@ -9774,16 +9782,17 @@ me.x
 							<EXP><![CDATA[$=$Shape_Prototype.BTMTBeladungDefinition.Drehung]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
+						<COMMENTS Id="RDK:1812491" DesignTimeRemark="//Hole Drehung von verbundenem Element" />
 						<SELECTCASE Id="RDK:1653205">
 							<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family]]></EXP>
 							<CASEGROUP Id="RDK:1653202" CaseType="0">
 								<EXP><![CDATA[$C$Kreisel]]></EXP>
-								<SET Id="RDK:1653201" VarRef="Shape_Prototype.EckradDefinition.Drehung">
-									<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].KreiselDefinition.Drehung*(-1)]]></EXP>
+								<SET Id="RDK:1653201" VarRef="Shape_Prototype.BTMTBeladungDefinition.Drehung">
+									<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].KreiselDefinition.Drehung]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 							</CASEGROUP>
-							<CASEGROUP Id="RDK:1653204" CaseType="0">
+							<CASEGROUP Id="RDK:1653204" CaseType="0" Suppressed="True">
 								<EXP><![CDATA[$C$Eckrad]]></EXP>
 								<SET Id="RDK:1653203" VarRef="Shape_Prototype.EckradDefinition.Drehung">
 									<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].EckradDefinition.Drehung*(-1)]]></EXP>
@@ -9791,7 +9800,7 @@ me.x
 								</SET>
 							</CASEGROUP>
 						</SELECTCASE>
-						<GROUP Id="RDK:1653207" Name="Group" SubType="Generic">
+						<GROUP Id="RDK:1653207" Name="Group" SubType="Generic" Suppressed="True">
 							<VALUECONDITION Value="true">
 								<EXP><![CDATA[$=$Shape_Prototype.rotation=""]]></EXP>
 							</VALUECONDITION>
@@ -9824,79 +9833,6 @@ me.x
 							</PAR>
 							<PAR Name="Options" />
 						</CALLFUNCTION>
-						<IFTHENELSE Id="RDK:1653221">
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$OriginalRatation<>Shape_Prototype.BTMTBeladungDefinition.Drehung]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:1653218" SubType="Then">
-								<GROUP Id="RDK:1653216" Name="Find Children" SubType="Generic">
-									<SET Id="RDK:1653210" VarRef="LinkedShapeIDs">
-										<EXP><![CDATA[$C$NOTHING]]></EXP>
-										<PAR Name="AdvancedOptions" />
-									</SET>
-									<FOREACHLOOP Id="RDK:1653214" ItemVarRef="Link">
-										<PAR Name="ArrayValueExp">
-											<EXP><![CDATA[$=$Shape_Prototype.links]]></EXP>
-										</PAR>
-										<PAR Name="ExitCondExp">
-											<EXP><![CDATA[$V$]]></EXP>
-										</PAR>
-										<SET Id="RDK:1653211" VarRef="Link">
-											<EXP><![CDATA[$=$StrAfter(Link, ";")]]></EXP>
-											<PAR Name="AdvancedOptions" />
-										</SET>
-										<GROUP Id="RDK:1653213" Name="Group" SubType="Generic">
-											<VALUECONDITION Value="true">
-												<EXP><![CDATA[$=$Not (Link=Param.Input[1].shapeID)]]></EXP>
-											</VALUECONDITION>
-											<LIST_ADD Id="RDK:1653212" ListRef="LinkedShapeIDs">
-												<PAR Name="VALUE_TO_ADD">
-													<EXP><![CDATA[$=$Link]]></EXP>
-												</PAR>
-												<PAR Name="POS_TO_ADD" />
-											</LIST_ADD>
-										</GROUP>
-									</FOREACHLOOP>
-									<CALLFUNCTION Id="RDK:1653215">
-										<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:1653217">
-									<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:1653220" SubType="Else">
-								<COMMENTS Id="RDK:1653219" DesignTimeRemark="No children rotation needed" />
-							</GROUP>
-						</IFTHENELSE>
-						<CALLFUNCTION Id="RDK:1653222">
-							<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>
 					</CASEGROUP>
 					<CASEGROUP Id="RDK:1576708" CaseType="1">
 						<EXP />
@@ -10310,171 +10246,181 @@ me.x
 				</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;">
+				<IFTHENELSE Id="RDK:1817729">
 					<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>
+						<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family="BTMTBeladung" or ShapeList["id="+Param.Input[1].shapeID].family="BTMTBeladung" ]]></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. "+
+					<GROUP Id="RDK:1817730" SubType="Then">
+						<COMMENTS Id="RDK:1817746" DesignTimeRemark="Anbaugruppe -&gt; keine Weiche" />
+					</GROUP>
+					<GROUP Id="RDK:1817731" SubType="Else">
+						<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)
+								<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>
+								</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>
+					</GROUP>
+				</IFTHENELSE>
 			</FUNCTION>
 			<FUNCTION Id="RDK:1630766" Name="GetNewShapeID" InputTypeName="string">
 				<SET Id="RDK:1630768" VarRef="Shape_Prototype.IDCounter" ByRef="True">