diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 098be85..96c4f86 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="2024-07-25T18:50:49" LanguageVersion="2014.1.3.680" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2024-07-26T16:11:03" LanguageVersion="2014.1.3.680" />
 	<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">
@@ -15766,7 +15766,7 @@ me.x
 					</VALUECONDITION>
 					<GROUP Id="RDK:20734778" SubType="Then">
 						<SET Id="RDK:20734776" VarRef="CpointsKreisel2">
-							<EXP><![CDATA[$=$ShapeList["id="+shapeId_kreisel1].KreiselDefinition.M_Strecke]]></EXP>
+							<EXP><![CDATA[$=$ShapeList["id="+shapeId_kreisel2].KreiselDefinition.M_Strecke]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
 						<SET Id="RDK:20734777" VarRef="xMorS2">
@@ -15776,7 +15776,7 @@ me.x
 					</GROUP>
 					<GROUP Id="RDK:20734780" SubType="Else">
 						<SET Id="RDK:20734779" VarRef="CpointsKreisel2">
-							<EXP><![CDATA[$=$ShapeList["id="+shapeId_kreisel1].KreiselDefinition.S_Strecke]]></EXP>
+							<EXP><![CDATA[$=$ShapeList["id="+shapeId_kreisel2].KreiselDefinition.S_Strecke]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
 					</GROUP>
@@ -15821,12 +15821,12 @@ me.x
 					<EXP><![CDATA[$=$IndexOfByFieldValue(CpointsKreisel2, "id", cpId_2)]]></EXP>
 					<PAR Name="AdvancedOptions" />
 				</SET>
-				<COMMENTS Id="RDK:20734902" DesignTimeRemark="Schneide die Listen ab, ausgehend von den beiden verbundenen Connection Points" />
-				<SET Id="RDK:20734942" VarRef="CpointsKreisel1">
+				<COMMENTS Id="RDK:20734902" Suppressed="True" DesignTimeRemark="Schneide die Listen ab, ausgehend von den beiden verbundenen Connection Points" />
+				<SET Id="RDK:20734942" VarRef="CpointsKreisel1" Suppressed="True">
 					<EXP><![CDATA[$=$ListCrop(CpointsKreisel1, 0, idx1)]]></EXP>
 					<PAR Name="AdvancedOptions" />
 				</SET>
-				<SET Id="RDK:20734944" VarRef="CpointsKreisel2">
+				<SET Id="RDK:20734944" VarRef="CpointsKreisel2" Suppressed="True">
 					<EXP><![CDATA[$=$ListCrop(CpointsKreisel2, 0, idx2)]]></EXP>
 					<PAR Name="AdvancedOptions" />
 				</SET>
@@ -15847,7 +15847,7 @@ me.x
 					<VAR Id="RDK:20734850" Name="SinglePoint" Type="SSGConnectionPoint" />
 				</GROUP>
 				<SET Id="RDK:20738416" VarRef="FirstPoint1">
-					<EXP><![CDATA[$=$CpointsKreisel1[0]]]></EXP>
+					<EXP><![CDATA[$=$CpointsKreisel1[idx1]]]></EXP>
 					<PAR Name="AdvancedOptions" />
 				</SET>
 				<FOREACHLOOP Id="RDK:20738451" ItemVarRef="SinglePoint">
@@ -15864,7 +15864,7 @@ me.x
 						<GROUP Id="RDK:20738468" SubType="Then">
 							<LIST_ADD Id="RDK:20738508" ListRef="distances1">
 								<PAR Name="VALUE_TO_ADD">
-									<EXP><![CDATA[$=$Abs(SinglePoint.x_M - FirstPoint1.x_M)]]></EXP>
+									<EXP><![CDATA[$=$(SinglePoint.x_M - FirstPoint1.x_M)*-1]]></EXP>
 								</PAR>
 								<PAR Name="POS_TO_ADD" />
 							</LIST_ADD>
@@ -15872,7 +15872,7 @@ me.x
 						<GROUP Id="RDK:20738470" SubType="Else">
 							<LIST_ADD Id="RDK:20738510" ListRef="distances1">
 								<PAR Name="VALUE_TO_ADD">
-									<EXP><![CDATA[$=$Abs(SinglePoint.x_S - FirstPoint1.x_S)]]></EXP>
+									<EXP><![CDATA[$=$(SinglePoint.x_S - FirstPoint1.x_S)*-1]]></EXP>
 								</PAR>
 								<PAR Name="POS_TO_ADD" />
 							</LIST_ADD>
@@ -15880,7 +15880,7 @@ me.x
 					</IFTHENELSE>
 				</FOREACHLOOP>
 				<SET Id="RDK:20738441" VarRef="FirstPoint2">
-					<EXP><![CDATA[$=$CpointsKreisel2[0]]]></EXP>
+					<EXP><![CDATA[$=$CpointsKreisel2[idx2]]]></EXP>
 					<PAR Name="AdvancedOptions" />
 				</SET>
 				<FOREACHLOOP Id="RDK:20738452" ItemVarRef="SinglePoint">
@@ -15897,7 +15897,7 @@ me.x
 						<GROUP Id="RDK:20738521" SubType="Then">
 							<LIST_ADD Id="RDK:20738520" ListRef="distances2">
 								<PAR Name="VALUE_TO_ADD">
-									<EXP><![CDATA[$=$Abs(SinglePoint.x_M - FirstPoint2.x_M)]]></EXP>
+									<EXP><![CDATA[$=$(SinglePoint.x_M - FirstPoint2.x_M)*+1]]></EXP>
 								</PAR>
 								<PAR Name="POS_TO_ADD" />
 							</LIST_ADD>
@@ -15905,7 +15905,7 @@ me.x
 						<GROUP Id="RDK:20738523" SubType="Else">
 							<LIST_ADD Id="RDK:20738522" ListRef="distances2">
 								<PAR Name="VALUE_TO_ADD">
-									<EXP><![CDATA[$=$Abs(SinglePoint.x_S - FirstPoint2.x_S)]]></EXP>
+									<EXP><![CDATA[$=$(SinglePoint.x_S - FirstPoint2.x_S)*-1]]></EXP>
 								</PAR>
 								<PAR Name="POS_TO_ADD" />
 							</LIST_ADD>
@@ -15960,18 +15960,18 @@ me.x
 					<PAR Name="ExitCondExp">
 						<EXP><![CDATA[$V$]]></EXP>
 					</PAR>
-					<IFTHENELSE Id="RDK:20738618" DesignTimeRemark="Die erste Distanz zu sich selbst ist immer 0">
-						<VALUECONDITION Value="true">
-							<EXP><![CDATA[$=$idx1 = 0]]></EXP>
-						</VALUECONDITION>
-						<GROUP Id="RDK:20738630" SubType="Then">
-							<EXIT_PROCESS Id="RDK:20738635" BreakType="2" ExitStatus="0" />
-						</GROUP>
-					</IFTHENELSE>
 					<SET Id="RDK:20738423" VarRef="d1">
 						<EXP><![CDATA[$=$distances1[idx1]]]></EXP>
 						<PAR Name="AdvancedOptions" />
 					</SET>
+					<IFTHENELSE Id="RDK:20741582" DesignTimeRemark="Der Connection Point ist schon verbunden">
+						<VALUECONDITION Value="true">
+							<EXP><![CDATA[$=$d1 = 0]]></EXP>
+						</VALUECONDITION>
+						<GROUP Id="RDK:20741581" SubType="Then">
+							<EXIT_PROCESS Id="RDK:20741580" BreakType="2" ExitStatus="0" />
+						</GROUP>
+					</IFTHENELSE>
 					<FOREACHLOOP Id="RDK:20738429" ItemVarRef="P2" IndexVarRef="idx2">
 						<PAR Name="ArrayValueExp">
 							<EXP><![CDATA[$=$CpointsKreisel2]]></EXP>
@@ -15979,18 +15979,18 @@ me.x
 						<PAR Name="ExitCondExp">
 							<EXP><![CDATA[$V$]]></EXP>
 						</PAR>
-						<IFTHENELSE Id="RDK:20738649" DesignTimeRemark="Die erste Distanz zu sich selbst ist immer 0">
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$idx2 = 0]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:20738648" SubType="Then">
-								<EXIT_PROCESS Id="RDK:20738647" BreakType="2" ExitStatus="0" />
-							</GROUP>
-						</IFTHENELSE>
 						<SET Id="RDK:20738614" VarRef="d2">
 							<EXP><![CDATA[$=$distances2[idx2]]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
+						<IFTHENELSE Id="RDK:20741600" DesignTimeRemark="Der Connection Point ist ja schon verbunden.">
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$d2 = 0]]></EXP>
+							</VALUECONDITION>
+							<GROUP Id="RDK:20741599" SubType="Then">
+								<EXIT_PROCESS Id="RDK:20741598" BreakType="2" ExitStatus="0" />
+							</GROUP>
+						</IFTHENELSE>
 						<IFTHENELSE Id="RDK:20738594">
 							<VALUECONDITION Value="true">
 								<EXP><![CDATA[$=$d1 = d2]]></EXP>