diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 720074f..313a286 100644
--- a/MAIN_SSG.rdx
+++ b/MAIN_SSG.rdx
@@ -4,7 +4,7 @@
 	<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">
-				<TYPE Id="RDK:313478" Name="SSGConnectionPoint" SubType="structure" HasArrayType="True">
+				<TYPE Id="RDK:313478" Name="SSGConnectionPoint" Expanded="True" SubType="structure" HasArrayType="True">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:609117" Name="id" Type="string" />
 					<FIELD Id="RDK:313462" Name="x_M" Type="double" />
@@ -995,6 +995,9 @@
 			<VAR Id="RDK:1007447" Name="Point2DList" Type="Point2D[]" />
 			<VAR Id="RDK:1007444" Name="Point2D" Type="Point2D" />
 			<VAR Id="RDK:1519830" Name="SessionZip" Type="string" />
+			<VAR Id="RDK:20857714" Name="groupIds" Type="string[]" />
+			<VAR Id="RDK:20857929" Name="groupStrings" Type="string[]" />
+			<VAR Id="RDK:20857934" Name="lineStr" Type="string" DesignTimeRemark="Generated by RD" />
 		</GROUP>
 		<GROUP Id="RDK:0006" Name="Profiles" SubType="ProfileSet">
 			<PROFILE Id="RDK:383" Name="ImportBackgroundProfile" TypeName="ImportBackgroundType" />
@@ -9657,13 +9660,6 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 							<EXP><![CDATA[$=$NewList(id0, id1)]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
-						<IFTHENELSE Id="RDK:20857648">
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:20857649" SubType="Then" />
-							<GROUP Id="RDK:20857650" SubType="Else" />
-						</IFTHENELSE>
 						<SET Id="RDK:20851484" VarRef="lineStr">
 							<EXP><![CDATA[$=$ListToStr(line, ";")]]></EXP>
 							<PAR Name="AdvancedOptions" />
@@ -9711,48 +9707,30 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									<PAR Name="AdvancedOptions" />
 								</SET>
 							</VAR>
-							<VAR Id="RDK:20857680" Name="lineStr" Type="string" />
-							<VAR Id="RDK:20857681" Name="idx" Type="integer" />
-							<VAR Id="RDK:20857682" Name="elemIdx" Type="integer" />
-							<VAR Id="RDK:20857683" Name="line" Type="string[]" />
-							<VAR Id="RDK:20857684" Name="testarr" Type="string[]" />
+							<VAR Id="RDK:20857936" Name="lineStr" Type="string" />
 						</GROUP>
-						<SET Id="RDK:20857686" VarRef="line">
-							<EXP><![CDATA[$=$NewList(id0, id1)]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:20857690" VarRef="lineStr">
-							<EXP><![CDATA[$=$ListToStr(line, ";")]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:20857691" VarRef="testarr">
-							<EXP><![CDATA[$=$splitStr(lineStr, ";")]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:20857692" VarRef="idx">
-							<EXP><![CDATA[$=$StrIndexOf(lineStr, id0, 0)]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:20857693" VarRef="idx">
-							<EXP><![CDATA[$=$StrIndexOf(lineStr, id1, 0)]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:20857694" VarRef="idx">
-							<EXP><![CDATA[$=$StrIndexOf(lineStr, "blubb", 0)]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:20857695" VarRef="elemIdx">
-							<EXP><![CDATA[$=$IndexOf(line, id0)]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:20857696" VarRef="elemIdx">
-							<EXP><![CDATA[$=$IndexOf(line, id1)]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET Id="RDK:20857697" VarRef="elemIdx">
-							<EXP><![CDATA[$=$IndexOf(line, "blubb")]]></EXP>
+						<LIST_ADD Id="RDK:20857921" ListRef="GroupIds">
+							<PAR Name="VALUE_TO_ADD">
+								<EXP><![CDATA[$=$id0]]></EXP>
+							</PAR>
+							<PAR Name="POS_TO_ADD" />
+						</LIST_ADD>
+						<LIST_ADD Id="RDK:20857923" ListRef="GroupIds">
+							<PAR Name="VALUE_TO_ADD">
+								<EXP><![CDATA[$=$id1]]></EXP>
+							</PAR>
+							<PAR Name="POS_TO_ADD" />
+						</LIST_ADD>
+						<SET Id="RDK:20857933" VarRef="lineStr">
+							<EXP><![CDATA[$=$ListToStr(NewList(id0, id1), ";")]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
+						<LIST_ADD Id="RDK:20857927" ListRef="GroupIds">
+							<PAR Name="VALUE_TO_ADD">
+								<EXP><![CDATA[$=$lineStr]]></EXP>
+							</PAR>
+							<PAR Name="POS_TO_ADD" />
+						</LIST_ADD>
 					</FUNCTION>
 					<FUNCTION Id="RDK:20817718" Name="DestroyGroup" DesignTimeRemark="Löscht die Gruppe mit dem Element der gegeben Id" InputTypeName="string" ResultTypeName="boolean">
 						<GROUP Id="RDK:20832590" Name="Local Variables" SubType="VarSet" IncludeDate="0">
@@ -9768,11 +9746,33 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 						<GROUP Id="RDK:20832570" Name="Local Variables" SubType="VarSet" IncludeDate="0">
 							<VAR Id="RDK:20832569" Name="id0" Type="string">
 								<SET Id="RDK:20832568" VarRef="Me">
-									<EXP><![CDATA[$=$Param.Input[0]]]></EXP>
+									<EXP><![CDATA[$=$Param.Input]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 							</VAR>
+							<VAR Id="RDK:20860735" Name="elemIdx" Type="integer" />
 						</GROUP>
+						<SET Id="RDK:20857806" VarRef="elemIdx">
+							<EXP><![CDATA[$=$IndexOf(groupIds, id0)]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<IFTHENELSE Id="RDK:20857794">
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$elemIdx < 0]]></EXP>
+							</VALUECONDITION>
+							<GROUP Id="RDK:20857792" SubType="Then">
+								<SET Id="RDK:20857782" VarRef="Param.Result">
+									<EXP><![CDATA[$C$False]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</GROUP>
+							<GROUP Id="RDK:20857793" SubType="Else">
+								<SET Id="RDK:20857800" VarRef="Param.Result">
+									<EXP><![CDATA[$C$True]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</GROUP>
+						</IFTHENELSE>
 					</FUNCTION>
 					<FUNCTION Id="RDK:20817722" Name="GetFollowingIds" DesignTimeRemark="Gibt Alle Ids in der Gruppe zurüc, die dem gegebenen Element folgen" InputTypeName="string" ResultTypeName="string[]">
 						<GROUP Id="RDK:20832564" Name="Local Variables" SubType="VarSet" IncludeDate="0">
@@ -9804,15 +9804,62 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 							</VAR>
 						</GROUP>
 					</FUNCTION>
-					<FUNCTION Id="RDK:20817729" Name="AddToGroup" DesignTimeRemark="Fügt die gegebene Id in die Gruppe ein" DesignTimeTip="Params: ElementId_in_Gruppe toAddId" InputTypeName="string[]" ResultTypeName="boolean">
+					<FUNCTION Id="RDK:20817729" Name="AddToGroup" DesignTimeRemark="Fügt die gegebene Id in die Gruppe ein" DesignTimeTip="Params: &lt;Id to Add&gt;, &lt;Id in a Group&gt;" InputTypeName="string[]" ResultTypeName="boolean">
 						<GROUP Id="RDK:20832546" Name="Local Variables" SubType="VarSet" IncludeDate="0">
-							<VAR Id="RDK:20832545" Name="id0" Type="string">
+							<VAR Id="RDK:20832545" Name="idToAdd" Type="string">
 								<SET Id="RDK:20832544" VarRef="Me">
 									<EXP><![CDATA[$=$Param.Input[0]]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 							</VAR>
+							<VAR Id="RDK:20857913" Name="idInGroup" Type="string">
+								<SET Id="RDK:20857912" VarRef="Me">
+									<EXP><![CDATA[$=$Param.Input[1]]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</VAR>
+							<VAR Id="RDK:20857944" Name="lineStr" Type="string" />
+							<VAR Id="RDK:20857948" Name="line" Type="string[]" />
+							<VAR Id="RDK:20857950" Name="splitarr" Type="string[]" />
 						</GROUP>
+						<LIST_ADD Id="RDK:20857925" ListRef="GroupIds">
+							<PAR Name="VALUE_TO_ADD">
+								<EXP><![CDATA[$=$idToAdd]]></EXP>
+							</PAR>
+							<PAR Name="POS_TO_ADD" />
+						</LIST_ADD>
+						<FOREACHLOOP Id="RDK:20857942" ItemVarRef="lineStr">
+							<PAR Name="ArrayValueExp">
+								<EXP><![CDATA[$=$groupStrings]]></EXP>
+							</PAR>
+							<PAR Name="ExitCondExp">
+								<EXP><![CDATA[$V$]]></EXP>
+							</PAR>
+							<SET Id="RDK:20857952" VarRef="splitarr">
+								<EXP><![CDATA[$=$splitStr(lineStr, ";")]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+							<IFTHENELSE Id="RDK:20857975" Suppressed="True">
+								<VALUECONDITION Value="true">
+									<EXP><![CDATA[$=$splitarr[0] = idToAdd]]></EXP>
+								</VALUECONDITION>
+								<VALUECONDITION Value="true">
+									<EXP><![CDATA[$=$IndexOf(splitarr, idToAdd) > 0]]></EXP>
+								</VALUECONDITION>
+								<GROUP Id="RDK:20857967" SubType="Then" />
+								<GROUP Id="RDK:20857974" SubType="Else" />
+							</IFTHENELSE>
+							<SET Id="RDK:20857940" VarRef="lineStr">
+								<EXP><![CDATA[$=$ListToStr(NewList(id0, id1), ";")]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+							<LIST_ADD Id="RDK:20857941" Suppressed="True" ListRef="GroupIds">
+								<PAR Name="VALUE_TO_ADD">
+									<EXP><![CDATA[$=$ListToStr(NewList(id0, id1), ";")]]></EXP>
+								</PAR>
+								<PAR Name="POS_TO_ADD" />
+							</LIST_ADD>
+						</FOREACHLOOP>
 					</FUNCTION>
 					<FUNCTION Id="RDK:20817731" Name="MergeGroups" DesignTimeRemark="nimmt die gebenen beiden Ids aus den Enden von Gruppe1 und Gruppe2  macht eine neue Gruppe daraus" InputTypeName="string[]" ResultTypeName="boolean">
 						<GROUP Id="RDK:20832580" Name="Local Variables" SubType="VarSet" IncludeDate="0">
@@ -9842,19 +9889,142 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 					</FUNCTION>
 					<FUNCTION Id="RDK:20857710" Name="MergeIdsToGroup" DesignTimeRemark="nimmt die gebenen beiden Ids und macht bei Bedarf eine neue Gruppe oder Merged vorhandene" InputTypeName="string[]" ResultTypeName="boolean">
 						<GROUP Id="RDK:20857709" Name="Local Variables" SubType="VarSet" IncludeDate="0">
-							<VAR Id="RDK:20857706" Name="id0" Type="string">
-								<SET Id="RDK:20857705" VarRef="Me">
-									<EXP><![CDATA[$=$Param.Input[0]]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</VAR>
 							<VAR Id="RDK:20857708" Name="id1" Type="string">
 								<SET Id="RDK:20857707" VarRef="Me">
 									<EXP><![CDATA[$=$Param.Input[1]]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 							</VAR>
+							<VAR Id="RDK:20857706" Name="id0" Type="string">
+								<SET Id="RDK:20857705" VarRef="Me">
+									<EXP><![CDATA[$=$Param.Input[0]]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</VAR>
+							<VAR Id="RDK:20857741" Name="IsUsed0" Type="boolean" />
+							<VAR Id="RDK:20863471" Name="IsUsed1" Type="boolean" />
 						</GROUP>
+						<CALLFUNCTION Id="RDK:20857734">
+							<PAR Name="FuncName">
+								<EXP><![CDATA[$C$IsInGroup]]></EXP>
+							</PAR>
+							<PAR Name="InputExp">
+								<EXP><![CDATA[$=$id0]]></EXP>
+							</PAR>
+							<PAR Name="ResultRef">
+								<EXP><![CDATA[$V$IsUsed0]]></EXP>
+							</PAR>
+							<PAR Name="Options" />
+						</CALLFUNCTION>
+						<CALLFUNCTION Id="RDK:20857743">
+							<PAR Name="FuncName">
+								<EXP><![CDATA[$C$IsInGroup]]></EXP>
+							</PAR>
+							<PAR Name="InputExp">
+								<EXP><![CDATA[$=$id1]]></EXP>
+							</PAR>
+							<PAR Name="ResultRef">
+								<EXP><![CDATA[$V$IsUsed1]]></EXP>
+							</PAR>
+							<PAR Name="Options" />
+						</CALLFUNCTION>
+						<IFTHENELSE Id="RDK:20857891" DesignTimeRemark="Wenn beide Ids noch keiner Gruppe angehören, dann erzeuge eine neue Gruppe">
+							<VALUECONDITION Value="false">
+								<EXP><![CDATA[$=$IsUsed0]]></EXP>
+							</VALUECONDITION>
+							<VALUECONDITION Value="false">
+								<EXP><![CDATA[$=$IsUsed1]]></EXP>
+							</VALUECONDITION>
+							<GROUP Id="RDK:20857901" SubType="Then">
+								<CALLFUNCTION Id="RDK:20857903">
+									<PAR Name="FuncName">
+										<EXP><![CDATA[$C$CreateGroup]]></EXP>
+									</PAR>
+									<PAR Name="InputExp">
+										<EXP><![CDATA[$=$NewList(id0, id1)]]></EXP>
+									</PAR>
+									<PAR Name="ResultRef">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+									<PAR Name="Options" />
+								</CALLFUNCTION>
+								<EXIT_PROCESS Id="RDK:20864841" BreakType="4" ExitStatus="0" />
+							</GROUP>
+						</IFTHENELSE>
+						<IFTHENELSE Id="RDK:20857836" DesignTimeRemark="Wenn beide Ids schon zu jeweils einer Gruppe gehören, dann merge beide Gruppen">
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$IsUsed0]]></EXP>
+							</VALUECONDITION>
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$IsUsed1]]></EXP>
+							</VALUECONDITION>
+							<GROUP Id="RDK:20857833" SubType="Then">
+								<CALLFUNCTION Id="RDK:20857860">
+									<PAR Name="FuncName">
+										<EXP><![CDATA[$C$MergeGroups]]></EXP>
+									</PAR>
+									<PAR Name="InputExp">
+										<EXP><![CDATA[$=$NewList(id0, id1)]]></EXP>
+									</PAR>
+									<PAR Name="ResultRef">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+									<PAR Name="Options" />
+								</CALLFUNCTION>
+							</GROUP>
+							<GROUP Id="RDK:20857835" SubType="Else" DesignTimeRemark="Ansonsten füge eine Id an die jeweils andere Gruppe an oder erzeuge eine neue">
+								<IFTHENELSE Id="RDK:20857762" DesignTimeRemark="Zu dieser Gruppe hinzufügen, wenn eine der Ids schon in einer Gruppe ist.">
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$IsUsed1]]></EXP>
+									</VALUECONDITION>
+									<GROUP Id="RDK:20857760" SubType="Then">
+										<CALLFUNCTION Id="RDK:20857873">
+											<PAR Name="FuncName">
+												<EXP><![CDATA[$C$AddToGroup]]></EXP>
+											</PAR>
+											<PAR Name="InputExp">
+												<EXP><![CDATA[$=$NewList(id0, id1)]]></EXP>
+											</PAR>
+											<PAR Name="ResultRef">
+												<EXP><![CDATA[$V$]]></EXP>
+											</PAR>
+											<PAR Name="Options" />
+										</CALLFUNCTION>
+									</GROUP>
+								</IFTHENELSE>
+								<IFTHENELSE Id="RDK:20857822" DesignTimeRemark="Zu dieser Gruppe hinzufügen, wenn eine der Ids schon in einer Gruppe ist.">
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$IsUsed0]]></EXP>
+									</VALUECONDITION>
+									<GROUP Id="RDK:20857821" SubType="Then">
+										<CALLFUNCTION Id="RDK:20857877">
+											<PAR Name="FuncName">
+												<EXP><![CDATA[$C$AddToGroup]]></EXP>
+											</PAR>
+											<PAR Name="InputExp">
+												<EXP><![CDATA[$=$NewList(id1, id0)]]></EXP>
+											</PAR>
+											<PAR Name="ResultRef">
+												<EXP><![CDATA[$V$]]></EXP>
+											</PAR>
+											<PAR Name="Options" />
+										</CALLFUNCTION>
+									</GROUP>
+								</IFTHENELSE>
+							</GROUP>
+						</IFTHENELSE>
+						<CALLFUNCTION Id="RDK:20857853">
+							<PAR Name="FuncName">
+								<EXP><![CDATA[$C$IsInGroup]]></EXP>
+							</PAR>
+							<PAR Name="InputExp">
+								<EXP><![CDATA[$=$id0]]></EXP>
+							</PAR>
+							<PAR Name="ResultRef">
+								<EXP><![CDATA[$V$IsUsed0]]></EXP>
+							</PAR>
+							<PAR Name="Options" />
+						</CALLFUNCTION>
 					</FUNCTION>
 				</GROUP>
 			</GROUP>