diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index a36736e..6cb01e5 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="m.stangl [ENTW-NB08]" ModDate="2025-10-20T14:10:14" LanguageVersion="2014.1.3.712" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2025-10-20T17:07: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">
@@ -40854,23 +40854,114 @@ me.x
 								<PAR Name="AdvancedOptions" />
 							</SET>
 						</VAR>
-						<VAR Id="RDK:26044548" Name="cpt1" Type="string">
-							<SET Id="RDK:26044547" VarRef="me">
-								<EXP><![CDATA[$=$Param.Input["key=cp_target1"].Str]]></EXP>
-								<PAR Name="AdvancedOptions" />
-							</SET>
-						</VAR>
-						<VAR Id="RDK:26044552" Name="cpt2" Type="string">
-							<SET Id="RDK:26044551" VarRef="me">
-								<EXP><![CDATA[$=$Param.Input["key=cp_target2"].Str]]></EXP>
-								<PAR Name="AdvancedOptions" />
-							</SET>
-						</VAR>
+						<VAR Id="RDK:26044548" Name="cpt1" Type="string" />
+						<VAR Id="RDK:26044552" Name="cpt2" Type="string" />
 						<VAR Id="RDK:26044571" Name="row" Type="string[]" />
 						<VAR Id="RDK:26044588" Name="row_before" Type="string[]" />
 						<VAR Id="RDK:26044577" Name="nRow" Type="integer" />
 						<VAR Id="RDK:26162475" Name="CpSearch" Type="SSGParameter[]" />
+						<VAR Id="RDK:26044499" Name="cps1" Type="string[]" />
+						<VAR Id="RDK:26044501" Name="cps2" Type="string[]" />
+						<VAR Id="RDK:26312163" Name="TargetCps" Type="string[]" />
 					</GROUP>
+					<CALLFUNCTION Id="RDK:26312156" DesignTimeRemark="Hole die Namen der freien Connection Points am 2. und vorletzten Objekt. Diese werden dann zum ersten und letzten der Vorgängergruppe verbunden">
+						<PAR Name="FuncName">
+							<EXP><![CDATA[$C$GetTargetConnectingPoints]]></EXP>
+						</PAR>
+						<PAR Name="InputExp">
+							<EXP><![CDATA[$=$Param.Input]]></EXP>
+						</PAR>
+						<PAR Name="ResultRef">
+							<EXP><![CDATA[$V$TargetCps]]></EXP>
+						</PAR>
+						<PAR Name="Options" />
+					</CALLFUNCTION>
+					<SET Id="RDK:26312158" VarRef="cpt1">
+						<EXP><![CDATA[$=$TargetCps[0]]]></EXP>
+						<PAR Name="AdvancedOptions" />
+					</SET>
+					<SET Id="RDK:26312160" VarRef="cpt2">
+						<EXP><![CDATA[$=$TargetCps[1]]]></EXP>
+						<PAR Name="AdvancedOptions" />
+					</SET>
+					<CALLFUNCTION Id="RDK:26149741" DesignTimeRemark="Hole dir den noch Freien Connection Point dieser Gerade">
+						<PAR Name="FuncName">
+							<EXP><![CDATA[$C$getFreeConnectionPoints]]></EXP>
+						</PAR>
+						<PAR Name="InputExp">
+							<EXP><![CDATA[$=$original[0]]]></EXP>
+						</PAR>
+						<PAR Name="ResultRef">
+							<EXP><![CDATA[$V$cps1]]></EXP>
+						</PAR>
+						<PAR Name="Options" />
+					</CALLFUNCTION>
+					<IFTHENELSE Id="RDK:26162203">
+						<VALUECONDITION Value="false">
+							<EXP><![CDATA[$=$count(cps1) = 1]]></EXP>
+						</VALUECONDITION>
+						<GROUP Id="RDK:26162204" SubType="Then">
+							<ACTION_CALL Id="RDK:26162211" Name="RDEngineering_MsgBox" DesignTimeRemark="{Text}">
+								<PAR Name="RDLibraryName">
+									<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+								</PAR>
+								<PAR Name="MsgText">
+									<EXP><![CDATA[$C$Element zur Anbindung hat mehr als eine Möglichkeit]]></EXP>
+								</PAR>
+								<PAR Name="MsgStyle">
+									<EXP><![CDATA[$C$-1]]></EXP>
+								</PAR>
+								<PAR Name="BtnLayout">
+									<EXP><![CDATA[$C$-1]]></EXP>
+								</PAR>
+								<PAR Name="MsgCaption" />
+								<PAR Name="BaloonType" />
+								<PAR Name="BtnPressed">
+									<EXP><![CDATA[$V$]]></EXP>
+								</PAR>
+							</ACTION_CALL>
+							<EXIT_PROCESS Id="RDK:26162233" BreakType="4" ExitStatus="0" />
+						</GROUP>
+					</IFTHENELSE>
+					<CALLFUNCTION Id="RDK:26149744">
+						<PAR Name="FuncName">
+							<EXP><![CDATA[$C$getFreeConnectionPoints]]></EXP>
+						</PAR>
+						<PAR Name="InputExp">
+							<EXP><![CDATA[$=$original[Count(original)-1]]]></EXP>
+						</PAR>
+						<PAR Name="ResultRef">
+							<EXP><![CDATA[$V$cps2]]></EXP>
+						</PAR>
+						<PAR Name="Options" />
+					</CALLFUNCTION>
+					<IFTHENELSE Id="RDK:26162225">
+						<VALUECONDITION Value="false">
+							<EXP><![CDATA[$=$count(cps2) = 1]]></EXP>
+						</VALUECONDITION>
+						<GROUP Id="RDK:26162224" SubType="Then">
+							<ACTION_CALL Id="RDK:26162223" Name="RDEngineering_MsgBox" DesignTimeRemark="{Text}">
+								<PAR Name="RDLibraryName">
+									<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+								</PAR>
+								<PAR Name="MsgText">
+									<EXP><![CDATA[$C$Element zur Anbindung hat mehr als eine Möglichkeit]]></EXP>
+								</PAR>
+								<PAR Name="MsgStyle">
+									<EXP><![CDATA[$C$-1]]></EXP>
+								</PAR>
+								<PAR Name="BtnLayout">
+									<EXP><![CDATA[$C$-1]]></EXP>
+								</PAR>
+								<PAR Name="MsgCaption" />
+								<PAR Name="BaloonType" />
+								<PAR Name="BtnPressed">
+									<EXP><![CDATA[$V$]]></EXP>
+								</PAR>
+							</ACTION_CALL>
+							<EXIT_PROCESS Id="RDK:26162231" BreakType="4" ExitStatus="0" />
+						</GROUP>
+					</IFTHENELSE>
 					<FOREACHLOOP Id="RDK:26044569" DesignTimeRemark="Verbinde die Orgininale mit der ersten Zeile, dann die erste mit der zweiten Zeile usw." ItemVarRef="row" IndexVarRef="nRow">
 						<PAR Name="ArrayValueExp">
 							<EXP><![CDATA[$=$newIds]]></EXP>
@@ -40883,18 +40974,14 @@ me.x
 							<VAR Id="RDK:26147509" Name="source_r" Type="string" />
 							<VAR Id="RDK:26147510" Name="target_l" Type="string" />
 							<VAR Id="RDK:26147511" Name="target_r" Type="string" />
-							<VAR Id="RDK:26252058" Name="cp_opposite" Type="string" />
-							<VAR Id="RDK:26252069" Name="cps" Type="string[]" />
-							<VAR Id="RDK:26044499" Name="cps1" Type="string[]" />
-							<VAR Id="RDK:26044501" Name="cps2" Type="string[]" />
 						</GROUP>
 						<IFTHENELSE Id="RDK:26044578">
 							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$nRow > 1]]></EXP>
+								<EXP><![CDATA[$=$nRow > 0]]></EXP>
 							</VALUECONDITION>
 							<GROUP Id="RDK:26044579" SubType="Then">
 								<SET Id="RDK:26044573" VarRef="source_l">
-									<EXP><![CDATA[$=$row[1]]]></EXP>
+									<EXP><![CDATA[$=$row[0]]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 								<SET Id="RDK:26044575" VarRef="source_r">
@@ -40906,13 +40993,13 @@ me.x
 									<PAR Name="AdvancedOptions" />
 								</SET>
 								<SET Id="RDK:26044601" VarRef="target_r">
-									<EXP><![CDATA[$=$row_before[Count(row)-1]]]></EXP>
+									<EXP><![CDATA[$=$row_before[Count(row)-2]]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 							</GROUP>
 							<GROUP Id="RDK:26147443" SubType="Else" DesignTimeRemark="Connect first generated Items to its original items">
 								<SET Id="RDK:26147457" VarRef="source_l">
-									<EXP><![CDATA[$=$original[1]]]></EXP>
+									<EXP><![CDATA[$=$original[0]]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 								<SET Id="RDK:26147458" VarRef="source_r">
@@ -40924,7 +41011,7 @@ me.x
 									<PAR Name="AdvancedOptions" />
 								</SET>
 								<SET Id="RDK:26147460" VarRef="target_r">
-									<EXP><![CDATA[$=$row[Count(row)-1]]]></EXP>
+									<EXP><![CDATA[$=$row[Count(row)-2]]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 							</GROUP>
@@ -40934,96 +41021,6 @@ me.x
 							<PAR Name="AdvancedOptions" />
 						</SET>
 						<COMMENTS Id="RDK:26169406" DesignTimeRemark="linkes Ende" />
-						<CALLFUNCTION Id="RDK:26149741" DesignTimeRemark="Hole dir den noch Freien Connection Point dieser Gerade">
-							<PAR Name="FuncName">
-								<EXP><![CDATA[$C$getFreeConnectionPoints]]></EXP>
-							</PAR>
-							<PAR Name="InputExp">
-								<EXP><![CDATA[$=$source_l]]></EXP>
-							</PAR>
-							<PAR Name="ResultRef">
-								<EXP><![CDATA[$V$cps1]]></EXP>
-							</PAR>
-							<PAR Name="Options" />
-						</CALLFUNCTION>
-						<IFTHENELSE Id="RDK:26162203">
-							<VALUECONDITION Value="false">
-								<EXP><![CDATA[$=$count(cps1) = 1]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:26162204" SubType="Then">
-								<ACTION_CALL Id="RDK:26162211" Name="RDEngineering_MsgBox" DesignTimeRemark="{Text}">
-									<PAR Name="RDLibraryName">
-										<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
-									</PAR>
-									<PAR Name="MsgText">
-										<EXP><![CDATA[$C$Element zur Anbindung hat mehr als eine Möglichkeit]]></EXP>
-									</PAR>
-									<PAR Name="MsgStyle">
-										<EXP><![CDATA[$C$-1]]></EXP>
-									</PAR>
-									<PAR Name="BtnLayout">
-										<EXP><![CDATA[$C$-1]]></EXP>
-									</PAR>
-									<PAR Name="MsgCaption" />
-									<PAR Name="BaloonType" />
-									<PAR Name="BtnPressed">
-										<EXP><![CDATA[$V$]]></EXP>
-									</PAR>
-								</ACTION_CALL>
-								<EXIT_PROCESS Id="RDK:26162233" BreakType="4" ExitStatus="0" />
-							</GROUP>
-						</IFTHENELSE>
-						<COMMENTS Id="RDK:26252063" DesignTimeRemark="Jetzt brauchen wir den Namen des CP der angenbundenen Weiche, an den die Verbindung dann erfolgen soll" />
-						<SET_STRUCT Id="RDK:26162477" VarRef="SSGParameter" ClearAll="True" ListRef="CpSearch">
-							<PAR Name="Key">
-								<EXP><![CDATA[$C$shapeId]]></EXP>
-							</PAR>
-							<PAR Name="StrArr" />
-							<PAR Name="StrArr2D" />
-							<PAR Name="Str">
-								<EXP><![CDATA[$=$source_l]]></EXP>
-							</PAR>
-							<PAR Name="Dbl" />
-							<PAR Name="Int" />
-							<PAR Name="Boo" />
-						</SET_STRUCT>
-						<SET_STRUCT Id="RDK:26162479" VarRef="SSGParameter" ClearAll="True" ListRef="CpSearch">
-							<PAR Name="Key">
-								<EXP><![CDATA[$C$cpname]]></EXP>
-							</PAR>
-							<PAR Name="StrArr" />
-							<PAR Name="StrArr2D" />
-							<PAR Name="Str">
-								<EXP><![CDATA[$=$cps1[0]]]></EXP>
-							</PAR>
-							<PAR Name="Dbl" />
-							<PAR Name="Int" />
-							<PAR Name="Boo" />
-						</SET_STRUCT>
-						<CALLFUNCTION Id="RDK:26162416" DesignTimeRemark="Hier holen wir den bereits verbundenen Connection Point">
-							<PAR Name="FuncName">
-								<EXP><![CDATA[$C$getOppositeConnectionPoint]]></EXP>
-							</PAR>
-							<PAR Name="InputExp">
-								<EXP><![CDATA[$=$CpSearch]]></EXP>
-							</PAR>
-							<PAR Name="ResultRef">
-								<EXP><![CDATA[$V$cp_opposite]]></EXP>
-							</PAR>
-							<PAR Name="Options" />
-						</CALLFUNCTION>
-						<CALLFUNCTION Id="RDK:26252060">
-							<PAR Name="FuncName">
-								<EXP><![CDATA[$C$getOppositeConnectionPoint]]></EXP>
-							</PAR>
-							<PAR Name="InputExp">
-								<EXP><![CDATA[$=$CpSearch]]></EXP>
-							</PAR>
-							<PAR Name="ResultRef">
-								<EXP><![CDATA[$V$cpt1]]></EXP>
-							</PAR>
-							<PAR Name="Options" />
-						</CALLFUNCTION>
 						<ACTION_CALL Id="RDK:26044554" Name="RDEngineering_E2DLinkShapes" DesignTimeRemark="linkes Element">
 							<PAR Name="RDLibraryName">
 								<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
@@ -41038,7 +41035,7 @@ me.x
 								<EXP><![CDATA[$=$source_l]]></EXP>
 							</PAR>
 							<PAR Name="shapeFromPointID">
-								<EXP><![CDATA[$=$cps1]]></EXP>
+								<EXP><![CDATA[$=$cps1[0]]]></EXP>
 							</PAR>
 							<PAR Name="shapeToID">
 								<EXP><![CDATA[$=$target_l]]></EXP>
@@ -41054,85 +41051,38 @@ me.x
 							</PAR>
 							<PAR Name="Options" />
 						</ACTION_CALL>
+						<ACTION_CALL Id="RDK:26344016" Name="RDEngineering_E2DLinkShapes" Suppressed="True" DesignTimeRemark="linkes Element">
+							<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[$=$target_l]]></EXP>
+							</PAR>
+							<PAR Name="shapeFromPointID">
+								<EXP><![CDATA[$=$cpt1]]></EXP>
+							</PAR>
+							<PAR Name="shapeToID">
+								<EXP><![CDATA[$=$source_l ]]></EXP>
+							</PAR>
+							<PAR Name="shapeToPointID">
+								<EXP><![CDATA[$=$cps1[0]]]></EXP>
+							</PAR>
+							<PAR Name="shapeFromEventHandler">
+								<EXP><![CDATA[$V$]]></EXP>
+							</PAR>
+							<PAR Name="shapeToEventHandler">
+								<EXP><![CDATA[$V$]]></EXP>
+							</PAR>
+							<PAR Name="Options" />
+						</ACTION_CALL>
 						<COMMENTS Id="RDK:26169404" DesignTimeRemark="rechtes Ende" />
-						<CALLFUNCTION Id="RDK:26149744">
-							<PAR Name="FuncName">
-								<EXP><![CDATA[$C$getFreeConnectionPoints]]></EXP>
-							</PAR>
-							<PAR Name="InputExp">
-								<EXP><![CDATA[$=$source_r]]></EXP>
-							</PAR>
-							<PAR Name="ResultRef">
-								<EXP><![CDATA[$V$cps2]]></EXP>
-							</PAR>
-							<PAR Name="Options" />
-						</CALLFUNCTION>
-						<IFTHENELSE Id="RDK:26162225">
-							<VALUECONDITION Value="false">
-								<EXP><![CDATA[$=$count(cps2) = 1]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:26162224" SubType="Then">
-								<ACTION_CALL Id="RDK:26162223" Name="RDEngineering_MsgBox" DesignTimeRemark="{Text}">
-									<PAR Name="RDLibraryName">
-										<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
-									</PAR>
-									<PAR Name="MsgText">
-										<EXP><![CDATA[$C$Element zur Anbindung hat mehr als eine Möglichkeit]]></EXP>
-									</PAR>
-									<PAR Name="MsgStyle">
-										<EXP><![CDATA[$C$-1]]></EXP>
-									</PAR>
-									<PAR Name="BtnLayout">
-										<EXP><![CDATA[$C$-1]]></EXP>
-									</PAR>
-									<PAR Name="MsgCaption" />
-									<PAR Name="BaloonType" />
-									<PAR Name="BtnPressed">
-										<EXP><![CDATA[$V$]]></EXP>
-									</PAR>
-								</ACTION_CALL>
-								<EXIT_PROCESS Id="RDK:26162231" BreakType="4" ExitStatus="0" />
-							</GROUP>
-						</IFTHENELSE>
-						<SET_STRUCT Id="RDK:26162485" VarRef="SSGParameter" ClearAll="True" ListRef="CpSearch">
-							<PAR Name="Key">
-								<EXP><![CDATA[$C$shapeId]]></EXP>
-							</PAR>
-							<PAR Name="StrArr" />
-							<PAR Name="StrArr2D" />
-							<PAR Name="Str">
-								<EXP><![CDATA[$=$source_r]]></EXP>
-							</PAR>
-							<PAR Name="Dbl" />
-							<PAR Name="Int" />
-							<PAR Name="Boo" />
-						</SET_STRUCT>
-						<SET_STRUCT Id="RDK:26162487" VarRef="SSGParameter" ClearAll="True" ListRef="CpSearch">
-							<PAR Name="Key">
-								<EXP><![CDATA[$C$cpname]]></EXP>
-							</PAR>
-							<PAR Name="StrArr" />
-							<PAR Name="StrArr2D" />
-							<PAR Name="Str">
-								<EXP><![CDATA[$=$cps2[0]]]></EXP>
-							</PAR>
-							<PAR Name="Dbl" />
-							<PAR Name="Int" />
-							<PAR Name="Boo" />
-						</SET_STRUCT>
-						<CALLFUNCTION Id="RDK:26162426">
-							<PAR Name="FuncName">
-								<EXP><![CDATA[$C$getOppositeConnectionPoint]]></EXP>
-							</PAR>
-							<PAR Name="InputExp">
-								<EXP><![CDATA[$=$CpSearch]]></EXP>
-							</PAR>
-							<PAR Name="ResultRef">
-								<EXP><![CDATA[$V$cpt2]]></EXP>
-							</PAR>
-							<PAR Name="Options" />
-						</CALLFUNCTION>
-						<ACTION_CALL Id="RDK:26044562" Name="RDEngineering_E2DLinkShapes" DesignTimeRemark="rechtes Element">
+						<ACTION_CALL Id="RDK:26044562" Name="RDEngineering_E2DLinkShapes" Suppressed="True" DesignTimeRemark="rechtes Element">
 							<PAR Name="RDLibraryName">
 								<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
 							</PAR>
@@ -41146,7 +41096,7 @@ me.x
 								<EXP><![CDATA[$=$source_r]]></EXP>
 							</PAR>
 							<PAR Name="shapeFromPointID">
-								<EXP><![CDATA[$=$cps2]]></EXP>
+								<EXP><![CDATA[$=$cps2[0]]]></EXP>
 							</PAR>
 							<PAR Name="shapeToID">
 								<EXP><![CDATA[$=$target_r]]></EXP>
@@ -41162,6 +41112,36 @@ me.x
 							</PAR>
 							<PAR Name="Options" />
 						</ACTION_CALL>
+						<ACTION_CALL Id="RDK:26344018" Name="RDEngineering_E2DLinkShapes" Suppressed="True" DesignTimeRemark="rechtes Element">
+							<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[$=$target_r]]></EXP>
+							</PAR>
+							<PAR Name="shapeFromPointID">
+								<EXP><![CDATA[$=$cpt2]]></EXP>
+							</PAR>
+							<PAR Name="shapeToID">
+								<EXP><![CDATA[$=$source_r ]]></EXP>
+							</PAR>
+							<PAR Name="shapeToPointID">
+								<EXP><![CDATA[$=$cps2[0]]]></EXP>
+							</PAR>
+							<PAR Name="shapeFromEventHandler">
+								<EXP><![CDATA[$V$]]></EXP>
+							</PAR>
+							<PAR Name="shapeToEventHandler">
+								<EXP><![CDATA[$V$]]></EXP>
+							</PAR>
+							<PAR Name="Options" />
+						</ACTION_CALL>
 					</FOREACHLOOP>
 				</FUNCTION>
 				<FUNCTION Id="RDK:20549457" Name="GetSelected" InputTypeName="string[]" ResultTypeName="string[]">
@@ -43040,28 +43020,40 @@ me.x
 				<FUNCTION Id="RDK:26252084" Name="GetTargetConnectingPoints" DesignTimeRemark="gives back the names of the linked connection points of a shape" InputTypeName="SSGParameter[]" ResultTypeName="string[]" Options="(TYPEFUNCTION)">
 					<GROUP Id="RDK:26252103" Name="Local Variables" SubType="VarSet" IncludeDate="0">
 						<VAR Id="RDK:26252095" Name="gerade_l" Type="string" />
+						<VAR Id="RDK:26312154" Name="gerade_r" Type="string" />
 						<VAR Id="RDK:26252115" Name="weiche_l" Type="string" />
+						<VAR Id="RDK:26312152" Name="weiche_r" Type="string" />
 						<VAR Id="RDK:26252117" Name="cps" Type="string[]" />
 						<VAR Id="RDK:26252119" Name="cp_opposite" Type="string" />
 						<VAR Id="RDK:26252125" Name="result" Type="string[]" />
-						<VAR Id="RDK:26252098" Name="FilterCps" Type="SSGParameter[]" />
-						<VAR Id="RDK:26261372" Name="CpSearch" Type="SSGParameter[]" />
+						<VAR Id="RDK:26252098" Name="FilterCpsl" Type="SSGParameter[]" />
+						<VAR Id="RDK:26263837" Name="FilterCpsr" Type="SSGParameter[]" />
+						<VAR Id="RDK:26261372" Name="CpSearchL" Type="SSGParameter[]" />
+						<VAR Id="RDK:26263859" Name="CpSearchR" Type="SSGParameter[]" />
 						<VAR Id="RDK:26252113" Name="groupIds" Type="string[]">
 							<SET Id="RDK:26252112" VarRef="me">
-								<EXP><![CDATA[$=$Param.Input["key=groupIds"].StrArr]]></EXP>
+								<EXP><![CDATA[$=$Param.Input["key=original"].StrArr]]></EXP>
 								<PAR Name="AdvancedOptions" />
 							</SET>
 						</VAR>
 					</GROUP>
-					<SET Id="RDK:26252121" VarRef="gerade_l">
+					<SET Id="RDK:26252121" VarRef="gerade_l" DesignTimeRemark="die Gerade auf der linken Seite der Gruppe">
 						<EXP><![CDATA[$=$groupIds[0]]]></EXP>
 						<PAR Name="AdvancedOptions" />
 					</SET>
-					<SET Id="RDK:26252123" VarRef="weiche_l">
+					<SET Id="RDK:26252123" VarRef="weiche_l" DesignTimeRemark="die Weiche auf der linken Seite">
 						<EXP><![CDATA[$=$groupIds[1]]]></EXP>
 						<PAR Name="AdvancedOptions" />
 					</SET>
-					<SET_STRUCT Id="RDK:26252074" VarRef="SSGParameter" ClearAll="True" ListRef="FilterCps">
+					<SET Id="RDK:26263844" VarRef="weiche_r">
+						<EXP><![CDATA[$=$groupIds[Count(groupIds)-2]]]></EXP>
+						<PAR Name="AdvancedOptions" />
+					</SET>
+					<SET Id="RDK:26263839" VarRef="gerade_r" DesignTimeRemark="die Gerade auf der rechten Seite">
+						<EXP><![CDATA[$=$LastOf(groupIds)]]></EXP>
+						<PAR Name="AdvancedOptions" />
+					</SET>
+					<SET_STRUCT Id="RDK:26252074" VarRef="SSGParameter" ClearAll="True" ListRef="FilterCpsl">
 						<PAR Name="Key">
 							<EXP><![CDATA[$C$idSource]]></EXP>
 						</PAR>
@@ -43074,7 +43066,7 @@ me.x
 						<PAR Name="Int" />
 						<PAR Name="Boo" />
 					</SET_STRUCT>
-					<SET_STRUCT Id="RDK:26252076" VarRef="SSGParameter" ClearAll="True" ListRef="FilterCps">
+					<SET_STRUCT Id="RDK:26252076" VarRef="SSGParameter" ClearAll="True" ListRef="FilterCpsl">
 						<PAR Name="Key">
 							<EXP><![CDATA[$C$idTarget]]></EXP>
 						</PAR>
@@ -43092,14 +43084,14 @@ me.x
 							<EXP><![CDATA[$C$FilterConnectingPointsBetweenBoth]]></EXP>
 						</PAR>
 						<PAR Name="InputExp">
-							<EXP><![CDATA[$=$FilterCps]]></EXP>
+							<EXP><![CDATA[$=$FilterCpsl]]></EXP>
 						</PAR>
 						<PAR Name="ResultRef">
 							<EXP><![CDATA[$V$cps]]></EXP>
 						</PAR>
 						<PAR Name="Options" />
 					</CALLFUNCTION>
-					<SET_STRUCT Id="RDK:26259071" VarRef="SSGParameter" ClearAll="True" ListRef="CpSearch">
+					<SET_STRUCT Id="RDK:26259071" VarRef="SSGParameter" ClearAll="True" ListRef="CpSearchL">
 						<PAR Name="Key">
 							<EXP><![CDATA[$C$cpname]]></EXP>
 						</PAR>
@@ -43112,7 +43104,7 @@ me.x
 						<PAR Name="Int" />
 						<PAR Name="Boo" />
 					</SET_STRUCT>
-					<SET_STRUCT Id="RDK:26259069" VarRef="SSGParameter" ClearAll="True" ListRef="CpSearch">
+					<SET_STRUCT Id="RDK:26259069" VarRef="SSGParameter" ClearAll="True" ListRef="CpSearchL">
 						<PAR Name="Key">
 							<EXP><![CDATA[$C$shapeId]]></EXP>
 						</PAR>
@@ -43130,7 +43122,89 @@ me.x
 							<EXP><![CDATA[$C$getOppositeConnectionPoint]]></EXP>
 						</PAR>
 						<PAR Name="InputExp">
-							<EXP><![CDATA[$=$CpSearch]]></EXP>
+							<EXP><![CDATA[$=$CpSearchL]]></EXP>
+						</PAR>
+						<PAR Name="ResultRef">
+							<EXP><![CDATA[$V$cp_opposite]]></EXP>
+						</PAR>
+						<PAR Name="Options" />
+					</CALLFUNCTION>
+					<LIST_ADD Id="RDK:26268457" ListRef="result">
+						<PAR Name="VALUE_TO_ADD">
+							<EXP><![CDATA[$=$cp_opposite]]></EXP>
+						</PAR>
+						<PAR Name="POS_TO_ADD" />
+					</LIST_ADD>
+					<SET_STRUCT Id="RDK:26263847" VarRef="SSGParameter" ClearAll="True" ListRef="FilterCpsr">
+						<PAR Name="Key">
+							<EXP><![CDATA[$C$idSource]]></EXP>
+						</PAR>
+						<PAR Name="StrArr" />
+						<PAR Name="StrArr2D" />
+						<PAR Name="Str">
+							<EXP><![CDATA[$=$gerade_r]]></EXP>
+						</PAR>
+						<PAR Name="Dbl" />
+						<PAR Name="Int" />
+						<PAR Name="Boo" />
+					</SET_STRUCT>
+					<SET_STRUCT Id="RDK:26263849" VarRef="SSGParameter" ClearAll="True" ListRef="FilterCpsr">
+						<PAR Name="Key">
+							<EXP><![CDATA[$C$idTarget]]></EXP>
+						</PAR>
+						<PAR Name="StrArr" />
+						<PAR Name="StrArr2D" />
+						<PAR Name="Str">
+							<EXP><![CDATA[$=$weiche_r]]></EXP>
+						</PAR>
+						<PAR Name="Dbl" />
+						<PAR Name="Int" />
+						<PAR Name="Boo" />
+					</SET_STRUCT>
+					<CALLFUNCTION Id="RDK:26263851" DesignTimeRemark="Finde die Verbindungsnamen der Connectionpoints in den ursprünglichen Elementen">
+						<PAR Name="FuncName">
+							<EXP><![CDATA[$C$FilterConnectingPointsBetweenBoth]]></EXP>
+						</PAR>
+						<PAR Name="InputExp">
+							<EXP><![CDATA[$=$FilterCpsr]]></EXP>
+						</PAR>
+						<PAR Name="ResultRef">
+							<EXP><![CDATA[$V$cps]]></EXP>
+						</PAR>
+						<PAR Name="Options" />
+					</CALLFUNCTION>
+					<SET_STRUCT Id="RDK:26263853" VarRef="SSGParameter" ClearAll="True" ListRef="CpSearchR">
+						<PAR Name="Key">
+							<EXP><![CDATA[$C$cpname]]></EXP>
+						</PAR>
+						<PAR Name="StrArr" />
+						<PAR Name="StrArr2D" />
+						<PAR Name="Str">
+							<EXP><![CDATA[$=$cps[0]]]></EXP>
+						</PAR>
+						<PAR Name="Dbl" />
+						<PAR Name="Int" />
+						<PAR Name="Boo" />
+					</SET_STRUCT>
+					<SET_STRUCT Id="RDK:26263855" VarRef="SSGParameter" ClearAll="True" ListRef="CpSearchR">
+						<PAR Name="Key">
+							<EXP><![CDATA[$C$shapeId]]></EXP>
+						</PAR>
+						<PAR Name="StrArr" />
+						<PAR Name="StrArr2D" />
+						<PAR Name="Str">
+							<EXP><![CDATA[$=$weiche_r]]></EXP>
+						</PAR>
+						<PAR Name="Dbl" />
+						<PAR Name="Int" />
+						<PAR Name="Boo" />
+					</SET_STRUCT>
+					<CALLFUNCTION Id="RDK:26263857" DesignTimeRemark="Hier holen wir den ConnPunkt der Weiche, welcher dem Geraden CP gegenüberliegt. Dieser sollte frei sein">
+						<PAR Name="FuncName">
+							<EXP><![CDATA[$C$getOppositeConnectionPoint]]></EXP>
+						</PAR>
+						<PAR Name="InputExp">
+							<EXP><![CDATA[$=$CpSearchR]]></EXP>
 						</PAR>
 						<PAR Name="ResultRef">
 							<EXP><![CDATA[$V$cp_opposite]]></EXP>
@@ -43341,7 +43415,6 @@ me.x
 											<GROUP Id="RDK:26044524" Name="Local Variables" SubType="VarSet" IncludeDate="0">
 												<VAR Id="RDK:26044526" Name="ConnectData" Type="SSGParameter[]" />
 												<VAR Id="RDK:26073311" Name="idsInGroup" Type="string[]" />
-												<VAR Id="RDK:26252078" Name="TargetCps" Type="string[]" />
 											</GROUP>
 											<CALLFUNCTION Id="RDK:26073309">
 												<PAR Name="FuncName">
@@ -43368,7 +43441,7 @@ me.x
 												<PAR Name="Int" />
 												<PAR Name="Boo" />
 											</SET_STRUCT>
-											<CALLFUNCTION Id="RDK:25886854" Suppressed="True">
+											<CALLFUNCTION Id="RDK:25886854" DesignTimeRemark="Erzeuge die Mustergruppen">
 												<PAR Name="FuncName">
 													<EXP><![CDATA[$C$createPatternOmnifloGroup]]></EXP>
 												</PAR>
@@ -43380,18 +43453,6 @@ me.x
 												</PAR>
 												<PAR Name="Options" />
 											</CALLFUNCTION>
-											<CALLFUNCTION Id="RDK:26252082">
-												<PAR Name="FuncName">
-													<EXP><![CDATA[$C$GetTargetConnectingPoints]]></EXP>
-												</PAR>
-												<PAR Name="InputExp">
-													<EXP><![CDATA[$=$MoveData]]></EXP>
-												</PAR>
-												<PAR Name="ResultRef">
-													<EXP><![CDATA[$V$TargetCps]]></EXP>
-												</PAR>
-												<PAR Name="Options" />
-											</CALLFUNCTION>
 											<SET_STRUCT Id="RDK:26044528" VarRef="SSGParameter" ClearAll="True" ListRef="ConnectData">
 												<PAR Name="Key">
 													<EXP><![CDATA[$C$original]]></EXP>
@@ -43418,33 +43479,7 @@ me.x
 												<PAR Name="Int" />
 												<PAR Name="Boo" />
 											</SET_STRUCT>
-											<SET_STRUCT Id="RDK:26044538" VarRef="SSGParameter" ClearAll="True" ListRef="ConnectData">
-												<PAR Name="Key">
-													<EXP><![CDATA[$C$cp_target1]]></EXP>
-												</PAR>
-												<PAR Name="StrArr" />
-												<PAR Name="StrArr2D" />
-												<PAR Name="Str">
-													<EXP><![CDATA[$=$TargetCps[0]]]></EXP>
-												</PAR>
-												<PAR Name="Dbl" />
-												<PAR Name="Int" />
-												<PAR Name="Boo" />
-											</SET_STRUCT>
-											<SET_STRUCT Id="RDK:26044540" VarRef="SSGParameter" ClearAll="True" ListRef="ConnectData">
-												<PAR Name="Key">
-													<EXP><![CDATA[$C$cp_target2]]></EXP>
-												</PAR>
-												<PAR Name="StrArr" />
-												<PAR Name="StrArr2D" />
-												<PAR Name="Str">
-													<EXP><![CDATA[$=$TargetCps[1]]]></EXP>
-												</PAR>
-												<PAR Name="Dbl" />
-												<PAR Name="Int" />
-												<PAR Name="Boo" />
-											</SET_STRUCT>
-											<CALLFUNCTION Id="RDK:26044478">
+											<CALLFUNCTION Id="RDK:26044478" DesignTimeRemark="Verbinde die erzeugten Gruppen untereinander">
 												<PAR Name="FuncName">
 													<EXP><![CDATA[$C$connectNewGroups]]></EXP>
 												</PAR>
@@ -64054,7 +64089,7 @@ me.x
 				<UI_INPUT_VALIDATION ValidationType="none" />
 				<UI_INPUT_SUPPORT>
 					<PAR Name="InputPromptExp">
-						<EXP><![CDATA[$C$Distanz Y (positiv = oben / negativ = unten)]]></EXP>
+						<EXP><![CDATA[$C$Distanz Y (positiv = nach unten / negativ = nach oben)]]></EXP>
 					</PAR>
 					<PAR Name="InputImageExp" />
 					<PAR Name="InputTooltipExp" />