diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 2fc1c0c..ebc6255 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="y.wang [ANGEBOT-NB02]" ModDate="2025-11-18T12:46:27" LanguageVersion="2014.1.3.712" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2025-11-21T19:48:56" LanguageVersion="2014.1.3.712" />
 	<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">
@@ -25,7 +25,7 @@
 					<FIELD Id="RDK:20734834" Name="direction_x" Type="double" DesignTimeRemark="1 if direction posititve x-axis, -1 if is negative x-axis, 0 if it is in y-direction" />
 					<FIELD Id="RDK:20734836" Name="direction_y" Type="double" DesignTimeRemark="1 if direction posititve y-axis, -1 if is negative y-axis, 0 if it is in x-direction" />
 				</TYPE>
-				<TYPE Id="RDK:26388" Name="KreiselType" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:26388" Name="KreiselType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:95024" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:26389" Name="AbstandMS" Type="double" />
@@ -52,7 +52,7 @@
 					<FIELD Id="RDK:1561130" Name="depth_PinBand" Type="integer" DesignTimeNotes="Höhe der BounddingBox für den Band" />
 					<FIELD Id="RDK:19929929" Name="height_PinBand" Type="integer" DesignTimeNotes="Breite der BounddingBox für den Band" />
 				</TYPE>
-				<TYPE Id="RDK:1520433" Name="EckradType" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:1520433" Name="EckradType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:1520415" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:1520417" Name="Hoehe" Type="double" />
@@ -968,7 +968,7 @@
 					<FIELD Id="RDK:22353200" Name="Anzahl" Type="integer" DesignTimeNotes="Bezeichnung sollte vom Benutzer jedem Objekt zugewiesen werden können, um in den Listen besser ein Verständnis zu diesem Objekt zu finden" />
 					<FIELD Id="RDK:22305596" Name="Merkmale" Type="string" DesignTimeNotes="Merkmale sind die vom Nutzer angegebenen Merkmale dieses Objeks, Z.B. Abstand der Motor zur Spannstation, Höhe, usw." />
 				</TYPE>
-				<TYPE Id="RDK:900066" Name="KreiselMerkmaleType" 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 Id="RDK:900066" Name="KreiselMerkmaleType" 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:900067" Name="Abstand (Kreiselachse A - Kreiselachse) in Meter" Type="string" />
 					<FIELD Id="RDK:900069" Name="Anzahl der Separatoren" Type="string" />
@@ -1039,7 +1039,7 @@
 					<TYPE_VALUES />
 					<FIELD Id="RDK:973723" Name="Weichenart" Type="string" />
 				</TYPE>
-				<TYPE Id="RDK:1664608" Name="EckradMerkmaleType" 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 Id="RDK:1664608" Name="EckradMerkmaleType" 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:1664607" Name="Höhe in m" Type="string" />
 					<FIELD Id="RDK:26456392" Name="Drehrichtung" Type="string" />
@@ -10911,6 +10911,362 @@ SSGConnectionPoint.x_M
 						</PAR>
 					</SET_STRUCT>
 				</FUNCTION>
+				<GROUP Id="RDK:26484590" Name="TEF" SubType="FunctionSet" IncludeDate="0">
+					<FUNCTION Id="RDK:26448110" Name="stretchTEFGerade" DesignTimeRemark="increases the lenght of the TEFGerade that it fits to the next connectionPoint" InputTypeName="Editor2DEventArgumentsTypeList" ResultTypeName="string">
+						<GROUP Id="RDK:26448101" Name="Local Variables" SubType="VarSet" IncludeDate="0">
+							<VAR Id="RDK:26448089" Name="partner1" Type="string">
+								<SET Id="RDK:26448088" VarRef="Me">
+									<EXP><![CDATA[$=$Param.Input[0].shapeid]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</VAR>
+							<VAR Id="RDK:26448091" Name="partner2" Type="string">
+								<SET Id="RDK:26448090" VarRef="Me">
+									<EXP><![CDATA[$=$Param.Input[1].shapeid]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</VAR>
+							<VAR Id="RDK:26448093" Name="Shape1" Type="Editor2DShapeType">
+								<SET Id="RDK:26448092" VarRef="Me">
+									<EXP><![CDATA[$=$ShapeList["id="+partner1]]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</VAR>
+							<VAR Id="RDK:26448095" Name="Shape2" Type="Editor2DShapeType">
+								<SET Id="RDK:26448094" VarRef="Me">
+									<EXP><![CDATA[$=$ShapeList["id="+partner2]]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</VAR>
+							<VAR Id="RDK:26448096" Name="cp1" Type="Editor2DConnectionPointType" />
+							<VAR Id="RDK:26448097" Name="cp2" Type="Editor2DConnectionPointType" />
+							<VAR Id="RDK:26448098" Name="ConTypeList1" Type="Editor2DConnectionPointTypeList" />
+							<VAR Id="RDK:26448099" Name="ConTypeList2" Type="Editor2DConnectionPointTypeList" />
+							<VAR Id="RDK:26448100" Name="distance" Type="double" />
+						</GROUP>
+					</FUNCTION>
+					<FUNCTION Id="RDK:26409350" Name="createTEFConnection" DesignTimeRemark="creates a TEF Connection" ResultTypeName="string">
+						<GROUP Id="RDK:26409353" Name="Local Variables" SubType="VarSet" IncludeDate="0">
+							<VAR Id="RDK:26409357" Name="shapeId" Type="string">
+								<SET Id="RDK:26409356" VarRef="Me">
+									<EXP><![CDATA[$=$Param.Input]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</VAR>
+							<VAR Id="RDK:26411329" Name="partner1" Type="string">
+								<SET Id="RDK:26411333" VarRef="Me">
+									<EXP><![CDATA[$=$Shape_Prototype.shapeFromId]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</VAR>
+							<VAR Id="RDK:26411331" Name="partner2" Type="string">
+								<SET Id="RDK:26411335" VarRef="Me">
+									<EXP><![CDATA[$=$Shape_Prototype.shapeToId]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</VAR>
+							<VAR Id="RDK:26415286" Name="Shape1" Type="Editor2DShapeType">
+								<SET Id="RDK:26415279" VarRef="Me">
+									<EXP><![CDATA[$=$ShapeList["id="+partner1]]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</VAR>
+							<VAR Id="RDK:26415288" Name="Shape2" Type="Editor2DShapeType">
+								<SET Id="RDK:26415291" VarRef="Me">
+									<EXP><![CDATA[$=$ShapeList["id="+partner2]]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</VAR>
+							<VAR Id="RDK:26415304" Name="cp1" Type="Editor2DConnectionPointType" />
+							<VAR Id="RDK:26416316" Name="cp2" Type="Editor2DConnectionPointType" />
+							<VAR Id="RDK:26416314" Name="cp_anfang" Type="Editor2DConnectionPointType" />
+							<VAR Id="RDK:26415306" Name="cp_ende" Type="Editor2DConnectionPointType" />
+							<VAR Id="RDK:26416298" Name="ConTypeList1" Type="Editor2DConnectionPointTypeList" />
+							<VAR Id="RDK:26416325" Name="ConTypeList2" Type="Editor2DConnectionPointTypeList" />
+							<VAR Id="RDK:26416337" Name="distance" Type="double" />
+							<VAR Id="RDK:26416351" Name="LinkListe" Type="SSGParameter[]" />
+							<VAR Id="RDK:26417385" Name="Offsets" Type="SSGParameter[]" />
+						</GROUP>
+						<IFTHENELSE Id="RDK:26415267">
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$Shape1.family = "TEFUmlenk"]]></EXP>
+							</VALUECONDITION>
+							<VALUECONDITION Value="true" Oper="OR">
+								<EXP><![CDATA[$=$Shape2.family = "TEFGerade"]]></EXP>
+							</VALUECONDITION>
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$Shape2.family = "TEFUmlenk"]]></EXP>
+							</VALUECONDITION>
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$Shape1.family = "TEFGerade"]]></EXP>
+							</VALUECONDITION>
+							<GROUP Id="RDK:26415273" SubType="Then">
+								<SET Id="RDK:26415275" VarRef="ConTypeList1">
+									<EXP><![CDATA[$=$FromJSON(Shape1.connectionPoints)]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET Id="RDK:26416318" VarRef="cp1" DesignTimeRemark="Motor und Spannstation haben nur zwei Cps. Tef sind die Verbindung von cp1">
+									<EXP><![CDATA[$=$ConTypeList1[0]]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET Id="RDK:26416320" VarRef="ConTypeList2">
+									<EXP><![CDATA[$=$FromJSON(Shape2.connectionPoints)]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET Id="RDK:26416322" VarRef="cp2" DesignTimeRemark="Motor und Spannstation haben nur zwei Cps. Tef sind die Verbindung von cp1">
+									<EXP><![CDATA[$=$ConTypeList2[0]]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET Id="RDK:26416338" VarRef="distance">
+									<EXP><![CDATA[$=$IIF(Abs(cp1.x - cp2.x)>=Abs(cp1.y - cp2.y), Abs(cp1.x - cp2.x), Abs(cp1.y - cp2.y))]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET Id="RDK:26417397" VarRef="Property_Prototype">
+									<EXP><![CDATA[$C$NOTHING]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET Id="RDK:26422344" VarRef="Property_Prototype.eventClass">
+									<EXP><![CDATA[$C$OnDoubleclick,OnInserted,OnLinked,OnPasted]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET_STRUCT Id="RDK:26417403" VarRef="Property_Prototype" DesignTimeRemark="Id Nullen, damit in Folge eine neue erzeugt wird.">
+									<PAR Name="id">
+										<EXP><![CDATA[$C$NOTHING]]></EXP>
+									</PAR>
+									<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" />
+									<PAR Name="height" />
+									<PAR Name="depth" />
+									<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>
+								<SET_STRUCT Id="RDK:26417401" VarRef="Shape_Prototype">
+									<PAR Name="SivasNummer" />
+									<PAR Name="Rotationsklasse" />
+									<PAR Name="IDCounter" />
+									<PAR Name="KreiselDefinition" />
+									<PAR Name="EckradDefinition" />
+									<PAR Name="GefaelleDefinition" />
+									<PAR Name="VarioFoerdererDefinition" />
+									<PAR Name="KurveDefinition" />
+									<PAR Name="TEFBogenDefinition" />
+									<PAR Name="TEFGeradeDefinition" />
+									<PAR Name="TEFUmlenkDefinition" />
+									<PAR Name="KurveFoerdererDefinition" />
+									<PAR Name="OFGeradeDefinition" />
+									<PAR Name="OFBogenDefinition" />
+									<PAR Name="OFWeicheDefinition" />
+									<PAR Name="WeicheDefinition" />
+									<PAR Name="BTMTBeladungDefinition" />
+									<PAR Name="BTMTEntladungDefinition" />
+									<PAR Name="isDefined">
+										<EXP><![CDATA[$C$True]]></EXP>
+									</PAR>
+									<PAR Name="source">
+										<EXP><![CDATA[$C$s_TEFGerade]]></EXP>
+									</PAR>
+									<PAR Name="sourceLibrary">
+										<EXP><![CDATA[$C$SSG]]></EXP>
+									</PAR>
+									<PAR Name="signature" />
+									<PAR Name="id">
+										<EXP><![CDATA[$C$NOTHING]]></EXP>
+									</PAR>
+									<PAR Name="name" />
+									<PAR Name="family">
+										<EXP><![CDATA[$C$TEFGerade]]></EXP>
+									</PAR>
+									<PAR Name="description" />
+									<PAR Name="x">
+										<EXP><![CDATA[$=$(cp1.x+cp2.x)/2]]></EXP>
+									</PAR>
+									<PAR Name="y">
+										<EXP><![CDATA[$=$(cp1.y+cp2.y)/2]]></EXP>
+									</PAR>
+									<PAR Name="z">
+										<EXP><![CDATA[$C$0]]></EXP>
+									</PAR>
+									<PAR Name="width">
+										<EXP><![CDATA[$C$42]]></EXP>
+									</PAR>
+									<PAR Name="height">
+										<EXP><![CDATA[$C$1000]]></EXP>
+									</PAR>
+									<PAR Name="depth">
+										<EXP><![CDATA[$C$110]]></EXP>
+									</PAR>
+									<PAR Name="rotation" />
+									<PAR Name="text" />
+									<PAR Name="behaviour">
+										<EXP><![CDATA[$C$(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)]]></EXP>
+									</PAR>
+									<PAR Name="datadump" />
+									<PAR Name="path" />
+									<PAR Name="ctrl1x">
+										<EXP><![CDATA[$C$-1]]></EXP>
+									</PAR>
+									<PAR Name="ctrl1y">
+										<EXP><![CDATA[$C$-1]]></EXP>
+									</PAR>
+									<PAR Name="ctrl2x">
+										<EXP><![CDATA[$C$-1]]></EXP>
+									</PAR>
+									<PAR Name="ctrl2y">
+										<EXP><![CDATA[$C$-1]]></EXP>
+									</PAR>
+									<PAR Name="shapeFromId" />
+									<PAR Name="shapeFromPointIndex" />
+									<PAR Name="shapeToId" />
+									<PAR Name="shapeToPointIndex" />
+									<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">
+										<EXP><![CDATA[$C$#f33256]]></EXP>
+									</PAR>
+									<PAR Name="lineOpacity">
+										<EXP><![CDATA[$C$1]]></EXP>
+									</PAR>
+									<PAR Name="lineColor3D">
+										<EXP><![CDATA[$C$1]]></EXP>
+									</PAR>
+									<PAR Name="lineOpacity3D" />
+									<PAR Name="links" />
+									<PAR Name="group" />
+									<PAR Name="layer">
+										<EXP><![CDATA[$C$Strecke]]></EXP>
+									</PAR>
+									<PAR Name="connectionPoints" />
+									<PAR Name="modified">
+										<EXP><![CDATA[$C$True]]></EXP>
+									</PAR>
+									<PAR Name="pinned" />
+									<PAR Name="selected" />
+									<PAR Name="includeInBOM" />
+								</SET_STRUCT>
+								<ACTION_CALL Id="RDK:26417405" 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$2]]></EXP>
+									</PAR>
+									<PAR Name="shpId">
+										<EXP><![CDATA[$C$c_Session]]></EXP>
+									</PAR>
+									<PAR Name="catId">
+										<EXP><![CDATA[$C$c_Session]]></EXP>
+									</PAR>
+									<PAR Name="shpItemId" />
+									<PAR Name="shpItem">
+										<EXP><![CDATA[$=$Property_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>
+								<CALLFUNCTION Id="RDK:26417407">
+									<PAR Name="FuncName">
+										<EXP><![CDATA[$C$GetNewShapeIDCounter]]></EXP>
+									</PAR>
+									<PAR Name="InputExp" />
+									<PAR Name="ResultRef">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+									<PAR Name="Options" />
+								</CALLFUNCTION>
+								<SET Id="RDK:26417409" VarRef="Shape_Prototype.name">
+									<EXP><![CDATA[$=$Shape_Prototype.family+" :"+Shape_Prototype.IDCounter]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET Id="RDK:26417411" VarRef="Shape_Prototype.id">
+									<EXP><![CDATA[$=$"Created_"+CreateGUID()]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET Id="RDK:26417413" VarRef="Shape_Prototype.links">
+									<EXP><![CDATA[$C$NOTHING]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET Id="RDK:26417395" VarRef="Shape_Prototype.TEFGeradeDefinition.L1">
+									<EXP><![CDATA[$=$distance]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<LIST_ADD Id="RDK:26417418" ListRef="ShapeList">
+									<PAR Name="VALUE_TO_ADD">
+										<EXP><![CDATA[$=$Shape_Prototype]]></EXP>
+									</PAR>
+									<PAR Name="POS_TO_ADD" />
+								</LIST_ADD>
+								<CALLFUNCTION Id="RDK:26431190">
+									<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>
+								<SET Id="RDK:26418413" VarRef="Param.Result">
+									<EXP><![CDATA[$=$Shape_Prototype.id
+]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</GROUP>
+						</IFTHENELSE>
+					</FUNCTION>
+				</GROUP>
 				<GROUP Id="RDK:1004851" Name="POLYLINE" SubType="FunctionSet" IncludeDate="0">
 					<FUNCTION Id="RDK:1007457" Name="ConvertPolyLineToShapes">
 						<GROUP Id="RDK:1007450" Name="Local Variables" SubType="VarSet" IncludeDate="0">
@@ -11872,328 +12228,7 @@ SSGConnectionPoint.x_M
 					</FUNCTION>
 				</GROUP>
 				<GROUP Id="RDK:26409349" Name="LINE" SubType="FunctionSet" IncludeDate="0">
-					<FUNCTION Id="RDK:26409350" Name="createTEFConnection" ResultTypeName="string">
-						<GROUP Id="RDK:26409353" Name="Local Variables" SubType="VarSet" IncludeDate="0">
-							<VAR Id="RDK:26409357" Name="shapeId" Type="string">
-								<SET Id="RDK:26409356" VarRef="Me">
-									<EXP><![CDATA[$=$Param.Input]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</VAR>
-							<VAR Id="RDK:26411329" Name="partner1" Type="string">
-								<SET Id="RDK:26411333" VarRef="Me">
-									<EXP><![CDATA[$=$Shape_Prototype.shapeFromId]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</VAR>
-							<VAR Id="RDK:26411331" Name="partner2" Type="string">
-								<SET Id="RDK:26411335" VarRef="Me">
-									<EXP><![CDATA[$=$Shape_Prototype.shapeToId]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</VAR>
-							<VAR Id="RDK:26415286" Name="Shape1" Type="Editor2DShapeType">
-								<SET Id="RDK:26415279" VarRef="Me">
-									<EXP><![CDATA[$=$ShapeList["id="+partner1]]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</VAR>
-							<VAR Id="RDK:26415288" Name="Shape2" Type="Editor2DShapeType">
-								<SET Id="RDK:26415291" VarRef="Me">
-									<EXP><![CDATA[$=$ShapeList["id="+partner2]]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</VAR>
-							<VAR Id="RDK:26415304" Name="cp1" Type="Editor2DConnectionPointType" />
-							<VAR Id="RDK:26416316" Name="cp2" Type="Editor2DConnectionPointType" />
-							<VAR Id="RDK:26416314" Name="cp_anfang" Type="Editor2DConnectionPointType" />
-							<VAR Id="RDK:26415306" Name="cp_ende" Type="Editor2DConnectionPointType" />
-							<VAR Id="RDK:26416298" Name="ConTypeList1" Type="Editor2DConnectionPointTypeList" />
-							<VAR Id="RDK:26416325" Name="ConTypeList2" Type="Editor2DConnectionPointTypeList" />
-							<VAR Id="RDK:26416337" Name="distance" Type="double" />
-							<VAR Id="RDK:26416351" Name="LinkListe" Type="SSGParameter[]" />
-							<VAR Id="RDK:26417385" Name="Offsets" Type="SSGParameter[]" />
-						</GROUP>
-						<IFTHENELSE Id="RDK:26415267">
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$Shape1.family = "TEFUmlenk"]]></EXP>
-							</VALUECONDITION>
-							<VALUECONDITION Value="true" Oper="OR">
-								<EXP><![CDATA[$=$Shape2.family = "TEFGerade"]]></EXP>
-							</VALUECONDITION>
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$Shape2.family = "TEFUmlenk"]]></EXP>
-							</VALUECONDITION>
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$Shape1.family = "TEFGerade"]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:26415273" SubType="Then">
-								<SET Id="RDK:26415275" VarRef="ConTypeList1">
-									<EXP><![CDATA[$=$FromJSON(Shape1.connectionPoints)]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-								<SET Id="RDK:26416318" VarRef="cp1" DesignTimeRemark="Motor und Spannstation haben nur zwei Cps. Tef sind die Verbindung von cp1">
-									<EXP><![CDATA[$=$ConTypeList1[0]]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-								<SET Id="RDK:26416320" VarRef="ConTypeList2">
-									<EXP><![CDATA[$=$FromJSON(Shape2.connectionPoints)]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-								<SET Id="RDK:26416322" VarRef="cp2" DesignTimeRemark="Motor und Spannstation haben nur zwei Cps. Tef sind die Verbindung von cp1">
-									<EXP><![CDATA[$=$ConTypeList2[0]]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-								<SET Id="RDK:26416338" VarRef="distance">
-									<EXP><![CDATA[$=$IIF(Abs(cp1.x - cp2.x)>=Abs(cp1.y - cp2.y), Abs(cp1.x - cp2.x), Abs(cp1.y - cp2.y))]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-								<SET Id="RDK:26417397" VarRef="Property_Prototype">
-									<EXP><![CDATA[$C$NOTHING]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-								<SET Id="RDK:26422344" VarRef="Property_Prototype.eventClass">
-									<EXP><![CDATA[$C$OnDoubleclick,OnInserted,OnLinked,OnPasted]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-								<SET_STRUCT Id="RDK:26417403" VarRef="Property_Prototype" DesignTimeRemark="Id Nullen, damit in Folge eine neue erzeugt wird.">
-									<PAR Name="id">
-										<EXP><![CDATA[$C$NOTHING]]></EXP>
-									</PAR>
-									<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" />
-									<PAR Name="height" />
-									<PAR Name="depth" />
-									<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>
-								<SET_STRUCT Id="RDK:26417401" VarRef="Shape_Prototype">
-									<PAR Name="SivasNummer" />
-									<PAR Name="Rotationsklasse" />
-									<PAR Name="IDCounter" />
-									<PAR Name="KreiselDefinition" />
-									<PAR Name="EckradDefinition" />
-									<PAR Name="GefaelleDefinition" />
-									<PAR Name="VarioFoerdererDefinition" />
-									<PAR Name="KurveDefinition" />
-									<PAR Name="TEFBogenDefinition" />
-									<PAR Name="TEFGeradeDefinition" />
-									<PAR Name="TEFUmlenkDefinition" />
-									<PAR Name="KurveFoerdererDefinition" />
-									<PAR Name="OFGeradeDefinition" />
-									<PAR Name="OFBogenDefinition" />
-									<PAR Name="OFWeicheDefinition" />
-									<PAR Name="WeicheDefinition" />
-									<PAR Name="BTMTBeladungDefinition" />
-									<PAR Name="BTMTEntladungDefinition" />
-									<PAR Name="isDefined">
-										<EXP><![CDATA[$C$True]]></EXP>
-									</PAR>
-									<PAR Name="source">
-										<EXP><![CDATA[$C$s_TEFGerade]]></EXP>
-									</PAR>
-									<PAR Name="sourceLibrary">
-										<EXP><![CDATA[$C$SSG]]></EXP>
-									</PAR>
-									<PAR Name="signature" />
-									<PAR Name="id">
-										<EXP><![CDATA[$C$NOTHING]]></EXP>
-									</PAR>
-									<PAR Name="name" />
-									<PAR Name="family">
-										<EXP><![CDATA[$C$TEFGerade]]></EXP>
-									</PAR>
-									<PAR Name="description" />
-									<PAR Name="x">
-										<EXP><![CDATA[$=$(cp1.x+cp2.x)/2]]></EXP>
-									</PAR>
-									<PAR Name="y">
-										<EXP><![CDATA[$=$(cp1.y+cp2.y)/2]]></EXP>
-									</PAR>
-									<PAR Name="z">
-										<EXP><![CDATA[$C$0]]></EXP>
-									</PAR>
-									<PAR Name="width">
-										<EXP><![CDATA[$C$42]]></EXP>
-									</PAR>
-									<PAR Name="height">
-										<EXP><![CDATA[$C$1000]]></EXP>
-									</PAR>
-									<PAR Name="depth">
-										<EXP><![CDATA[$C$110]]></EXP>
-									</PAR>
-									<PAR Name="rotation" />
-									<PAR Name="text" />
-									<PAR Name="behaviour">
-										<EXP><![CDATA[$C$(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)]]></EXP>
-									</PAR>
-									<PAR Name="datadump" />
-									<PAR Name="path" />
-									<PAR Name="ctrl1x">
-										<EXP><![CDATA[$C$-1]]></EXP>
-									</PAR>
-									<PAR Name="ctrl1y">
-										<EXP><![CDATA[$C$-1]]></EXP>
-									</PAR>
-									<PAR Name="ctrl2x">
-										<EXP><![CDATA[$C$-1]]></EXP>
-									</PAR>
-									<PAR Name="ctrl2y">
-										<EXP><![CDATA[$C$-1]]></EXP>
-									</PAR>
-									<PAR Name="shapeFromId" />
-									<PAR Name="shapeFromPointIndex" />
-									<PAR Name="shapeToId" />
-									<PAR Name="shapeToPointIndex" />
-									<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">
-										<EXP><![CDATA[$C$#f33256]]></EXP>
-									</PAR>
-									<PAR Name="lineOpacity">
-										<EXP><![CDATA[$C$1]]></EXP>
-									</PAR>
-									<PAR Name="lineColor3D">
-										<EXP><![CDATA[$C$1]]></EXP>
-									</PAR>
-									<PAR Name="lineOpacity3D" />
-									<PAR Name="links" />
-									<PAR Name="group" />
-									<PAR Name="layer">
-										<EXP><![CDATA[$C$Strecke]]></EXP>
-									</PAR>
-									<PAR Name="connectionPoints" />
-									<PAR Name="modified">
-										<EXP><![CDATA[$C$True]]></EXP>
-									</PAR>
-									<PAR Name="pinned" />
-									<PAR Name="selected" />
-									<PAR Name="includeInBOM" />
-								</SET_STRUCT>
-								<ACTION_CALL Id="RDK:26417405" 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$2]]></EXP>
-									</PAR>
-									<PAR Name="shpId">
-										<EXP><![CDATA[$C$c_Session]]></EXP>
-									</PAR>
-									<PAR Name="catId">
-										<EXP><![CDATA[$C$c_Session]]></EXP>
-									</PAR>
-									<PAR Name="shpItemId" />
-									<PAR Name="shpItem">
-										<EXP><![CDATA[$=$Property_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>
-								<CALLFUNCTION Id="RDK:26417407">
-									<PAR Name="FuncName">
-										<EXP><![CDATA[$C$GetNewShapeIDCounter]]></EXP>
-									</PAR>
-									<PAR Name="InputExp" />
-									<PAR Name="ResultRef">
-										<EXP><![CDATA[$V$]]></EXP>
-									</PAR>
-									<PAR Name="Options" />
-								</CALLFUNCTION>
-								<SET Id="RDK:26417409" VarRef="Shape_Prototype.name">
-									<EXP><![CDATA[$=$Shape_Prototype.family+" :"+Shape_Prototype.IDCounter]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-								<SET Id="RDK:26417411" VarRef="Shape_Prototype.id">
-									<EXP><![CDATA[$=$"Created_"+CreateGUID()]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-								<SET Id="RDK:26417413" VarRef="Shape_Prototype.links">
-									<EXP><![CDATA[$C$NOTHING]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-								<SET Id="RDK:26417395" VarRef="Shape_Prototype.TEFGeradeDefinition.L1">
-									<EXP><![CDATA[$=$distance]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-								<LIST_ADD Id="RDK:26417418" ListRef="ShapeList">
-									<PAR Name="VALUE_TO_ADD">
-										<EXP><![CDATA[$=$Shape_Prototype]]></EXP>
-									</PAR>
-									<PAR Name="POS_TO_ADD" />
-								</LIST_ADD>
-								<CALLFUNCTION Id="RDK:26431190">
-									<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>
-								<SET Id="RDK:26418413" VarRef="Param.Result">
-									<EXP><![CDATA[$=$Shape_Prototype.id
-]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</GROUP>
-						</IFTHENELSE>
-					</FUNCTION>
-					<FUNCTION Id="RDK:26443144" Name="getDistance" DesignTimeRemark="returns the length of the line" ResultTypeName="string">
+					<FUNCTION Id="RDK:26443144" Name="getDistance" DesignTimeRemark="returns the length of the line, if connected between (TEFGerade to TEFBogen) or (TEFGerade to TEFUmlenk)" ResultTypeName="string">
 						<GROUP Id="RDK:26443123" Name="Local Variables" SubType="VarSet" IncludeDate="0">
 							<VAR Id="RDK:26450282" Name="shapeId" Type="string">
 								<SET Id="RDK:26450284" VarRef="Me">
@@ -12209,7 +12244,7 @@ SSGConnectionPoint.x_M
 							</VAR>
 							<VAR Id="RDK:26452356" Name="cp1_name" Type="string">
 								<SET Id="RDK:26456333" VarRef="Me">
-									<EXP><![CDATA[$=$Shape_Prototype.shapeFormPointIndex]]></EXP>
+									<EXP><![CDATA[$=$Shape_Prototype.shapeFromPointIndex]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 							</VAR>
@@ -12221,7 +12256,7 @@ SSGConnectionPoint.x_M
 							</VAR>
 							<VAR Id="RDK:26452358" Name="cp2_name" Type="string">
 								<SET Id="RDK:26456335" VarRef="Me">
-									<EXP><![CDATA[$=$Shape_Prototype.shapeToId]]></EXP>
+									<EXP><![CDATA[$=$Shape_Prototype.shapeToPointIndex]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 							</VAR>
@@ -12247,13 +12282,7 @@ SSGConnectionPoint.x_M
 						</GROUP>
 						<IFTHENELSE Id="RDK:26443143">
 							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$Shape1.family = "TEFUmlenk"]]></EXP>
-							</VALUECONDITION>
-							<VALUECONDITION Value="true" Oper="OR">
-								<EXP><![CDATA[$=$Shape2.family = "OFBogen"]]></EXP>
-							</VALUECONDITION>
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$Shape1.family = "OFBogen"]]></EXP>
+								<EXP><![CDATA[$=$Shape1.family = "TEFGerade"]]></EXP>
 							</VALUECONDITION>
 							<VALUECONDITION Value="true" Oper="OR">
 								<EXP><![CDATA[$=$Shape2.family = "TEFUmlenk"]]></EXP>
@@ -12262,190 +12291,67 @@ SSGConnectionPoint.x_M
 								<EXP><![CDATA[$=$Shape1.family = "TEFUmlenk"]]></EXP>
 							</VALUECONDITION>
 							<VALUECONDITION Value="true" Oper="OR">
-								<EXP><![CDATA[$=$Shape2.family = "OFGerade"]]></EXP>
+								<EXP><![CDATA[$=$Shape2.family = "TEFGerade"]]></EXP>
 							</VALUECONDITION>
 							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$Shape1.family = "OFGerade"]]></EXP>
+								<EXP><![CDATA[$=$Shape1.family = "TEFGerade"]]></EXP>
+							</VALUECONDITION>
+							<VALUECONDITION Value="true" Oper="OR">
+								<EXP><![CDATA[$=$Shape2.family = "TEFBogen"]]></EXP>
 							</VALUECONDITION>
 							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$Shape2.family = "TEFUmlenk"]]></EXP>
+								<EXP><![CDATA[$=$Shape1.family = "TEFBogen"]]></EXP>
+							</VALUECONDITION>
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$Shape2.family = "TEFGerade"]]></EXP>
 							</VALUECONDITION>
 							<GROUP Id="RDK:26443142" SubType="Then">
 								<SET Id="RDK:26443124" VarRef="ConTypeList1">
 									<EXP><![CDATA[$=$FromJSON(Shape1.connectionPoints)]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
-								<FOREACHLOOP Id="RDK:26456338" ItemVarRef="linkname" IndexVarRef="item_index">
+								<FOREACHLOOP Id="RDK:26456338" ItemVarRef="cp1" IndexVarRef="item_index">
 									<PAR Name="ArrayValueExp">
-										<EXP><![CDATA[$=$Shape1.links]]></EXP>
+										<EXP><![CDATA[$=$ConTypeList1]]></EXP>
 									</PAR>
 									<PAR Name="ExitCondExp">
 										<EXP><![CDATA[$V$]]></EXP>
 									</PAR>
 									<IFTHENELSE Id="RDK:26456366">
 										<VALUECONDITION Value="true">
-											<EXP><![CDATA[$=$splitStr(linkname, ";") = cp1_name]]></EXP>
+											<EXP><![CDATA[$=$splitStr(cp1.id, "--")[1] = cp1_name]]></EXP>
 										</VALUECONDITION>
 										<GROUP Id="RDK:26456367" SubType="Then">
-											<SET Id="RDK:26443125" VarRef="cp1">
-												<EXP><![CDATA[$=$ConTypeList1[item_index]]]></EXP>
-												<PAR Name="AdvancedOptions" />
-											</SET>
 											<EXIT_PROCESS Id="RDK:26456389" BreakType="3" ExitStatus="0" />
 										</GROUP>
 									</IFTHENELSE>
 								</FOREACHLOOP>
-								<FOREACHLOOP Id="RDK:26456382" ItemVarRef="linkname" IndexVarRef="item_index">
-									<PAR Name="ArrayValueExp">
-										<EXP><![CDATA[$=$Shape2.links]]></EXP>
-									</PAR>
-									<PAR Name="ExitCondExp">
-										<EXP><![CDATA[$V$]]></EXP>
-									</PAR>
-									<IFTHENELSE Id="RDK:26456381">
-										<VALUECONDITION Value="true">
-											<EXP><![CDATA[$=$splitStr(linkname, ";") = cp2_name]]></EXP>
-										</VALUECONDITION>
-										<GROUP Id="RDK:26456380" SubType="Then">
-											<SET Id="RDK:26456379" VarRef="cp2">
-												<EXP><![CDATA[$=$ConTypeList2[item_index]]]></EXP>
-												<PAR Name="AdvancedOptions" />
-											</SET>
-											<EXIT_PROCESS Id="RDK:26456387" BreakType="3" ExitStatus="0" />
-										</GROUP>
-									</IFTHENELSE>
-								</FOREACHLOOP>
 								<SET Id="RDK:26443126" VarRef="ConTypeList2">
 									<EXP><![CDATA[$=$FromJSON(Shape2.connectionPoints)]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
+								<FOREACHLOOP Id="RDK:26456382" ItemVarRef="cp2" IndexVarRef="item_index">
+									<PAR Name="ArrayValueExp">
+										<EXP><![CDATA[$=$ConTypeList2]]></EXP>
+									</PAR>
+									<PAR Name="ExitCondExp">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+									<IFTHENELSE Id="RDK:26456381">
+										<VALUECONDITION Value="true">
+											<EXP><![CDATA[$=$splitStr(cp2.id, "--")[1] = cp2_name]]></EXP>
+										</VALUECONDITION>
+										<GROUP Id="RDK:26456380" SubType="Then">
+											<EXIT_PROCESS Id="RDK:26456387" BreakType="3" ExitStatus="0" />
+										</GROUP>
+									</IFTHENELSE>
+								</FOREACHLOOP>
 								<SET Id="RDK:26443128" VarRef="distance">
 									<EXP><![CDATA[$=$IIF(Abs(cp1.x - cp2.x)>=Abs(cp1.y - cp2.y), Abs(cp1.x - cp2.x), Abs(cp1.y - cp2.y))]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 								<SET Id="RDK:26443141" VarRef="Param.Result">
-									<EXP><![CDATA[$=$distrance
-]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</GROUP>
-						</IFTHENELSE>
-					</FUNCTION>
-					<FUNCTION Id="RDK:26448110" Name="stretchTEFGerade" DesignTimeRemark="increases the lenght of the TEFGerade that it fits to the next connectionPoint" InputTypeName="Editor2DEventArgumentsTypeList" ResultTypeName="string">
-						<GROUP Id="RDK:26448101" Name="Local Variables" SubType="VarSet" IncludeDate="0">
-							<VAR Id="RDK:26448089" Name="partner1" Type="string">
-								<SET Id="RDK:26448088" VarRef="Me">
-									<EXP><![CDATA[$=$Param.Input[0].shapeid]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</VAR>
-							<VAR Id="RDK:26448091" Name="partner2" Type="string">
-								<SET Id="RDK:26448090" VarRef="Me">
-									<EXP><![CDATA[$=$Param.Input[1].shapeid]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</VAR>
-							<VAR Id="RDK:26448093" Name="Shape1" Type="Editor2DShapeType">
-								<SET Id="RDK:26448092" VarRef="Me">
-									<EXP><![CDATA[$=$ShapeList["id="+partner1]]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</VAR>
-							<VAR Id="RDK:26448095" Name="Shape2" Type="Editor2DShapeType">
-								<SET Id="RDK:26448094" VarRef="Me">
-									<EXP><![CDATA[$=$ShapeList["id="+partner2]]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</VAR>
-							<VAR Id="RDK:26448096" Name="cp1" Type="Editor2DConnectionPointType" />
-							<VAR Id="RDK:26448097" Name="cp2" Type="Editor2DConnectionPointType" />
-							<VAR Id="RDK:26448098" Name="ConTypeList1" Type="Editor2DConnectionPointTypeList" />
-							<VAR Id="RDK:26448099" Name="ConTypeList2" Type="Editor2DConnectionPointTypeList" />
-							<VAR Id="RDK:26448100" Name="distance" Type="double" />
-						</GROUP>
-						<IFTHENELSE Id="RDK:26448109">
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$Shape1.family = "TEFUmlenk"]]></EXP>
-							</VALUECONDITION>
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$Shape2.family = "TEFGerade"]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:26448108" SubType="Then">
-								<SET Id="RDK:26448102" VarRef="ConTypeList1">
-									<EXP><![CDATA[$=$FromJSON(Shape1.connectionPoints)]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-								<SET Id="RDK:26448103" VarRef="cp1" DesignTimeRemark="Motor und Spannstation haben nur zwei Cps. Tef sind die Verbindung von cp1">
-									<EXP><![CDATA[$=$ConTypeList1[0]]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-								<SET Id="RDK:26448104" VarRef="ConTypeList2">
-									<EXP><![CDATA[$=$FromJSON(Shape2.connectionPoints)]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-								<SET Id="RDK:26448105" VarRef="cp2" DesignTimeRemark="Motor und Spannstation haben nur zwei Cps. Tef sind die Verbindung von cp1">
-									<EXP><![CDATA[$=$ConTypeList2[0]]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-								<SET Id="RDK:26448106" VarRef="distance">
-									<EXP><![CDATA[$=$IIF(Abs(cp1.x - cp2.x)>=Abs(cp1.y - cp2.y), Abs(cp1.x - cp2.x), Abs(cp1.y - cp2.y))]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-								<SET Id="RDK:26448107" VarRef="Param.Result">
-									<EXP><![CDATA[$=$distrance
-]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</GROUP>
-						</IFTHENELSE>
-						<IFTHENELSE Id="RDK:26449253">
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$Shape1.family = "TEFGerade"]]></EXP>
-							</VALUECONDITION>
-							<VALUECONDITION Value="true" Oper="OR">
-								<EXP><![CDATA[$=$Shape2.family = "TEFUmlenk"]]></EXP>
-							</VALUECONDITION>
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$Shape1.family = "TEFUmlenk"]]></EXP>
-							</VALUECONDITION>
-							<VALUECONDITION Value="true" Oper="OR">
-								<EXP><![CDATA[$=$Shape1.family = "TEFGerade"]]></EXP>
-							</VALUECONDITION>
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$Shape1.family = "TEFUmlenk"]]></EXP>
-							</VALUECONDITION>
-							<VALUECONDITION Value="true" Oper="OR">
-								<EXP><![CDATA[$=$Shape1.family = "OFBogen"]]></EXP>
-							</VALUECONDITION>
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$Shape1.family = "OFBogen"]]></EXP>
-							</VALUECONDITION>
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$Shape1.family = "TEFUmlenk"]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:26449252" SubType="Then">
-								<SET Id="RDK:26449246" VarRef="ConTypeList1">
-									<EXP><![CDATA[$=$FromJSON(Shape1.connectionPoints)]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-								<SET Id="RDK:26449247" VarRef="cp1" DesignTimeRemark="Motor und Spannstation haben nur zwei Cps. Tef sind die Verbindung von cp1">
-									<EXP><![CDATA[$=$ConTypeList1[0]]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-								<SET Id="RDK:26449248" VarRef="ConTypeList2">
-									<EXP><![CDATA[$=$FromJSON(Shape2.connectionPoints)]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-								<SET Id="RDK:26449249" VarRef="cp2" DesignTimeRemark="Motor und Spannstation haben nur zwei Cps. Tef sind die Verbindung von cp1">
-									<EXP><![CDATA[$=$ConTypeList2[0]]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-								<SET Id="RDK:26449250" VarRef="distance">
-									<EXP><![CDATA[$=$IIF(Abs(cp1.x - cp2.x)>=Abs(cp1.y - cp2.y), Abs(cp1.x - cp2.x), Abs(cp1.y - cp2.y))]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-								<SET Id="RDK:26449251" VarRef="Param.Result">
-									<EXP><![CDATA[$=$distrance
+									<EXP><![CDATA[$=$distance
 ]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
@@ -31247,6 +31153,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 													<PAR Name="Dbl" />
 													<PAR Name="Int" />
 													<PAR Name="Boo" />
+													<PAR Name="StrArr2D" />
 												</SET_STRUCT>
 												<SET_STRUCT Id="RDK:22069148" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
 													<PAR Name="Key">
@@ -37134,7 +37041,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<VALUECONDITION Value="true">
 						<EXP><![CDATA[$=$Shape_Prototype.source="line"]]></EXP>
 					</VALUECONDITION>
-					<CALLFUNCTION Id="RDK:26409338" DesignTimeRemark="Funktion agiert nur bei TEF Umlenk und Motorstation">
+					<CALLFUNCTION Id="RDK:26409338" DesignTimeRemark="Funktion agiert nur bei TEF Umlenk und Motorstation mit TEFGerade">
 						<PAR Name="FuncName">
 							<EXP><![CDATA[$C$getDistance]]></EXP>
 						</PAR>
@@ -37146,6 +37053,22 @@ ShapeList["id="+Param.Input[1].shapeID].name
 						</PAR>
 						<PAR Name="Options" />
 					</CALLFUNCTION>
+					<GROUP Id="RDK:26484586" Name="localVars" SubType="VarSet" IncludeDate="0">
+						<VAR Id="RDK:26484587" Name="UebergabeListe" Type="SSGParameter[]" />
+					</GROUP>
+					<SET_STRUCT Id="RDK:26484589" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+						<PAR Name="Key">
+							<EXP><![CDATA[$C$distance]]></EXP>
+						</PAR>
+						<PAR Name="StrArr" />
+						<PAR Name="StrArr2D" />
+						<PAR Name="Str" />
+						<PAR Name="Dbl">
+							<EXP><![CDATA[$=$distance]]></EXP>
+						</PAR>
+						<PAR Name="Int" />
+						<PAR Name="Boo" />
+					</SET_STRUCT>
 					<CALLFUNCTION Id="RDK:26451294" Suppressed="True">
 						<PAR Name="FuncName">
 							<EXP><![CDATA[$C$stretchTEFGerade]]></EXP>