diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 20bc89f..aa9885b 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-06-07T11:10:13" LanguageVersion="2014.1.3.674" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="s.schmutzler [ANGEBOT-NB06]" ModDate="2024-06-07T14:46:09" LanguageVersion="2014.1.3.673" />
 	<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">
@@ -1016,6 +1016,8 @@
 			<VAR Id="RDK:18777660" Name="HoeheUnten" Type="string" Suppressed="True" DesignTimeRemark="Generated by RD" />
 			<VAR Id="RDK:18825603" Name="cpId" Type="string" Suppressed="True" DesignTimeRemark="Generated by RD" />
 			<VAR Id="RDK:18826988" Name="shapeID" Type="string" Suppressed="True" DesignTimeRemark="Generated by RD" />
+			<VAR Id="RDK:19440094" Name="item" Type="Editor2DShapeType" DesignTimeRemark="Generated by RD" />
+			<VAR Id="RDK:19440102" Name="shapeID" Type="string" DesignTimeRemark="Generated by RD" />
 		</GROUP>
 		<GROUP Id="RDK:0006" Name="Profiles" SubType="ProfileSet">
 			<PROFILE Id="RDK:383" Name="ImportBackgroundProfile" TypeName="ImportBackgroundType" />
@@ -3298,6 +3300,59 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 							<PAR Name="eventHandlers" />
 						</SET_STRUCT>
 					</FUNCTION>
+					<FUNCTION Id="RDK:18664122" Name="CreatePrototype_Foerderer">
+						<GROUP Id="RDK:18664118" Name="Local Variables" SubType="VarSet" IncludeDate="0" />
+						<COMMENTS Id="RDK:18664119" DesignTimeRemark="Angle definition in GS2D" DesignTimeNotes="           0&#xD;&#xA;            |&#xD;&#xA;270 &lt;-------&gt;90&#xD;&#xA;            |&#xD;&#xA;          180&#xD;&#xA;" />
+						<SET Id="RDK:18664120" VarRef="Property_Prototype">
+							<EXP><![CDATA[$=$Shape_Prototype]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<SET_STRUCT Id="RDK:18664121" VarRef="Property_Prototype">
+							<PAR Name="id" />
+							<PAR Name="name" />
+							<PAR Name="family" />
+							<PAR Name="description" />
+							<PAR Name="text" />
+							<PAR Name="shapeMode" />
+							<PAR Name="icon" />
+							<PAR Name="iconBig" />
+							<PAR Name="image" />
+							<PAR Name="srcSVG" />
+							<PAR Name="src3D" />
+							<PAR Name="srcTexture3D" />
+							<PAR Name="width">
+								<EXP><![CDATA[$=$ConvertToPixel(Property_Prototype.width, "mm", 96)]]></EXP>
+							</PAR>
+							<PAR Name="height">
+								<EXP><![CDATA[$=$ConvertToPixel(Property_Prototype.height, "mm", 96)]]></EXP>
+							</PAR>
+							<PAR Name="depth">
+								<EXP><![CDATA[$=$ConvertToPixel(Property_Prototype.depth, "mm", 96)]]></EXP>
+							</PAR>
+							<PAR Name="behaviour" />
+							<PAR Name="help" />
+							<PAR Name="eventClass" />
+							<PAR Name="linkClass" />
+							<PAR Name="collisionClass" />
+							<PAR Name="containerClass" />
+							<PAR Name="snapClass" />
+							<PAR Name="color" />
+							<PAR Name="colorOpacity" />
+							<PAR Name="lineColor" />
+							<PAR Name="lineColorOpacity" />
+							<PAR Name="color3D" />
+							<PAR Name="colorOpacity3D" />
+							<PAR Name="lineColor3D" />
+							<PAR Name="lineColorOpacity3D" />
+							<PAR Name="custom" />
+							<PAR Name="connectionPoints" />
+							<PAR Name="group2dShapes" />
+							<PAR Name="group2dConnectors" />
+							<PAR Name="group3d" />
+							<PAR Name="eventHandler" />
+							<PAR Name="eventHandlers" />
+						</SET_STRUCT>
+					</FUNCTION>
 					<FUNCTION Id="RDK:439270" Name="Create/Update Shape">
 						<GROUP Id="RDK:439268" Name="Local Variables" SubType="VarSet" IncludeDate="0">
 							<VAR Id="RDK:439269" Name="ID" Type="string" />
@@ -4511,59 +4566,6 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 							</CASEGROUP>
 						</SELECTCASE>
 					</FUNCTION>
-					<FUNCTION Id="RDK:18664122" Name="CreatePrototype_Foerderer">
-						<GROUP Id="RDK:18664118" Name="Local Variables" SubType="VarSet" IncludeDate="0" />
-						<COMMENTS Id="RDK:18664119" DesignTimeRemark="Angle definition in GS2D" DesignTimeNotes="           0&#xD;&#xA;            |&#xD;&#xA;270 &lt;-------&gt;90&#xD;&#xA;            |&#xD;&#xA;          180&#xD;&#xA;" />
-						<SET Id="RDK:18664120" VarRef="Property_Prototype">
-							<EXP><![CDATA[$=$Shape_Prototype]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET_STRUCT Id="RDK:18664121" VarRef="Property_Prototype">
-							<PAR Name="id" />
-							<PAR Name="name" />
-							<PAR Name="family" />
-							<PAR Name="description" />
-							<PAR Name="text" />
-							<PAR Name="shapeMode" />
-							<PAR Name="icon" />
-							<PAR Name="iconBig" />
-							<PAR Name="image" />
-							<PAR Name="srcSVG" />
-							<PAR Name="src3D" />
-							<PAR Name="srcTexture3D" />
-							<PAR Name="width">
-								<EXP><![CDATA[$=$ConvertToPixel(Property_Prototype.width, "mm", 96)]]></EXP>
-							</PAR>
-							<PAR Name="height">
-								<EXP><![CDATA[$=$ConvertToPixel(Property_Prototype.height, "mm", 96)]]></EXP>
-							</PAR>
-							<PAR Name="depth">
-								<EXP><![CDATA[$=$ConvertToPixel(Property_Prototype.depth, "mm", 96)]]></EXP>
-							</PAR>
-							<PAR Name="behaviour" />
-							<PAR Name="help" />
-							<PAR Name="eventClass" />
-							<PAR Name="linkClass" />
-							<PAR Name="collisionClass" />
-							<PAR Name="containerClass" />
-							<PAR Name="snapClass" />
-							<PAR Name="color" />
-							<PAR Name="colorOpacity" />
-							<PAR Name="lineColor" />
-							<PAR Name="lineColorOpacity" />
-							<PAR Name="color3D" />
-							<PAR Name="colorOpacity3D" />
-							<PAR Name="lineColor3D" />
-							<PAR Name="lineColorOpacity3D" />
-							<PAR Name="custom" />
-							<PAR Name="connectionPoints" />
-							<PAR Name="group2dShapes" />
-							<PAR Name="group2dConnectors" />
-							<PAR Name="group3d" />
-							<PAR Name="eventHandler" />
-							<PAR Name="eventHandlers" />
-						</SET_STRUCT>
-					</FUNCTION>
 					<FUNCTION Id="RDK:604706" Name="Write CPs From Data to Prototype">
 						<SET Id="RDK:592704" VarRef="ConnectionPointList">
 							<EXP><![CDATA[$C$NOTHING]]></EXP>
@@ -6980,19 +6982,6 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<EXP><![CDATA[$=$True]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
-									<CALLFUNCTION Id="RDK:18656463" Suppressed="True">
-										<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>
-									<EXIT_PROCESS Id="RDK:18197934" BreakType="4" ExitStatus="0" />
 								</GROUP>
 								<GROUP Id="RDK:18150163" SubType="Else">
 									<ACTION_CALL Id="RDK:18150191" Name="RDEngineering_MsgBox" Suppressed="True" DesignTimeRemark="{Text}">
@@ -7207,19 +7196,6 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<PAR Name="DataSource" />
 										<PAR Name="Options" />
 									</ACTION_CALL>
-									<CALLFUNCTION Id="RDK:18661567" Suppressed="True">
-										<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>
-									<EXIT_PROCESS Id="RDK:18150177" BreakType="4" ExitStatus="0" />
 								</GROUP>
 							</IFTHENELSE>
 						</GROUP>
@@ -7642,6 +7618,42 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 						<PAR Name="eventHandlers" />
 					</SET_STRUCT>
 				</FUNCTION>
+				<FUNCTION Id="RDK:19440091" Name="IndexOfByFieldValue_SSG" InputTypeName="SSGParameter[]" ResultTypeName="integer">
+					<GROUP Id="RDK:19440092" Name="Local Variables" SubType="VarSet" IncludeDate="0">
+						<VAR Id="RDK:19440103" Name="id_array" Type="string[]">
+							<SET Id="RDK:19440104" VarRef="Me">
+								<EXP><![CDATA[$=$StrArrayFromListOfStructs(ShapeList, "id")]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+						</VAR>
+						<VAR Id="RDK:19440105" Name="idx" Type="integer" />
+						<VAR Id="RDK:19440117" Name="shape_id" Type="string">
+							<SET Id="RDK:19440124" VarRef="Me">
+								<EXP><![CDATA[$=$Param.Input["key=id"].Str]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+						</VAR>
+					</GROUP>
+					<FOREACHLOOP Id="RDK:19440093" ItemVarRef="Link" IndexVarRef="idx">
+						<PAR Name="ArrayValueExp">
+							<EXP><![CDATA[$=$id_array]]></EXP>
+						</PAR>
+						<PAR Name="ExitCondExp">
+							<EXP><![CDATA[$V$]]></EXP>
+						</PAR>
+						<IFTHENELSE Id="RDK:19440095">
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$Link=shape_id]]></EXP>
+							</VALUECONDITION>
+							<GROUP Id="RDK:19440096" SubType="Then">
+								<SET Id="RDK:19441477" VarRef="Param.Result">
+									<EXP><![CDATA[$=$idx]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</GROUP>
+						</IFTHENELSE>
+					</FOREACHLOOP>
+				</FUNCTION>
 			</GROUP>
 			<FUNCTION Id="RDK:1332780" Name="InheritHeight" DesignTimeNotes="20231005 -1-" InputTypeName="InheritHeightType">
 				<GROUP Id="RDK:1219232" Name="Inherit height" SubType="Generic" DesignTimeNotes="20230928 -1-">
@@ -7914,7 +7926,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 							<EXP><![CDATA[$C$NOTHING]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
-						<SET Id="RDK:18767982" VarRef="ShapeList[&quot;id=&quot; + Link].lineColor">
+						<SET Id="RDK:18767982" VarRef="ShapeList[&quot;id=&quot; + Link].lineColor" Suppressed="True">
 							<EXP><![CDATA[$C$#f33256]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
@@ -7961,10 +7973,22 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 												<EXP><![CDATA[$C$NOTHING]]></EXP>
 												<PAR Name="AdvancedOptions" />
 											</SET>
-											<SET Id="RDK:18767985" VarRef="ShapeList[LinkIndex].lineColor">
+											<SET Id="RDK:18767985" VarRef="ShapeList[LinkIndex].lineColor" Suppressed="True">
 												<EXP><![CDATA[$C$#f33256]]></EXP>
 												<PAR Name="AdvancedOptions" />
 											</SET>
+											<CALLFUNCTION Id="RDK:19452308">
+												<PAR Name="FuncName">
+													<EXP><![CDATA[$C$SetStatus_False]]></EXP>
+												</PAR>
+												<PAR Name="InputExp">
+													<EXP><![CDATA[$=$Link]]></EXP>
+												</PAR>
+												<PAR Name="ResultRef">
+													<EXP><![CDATA[$V$]]></EXP>
+												</PAR>
+												<PAR Name="Options" />
+											</CALLFUNCTION>
 										</GROUP>
 										<GROUP Id="RDK:1311074" SubType="Else">
 											<GROUP Id="RDK:1325350" Name="Debug" SubType="Generic" Suppressed="True">
@@ -7977,10 +8001,22 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 												<EXP><![CDATA[$C$Gelb]]></EXP>
 												<PAR Name="AdvancedOptions" />
 											</SET>
-											<SET Id="RDK:18767988" VarRef="ShapeList[LinkIndex].lineColor">
+											<SET Id="RDK:18767988" VarRef="ShapeList[LinkIndex].lineColor" Suppressed="True">
 												<EXP><![CDATA[$C$orange]]></EXP>
 												<PAR Name="AdvancedOptions" />
 											</SET>
+											<CALLFUNCTION Id="RDK:19452310">
+												<PAR Name="FuncName">
+													<EXP><![CDATA[$C$SetStatus_Undef]]></EXP>
+												</PAR>
+												<PAR Name="InputExp">
+													<EXP><![CDATA[$=$Link]]></EXP>
+												</PAR>
+												<PAR Name="ResultRef">
+													<EXP><![CDATA[$V$]]></EXP>
+												</PAR>
+												<PAR Name="Options" />
+											</CALLFUNCTION>
 										</GROUP>
 									</IFTHENELSE>
 								</CASEGROUP>
@@ -8004,10 +8040,22 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 												<EXP><![CDATA[$C$NOTHING]]></EXP>
 												<PAR Name="AdvancedOptions" />
 											</SET>
-											<SET Id="RDK:18767991" VarRef="ShapeList[LinkIndex].lineColor">
+											<SET Id="RDK:18767991" VarRef="ShapeList[LinkIndex].lineColor" Suppressed="True">
 												<EXP><![CDATA[$C$#f33256]]></EXP>
 												<PAR Name="AdvancedOptions" />
 											</SET>
+											<CALLFUNCTION Id="RDK:19452312">
+												<PAR Name="FuncName">
+													<EXP><![CDATA[$C$SetStatus_False]]></EXP>
+												</PAR>
+												<PAR Name="InputExp">
+													<EXP><![CDATA[$=$Link]]></EXP>
+												</PAR>
+												<PAR Name="ResultRef">
+													<EXP><![CDATA[$V$]]></EXP>
+												</PAR>
+												<PAR Name="Options" />
+											</CALLFUNCTION>
 										</GROUP>
 										<GROUP Id="RDK:1493116" SubType="Else">
 											<GROUP Id="RDK:1488270" Name="If was not removed before" SubType="Generic">
@@ -8130,10 +8178,22 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 														<EXP><![CDATA[$C$NOTHING]]></EXP>
 														<PAR Name="AdvancedOptions" />
 													</SET>
-													<SET Id="RDK:18767997" VarRef="ShapeList[TempLinkIndex].lineColor">
+													<SET Id="RDK:18767997" VarRef="ShapeList[TempLinkIndex].lineColor" Suppressed="True">
 														<EXP><![CDATA[$C$#f33256]]></EXP>
 														<PAR Name="AdvancedOptions" />
 													</SET>
+													<CALLFUNCTION Id="RDK:19452314">
+														<PAR Name="FuncName">
+															<EXP><![CDATA[$C$SetStatus_False]]></EXP>
+														</PAR>
+														<PAR Name="InputExp">
+															<EXP><![CDATA[$=$Link]]></EXP>
+														</PAR>
+														<PAR Name="ResultRef">
+															<EXP><![CDATA[$V$]]></EXP>
+														</PAR>
+														<PAR Name="Options" />
+													</CALLFUNCTION>
 												</GROUP>
 												<GROUP Id="RDK:1311121" SubType="Else">
 													<GROUP Id="RDK:1325369" Name="Debug" SubType="Generic" Suppressed="True">
@@ -8171,10 +8231,22 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 												<EXP><![CDATA[$C$^ Gelb]]></EXP>
 												<PAR Name="AdvancedOptions" />
 											</SET>
-											<SET Id="RDK:18768003" VarRef="ShapeList[TempLinkIndex].lineColor">
+											<SET Id="RDK:18768003" VarRef="ShapeList[TempLinkIndex].lineColor" Suppressed="True">
 												<EXP><![CDATA[$C$orange]]></EXP>
 												<PAR Name="AdvancedOptions" />
 											</SET>
+											<CALLFUNCTION Id="RDK:19452294">
+												<PAR Name="FuncName">
+													<EXP><![CDATA[$C$SetStatus_Undef]]></EXP>
+												</PAR>
+												<PAR Name="InputExp">
+													<EXP><![CDATA[$=$Link]]></EXP>
+												</PAR>
+												<PAR Name="ResultRef">
+													<EXP><![CDATA[$V$]]></EXP>
+												</PAR>
+												<PAR Name="Options" />
+											</CALLFUNCTION>
 										</CASEGROUP>
 										<CASEGROUP Id="RDK:1311126" CaseType="1">
 											<EXP />
@@ -8241,10 +8313,22 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 																<EXP><![CDATA[$C$Grau]]></EXP>
 																<PAR Name="AdvancedOptions" />
 															</SET>
-															<SET Id="RDK:18768006" VarRef="ShapeList[&quot;id=&quot; + Link].lineColor">
+															<SET Id="RDK:18768006" VarRef="ShapeList[&quot;id=&quot; + Link].lineColor" Suppressed="True">
 																<EXP><![CDATA[$C$gray]]></EXP>
 																<PAR Name="AdvancedOptions" />
 															</SET>
+															<CALLFUNCTION Id="RDK:19452296">
+																<PAR Name="FuncName">
+																	<EXP><![CDATA[$C$SetStatus_Ok]]></EXP>
+																</PAR>
+																<PAR Name="InputExp">
+																	<EXP><![CDATA[$=$Link]]></EXP>
+																</PAR>
+																<PAR Name="ResultRef">
+																	<EXP><![CDATA[$V$]]></EXP>
+																</PAR>
+																<PAR Name="Options" />
+															</CALLFUNCTION>
 															<SET Id="RDK:1350847" VarRef="ShapeList[&quot;id=&quot; + Link].KreiselDefinition.Hoehe">
 																<EXP><![CDATA[$=$Param.Input.NewHoeheOben]]></EXP>
 																<PAR Name="AdvancedOptions" />
@@ -8263,10 +8347,22 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 																<EXP><![CDATA[$C$Grau]]></EXP>
 																<PAR Name="AdvancedOptions" />
 															</SET>
-															<SET Id="RDK:18768009" VarRef="ShapeList[&quot;id=&quot; + Link].lineColor">
+															<SET Id="RDK:18768009" VarRef="ShapeList[&quot;id=&quot; + Link].lineColor" Suppressed="True">
 																<EXP><![CDATA[$C$gray]]></EXP>
 																<PAR Name="AdvancedOptions" />
 															</SET>
+															<CALLFUNCTION Id="RDK:19452298">
+																<PAR Name="FuncName">
+																	<EXP><![CDATA[$C$SetStatus_Ok]]></EXP>
+																</PAR>
+																<PAR Name="InputExp">
+																	<EXP><![CDATA[$=$Link]]></EXP>
+																</PAR>
+																<PAR Name="ResultRef">
+																	<EXP><![CDATA[$V$]]></EXP>
+																</PAR>
+																<PAR Name="Options" />
+															</CALLFUNCTION>
 															<SET Id="RDK:1350852" VarRef="ShapeList[&quot;id=&quot; + Link].KreiselDefinition.Hoehe">
 																<EXP><![CDATA[$=$Param.Input.NewHoeheUnten]]></EXP>
 																<PAR Name="AdvancedOptions" />
@@ -8281,10 +8377,22 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 													<EXP><![CDATA[$C$Grau]]></EXP>
 													<PAR Name="AdvancedOptions" />
 												</SET>
-												<SET Id="RDK:18768012" VarRef="ShapeList[&quot;id=&quot; + Link].lineColor">
+												<SET Id="RDK:18768012" VarRef="ShapeList[&quot;id=&quot; + Link].lineColor" Suppressed="True">
 													<EXP><![CDATA[$C$gray]]></EXP>
 													<PAR Name="AdvancedOptions" />
 												</SET>
+												<CALLFUNCTION Id="RDK:19452300">
+													<PAR Name="FuncName">
+														<EXP><![CDATA[$C$SetStatus_Ok]]></EXP>
+													</PAR>
+													<PAR Name="InputExp">
+														<EXP><![CDATA[$=$Link]]></EXP>
+													</PAR>
+													<PAR Name="ResultRef">
+														<EXP><![CDATA[$V$]]></EXP>
+													</PAR>
+													<PAR Name="Options" />
+												</CALLFUNCTION>
 												<SET Id="RDK:1128711" VarRef="ShapeList[&quot;id=&quot; + Link].KreiselDefinition.Hoehe">
 													<EXP><![CDATA[$=$Param.Input.NewHoehe]]></EXP>
 													<PAR Name="AdvancedOptions" />
@@ -8314,10 +8422,22 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 												<EXP><![CDATA[$C$^ Grau]]></EXP>
 												<PAR Name="AdvancedOptions" />
 											</SET>
-											<SET Id="RDK:18768015" VarRef="ShapeList[&quot;id=&quot; + Link].lineColor">
+											<SET Id="RDK:18768015" VarRef="ShapeList[&quot;id=&quot; + Link].lineColor" Suppressed="True">
 												<EXP><![CDATA[$C$gray]]></EXP>
 												<PAR Name="AdvancedOptions" />
 											</SET>
+											<CALLFUNCTION Id="RDK:19452302">
+												<PAR Name="FuncName">
+													<EXP><![CDATA[$C$SetStatus_Ok]]></EXP>
+												</PAR>
+												<PAR Name="InputExp">
+													<EXP><![CDATA[$=$Link]]></EXP>
+												</PAR>
+												<PAR Name="ResultRef">
+													<EXP><![CDATA[$V$]]></EXP>
+												</PAR>
+												<PAR Name="Options" />
+											</CALLFUNCTION>
 											<SELECTCASE Id="RDK:1366798" DesignTimeNotes="20231005 -1-">
 												<EXP><![CDATA[$=$Shape_Prototype.family]]></EXP>
 												<CASEGROUP Id="RDK:1366800" CaseType="0">
@@ -8350,10 +8470,22 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 												<EXP><![CDATA[$C$^ Grau]]></EXP>
 												<PAR Name="AdvancedOptions" />
 											</SET>
-											<SET Id="RDK:18768018" VarRef="ShapeList[&quot;id=&quot; + Link].lineColor">
+											<SET Id="RDK:18768018" VarRef="ShapeList[&quot;id=&quot; + Link].lineColor" Suppressed="True">
 												<EXP><![CDATA[$C$gray]]></EXP>
 												<PAR Name="AdvancedOptions" />
 											</SET>
+											<CALLFUNCTION Id="RDK:19452316">
+												<PAR Name="FuncName">
+													<EXP><![CDATA[$C$SetStatus_Ok]]></EXP>
+												</PAR>
+												<PAR Name="InputExp">
+													<EXP><![CDATA[$=$Link]]></EXP>
+												</PAR>
+												<PAR Name="ResultRef">
+													<EXP><![CDATA[$V$]]></EXP>
+												</PAR>
+												<PAR Name="Options" />
+											</CALLFUNCTION>
 											<SELECTCASE Id="RDK:1366808" DesignTimeNotes="20231005 -1-">
 												<EXP><![CDATA[$=$Shape_Prototype.family]]></EXP>
 												<CASEGROUP Id="RDK:1366810" CaseType="0">
@@ -8390,10 +8522,22 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 													<EXP><![CDATA[$C$^ Grau]]></EXP>
 													<PAR Name="AdvancedOptions" />
 												</SET>
-												<SET Id="RDK:18768021" VarRef="ShapeList[&quot;id=&quot; + Link].lineColor">
+												<SET Id="RDK:18768021" VarRef="ShapeList[&quot;id=&quot; + Link].lineColor" Suppressed="True">
 													<EXP><![CDATA[$C$gray]]></EXP>
 													<PAR Name="AdvancedOptions" />
 												</SET>
+												<CALLFUNCTION Id="RDK:19452304">
+													<PAR Name="FuncName">
+														<EXP><![CDATA[$C$SetStatus_Ok]]></EXP>
+													</PAR>
+													<PAR Name="InputExp">
+														<EXP><![CDATA[$=$Link]]></EXP>
+													</PAR>
+													<PAR Name="ResultRef">
+														<EXP><![CDATA[$V$]]></EXP>
+													</PAR>
+													<PAR Name="Options" />
+												</CALLFUNCTION>
 												<SET Id="RDK:1530046" VarRef="ShapeList[&quot;id=&quot; + Link].GefaelleDefinition.HoeheOben">
 													<EXP><![CDATA[$=$FieldValue(FilterByFieldValue(IndirectConnGefaellestreckeList, "Id", Link, false)[0], "NewHoehe")]]></EXP>
 													<PAR Name="AdvancedOptions" />
@@ -8407,10 +8551,22 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 													<EXP><![CDATA[$C$^ Grau]]></EXP>
 													<PAR Name="AdvancedOptions" />
 												</SET>
-												<SET Id="RDK:18768024" VarRef="ShapeList[&quot;id=&quot; + Link].lineColor">
+												<SET Id="RDK:18768024" VarRef="ShapeList[&quot;id=&quot; + Link].lineColor" Suppressed="True">
 													<EXP><![CDATA[$C$gray]]></EXP>
 													<PAR Name="AdvancedOptions" />
 												</SET>
+												<CALLFUNCTION Id="RDK:19452306">
+													<PAR Name="FuncName">
+														<EXP><![CDATA[$C$SetStatus_Ok]]></EXP>
+													</PAR>
+													<PAR Name="InputExp">
+														<EXP><![CDATA[$=$Link]]></EXP>
+													</PAR>
+													<PAR Name="ResultRef">
+														<EXP><![CDATA[$V$]]></EXP>
+													</PAR>
+													<PAR Name="Options" />
+												</CALLFUNCTION>
 												<SET Id="RDK:1530042" VarRef="ShapeList[&quot;id=&quot; + Link].GefaelleDefinition.HoeheUnten">
 													<EXP><![CDATA[$=$FieldValue(FilterByFieldValue(IndirectConnGefaellestreckeList, "Id", Link, false)[0], "NewHoehe")]]></EXP>
 													<PAR Name="AdvancedOptions" />
@@ -8506,6 +8662,18 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 						<EXP><![CDATA[$C$#f33256]]></EXP>
 						<PAR Name="AdvancedOptions" />
 					</SET>
+					<CALLFUNCTION Id="RDK:19452318" Suppressed="True">
+						<PAR Name="FuncName">
+							<EXP><![CDATA[$C$SetStatus_False]]></EXP>
+						</PAR>
+						<PAR Name="InputExp">
+							<EXP><![CDATA[$=$Link]]></EXP>
+						</PAR>
+						<PAR Name="ResultRef">
+							<EXP><![CDATA[$V$]]></EXP>
+						</PAR>
+						<PAR Name="Options" />
+					</CALLFUNCTION>
 				</GROUP>
 			</FUNCTION>
 			<GROUP Id="RDK:314269" Name="MUI" SubType="FunctionSet" IncludeDate="0">
@@ -9767,6 +9935,9 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 					</SELECTCASE>
 				</FUNCTION>
 				<FUNCTION Id="RDK:314271" Name="GefaelleStreckeUI">
+					<GROUP Id="RDK:19470591" Name="Local Variables" SubType="VarSet" IncludeDate="0">
+						<VAR Id="RDK:19470592" Name="isDefined" Type="boolean" />
+					</GROUP>
 					<ACTION_CALL Id="RDK:397364" Name="RDEngineering_ModernUIRender">
 						<PAR Name="RDLibraryName">
 							<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
@@ -9904,39 +10075,6 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 									</PAR>
 									<PAR Name="Options" />
 								</CALLFUNCTION>
-								<IFTHENELSE Id="RDK:19418256">
-									<VALUECONDITION Value="true">
-										<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.LH_fits]]></EXP>
-									</VALUECONDITION>
-									<GROUP Id="RDK:19418253" SubType="Then">
-										<CALLFUNCTION Id="RDK:19418252">
-											<PAR Name="FuncName">
-												<EXP><![CDATA[$C$SetStatus_Ok]]></EXP>
-											</PAR>
-											<PAR Name="InputExp">
-												<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
-											</PAR>
-											<PAR Name="ResultRef">
-												<EXP><![CDATA[$V$]]></EXP>
-											</PAR>
-											<PAR Name="Options" />
-										</CALLFUNCTION>
-									</GROUP>
-									<GROUP Id="RDK:19418255" SubType="Else">
-										<CALLFUNCTION Id="RDK:19418254">
-											<PAR Name="FuncName">
-												<EXP><![CDATA[$C$SetStatus_False]]></EXP>
-											</PAR>
-											<PAR Name="InputExp">
-												<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
-											</PAR>
-											<PAR Name="ResultRef">
-												<EXP><![CDATA[$V$]]></EXP>
-											</PAR>
-											<PAR Name="Options" />
-										</CALLFUNCTION>
-									</GROUP>
-								</IFTHENELSE>
 							</GROUP>
 							<GROUP Id="RDK:1332808" Name="Gefaellestrecke HoeheOben OR HoeheUnten was changed" SubType="Generic" DesignTimeNotes="20231005 -1-&#xD;&#xA;&#xD;&#xA;Inherit height to direct Shaps and set others to Gelb (except Kreisel Groups).">
 								<VALUECONDITION Value="true" Oper="OR">
@@ -9973,6 +10111,74 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 									<PAR Name="Options" />
 								</CALLFUNCTION>
 							</GROUP>
+							<GROUP Id="RDK:19436667" Name="SetStatus" SubType="Generic">
+								<CALLFUNCTION Id="RDK:19470590">
+									<PAR Name="FuncName">
+										<EXP><![CDATA[$C$Check_is_defined]]></EXP>
+									</PAR>
+									<PAR Name="InputExp">
+										<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
+									</PAR>
+									<PAR Name="ResultRef">
+										<EXP><![CDATA[$V$isDefined]]></EXP>
+									</PAR>
+									<PAR Name="Options" />
+								</CALLFUNCTION>
+								<IFTHENELSE Id="RDK:19470579">
+									<VALUECONDITION Value="false">
+										<EXP><![CDATA[$=$isDefined]]></EXP>
+									</VALUECONDITION>
+									<GROUP Id="RDK:19470580" SubType="Then">
+										<CALLFUNCTION Id="RDK:19470598">
+											<PAR Name="FuncName">
+												<EXP><![CDATA[$C$SetStatus_Undef]]></EXP>
+											</PAR>
+											<PAR Name="InputExp">
+												<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
+											</PAR>
+											<PAR Name="ResultRef">
+												<EXP><![CDATA[$V$]]></EXP>
+											</PAR>
+											<PAR Name="Options" />
+										</CALLFUNCTION>
+									</GROUP>
+									<GROUP Id="RDK:19470581" SubType="Else">
+										<IFTHENELSE Id="RDK:19418256">
+											<VALUECONDITION Value="true">
+												<EXP><![CDATA[$=$Shape_Prototype.GefaelleDefinition.LH_fits]]></EXP>
+											</VALUECONDITION>
+											<GROUP Id="RDK:19418253" SubType="Then">
+												<CALLFUNCTION Id="RDK:19418252">
+													<PAR Name="FuncName">
+														<EXP><![CDATA[$C$SetStatus_Ok]]></EXP>
+													</PAR>
+													<PAR Name="InputExp">
+														<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
+													</PAR>
+													<PAR Name="ResultRef">
+														<EXP><![CDATA[$V$]]></EXP>
+													</PAR>
+													<PAR Name="Options" />
+												</CALLFUNCTION>
+											</GROUP>
+											<GROUP Id="RDK:19418255" SubType="Else">
+												<CALLFUNCTION Id="RDK:19418254">
+													<PAR Name="FuncName">
+														<EXP><![CDATA[$C$SetStatus_False]]></EXP>
+													</PAR>
+													<PAR Name="InputExp">
+														<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
+													</PAR>
+													<PAR Name="ResultRef">
+														<EXP><![CDATA[$V$]]></EXP>
+													</PAR>
+													<PAR Name="Options" />
+												</CALLFUNCTION>
+											</GROUP>
+										</IFTHENELSE>
+									</GROUP>
+								</IFTHENELSE>
+							</GROUP>
 							<EXIT_PROCESS Id="RDK:847707" BreakType="3" ExitStatus="0" />
 						</CASEGROUP>
 						<CASEGROUP Id="RDK:18338597" CaseType="0">
@@ -10341,9 +10547,12 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest
 								<VALUECONDITION Value="true" Oper="OR">
 									<EXP><![CDATA[$=$FieldAffected="winkel_f"]]></EXP>
 								</VALUECONDITION>
-								<VALUECONDITION Value="true">
+								<VALUECONDITION Value="true" Oper="OR">
 									<EXP><![CDATA[$=$FieldAffected="Richtung"]]></EXP>
 								</VALUECONDITION>
+								<VALUECONDITION Value="true">
+									<EXP><![CDATA[$=$FieldAffected = "H_1"]]></EXP>
+								</VALUECONDITION>
 								<COMMENTS Id="RDK:18338594" DesignTimeRemark="Shape_Prototype.FoerdererDefinition.L1" />
 								<CALLFUNCTION Id="RDK:18338595">
 									<PAR Name="FuncName">
@@ -12732,6 +12941,7 @@ me.x
 					<VAR Id="RDK:18374148" Name="RueckgabeListe" Type="SSGParameter[]" />
 					<VAR Id="RDK:18399128" Name="shape_id" Type="string" />
 					<VAR Id="RDK:19089175" Name="item_1" Type="Editor2DShapeType" />
+					<VAR Id="RDK:19474689" Name="LH_fits" Type="boolean" />
 				</GROUP>
 				<SET Id="RDK:1578954" VarRef="Shape_Prototype">
 					<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID]]]></EXP>
@@ -12976,29 +13186,6 @@ me.x
 							</PAR>
 							<PAR Name="Options" />
 						</CALLFUNCTION>
-						<IFTHENELSE Id="RDK:18397858" Suppressed="True">
-							<VALUECONDITION Value="false">
-								<EXP><![CDATA[$=$IsEmpty(RueckgabeListe)]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:18397875" SubType="Then">
-								<SET Id="RDK:18399131" VarRef="shape_id">
-									<EXP><![CDATA[$=$RueckgabeListe["key=ShapeId"].Str]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-								<CALLFUNCTION Id="RDK:18369218">
-									<PAR Name="FuncName">
-										<EXP><![CDATA[$C$CalcGFTheoretischeLänge]]></EXP>
-									</PAR>
-									<PAR Name="InputExp">
-										<EXP><![CDATA[$=$shape_id]]></EXP>
-									</PAR>
-									<PAR Name="ResultRef">
-										<EXP><![CDATA[$V$]]></EXP>
-									</PAR>
-									<PAR Name="Options" />
-								</CALLFUNCTION>
-							</GROUP>
-						</IFTHENELSE>
 						<SET Id="RDK:19089169" VarRef="item_1">
 							<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID]]]></EXP>
 							<PAR Name="AdvancedOptions" />
@@ -13035,6 +13222,10 @@ me.x
 											<PAR Name="Int" />
 											<PAR Name="Boo" />
 										</SET_STRUCT>
+										<SET Id="RDK:19482836" VarRef="LH_fits">
+											<EXP><![CDATA[$=$RueckgabeListe["key=LH_fits"].Boo]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
 										<CALLFUNCTION Id="RDK:19089276">
 											<PAR Name="FuncName">
 												<EXP><![CDATA[$C$WriteShapeDataFoerderer]]></EXP>
@@ -13060,156 +13251,43 @@ me.x
 										<EXP><![CDATA[$=$Param.Input[1].shapeID]]></EXP>
 									</PAR>
 									<PAR Name="ResultRef">
-										<EXP><![CDATA[$V$]]></EXP>
+										<EXP><![CDATA[$V$LH_fits]]></EXP>
 									</PAR>
 									<PAR Name="Options" />
 								</CALLFUNCTION>
 							</CASEGROUP>
 						</SELECTCASE>
-						<IFTHENELSE Id="RDK:18935850" Suppressed="True">
-							<VALUECONDITION Value="true" Oper="OR">
-								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family="Foerderer"]]></EXP>
-							</VALUECONDITION>
+						<IFTHENELSE Id="RDK:19474663">
 							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Foerderer"]]></EXP>
+								<EXP><![CDATA[$=$LH_fits]]></EXP>
 							</VALUECONDITION>
-							<GROUP Id="RDK:18935849" SubType="Then">
-								<IFTHENELSE Id="RDK:18935848">
-									<VALUECONDITION Value="true">
-										<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family="Foerderer"]]></EXP>
-									</VALUECONDITION>
-									<GROUP Id="RDK:18935841" SubType="Then">
-										<CALLFUNCTION Id="RDK:18935836">
-											<PAR Name="FuncName">
-												<EXP><![CDATA[$C$Calculate Foerderer Data]]></EXP>
-											</PAR>
-											<PAR Name="InputExp">
-												<EXP><![CDATA[$=$Param.Input[0].shapeID]]></EXP>
-											</PAR>
-											<PAR Name="ResultRef">
-												<EXP><![CDATA[$V$RueckgabeListe]]></EXP>
-											</PAR>
-											<PAR Name="Options" />
-										</CALLFUNCTION>
-										<IFTHENELSE Id="RDK:18935840">
-											<VALUECONDITION Value="false">
-												<EXP><![CDATA[$=$IsEmpty(RueckgabeListe)]]></EXP>
-											</VALUECONDITION>
-											<GROUP Id="RDK:18935839" SubType="Then">
-												<SET_STRUCT Id="RDK:18935837" VarRef="SSGParameter" ClearAll="True" ListRef="RueckgabeListe">
-													<PAR Name="Key">
-														<EXP><![CDATA[$C$shapeID]]></EXP>
-													</PAR>
-													<PAR Name="Str">
-														<EXP><![CDATA[$=$Param.Input[0].shapeID]]></EXP>
-													</PAR>
-													<PAR Name="Dbl" />
-													<PAR Name="Int" />
-													<PAR Name="Boo" />
-												</SET_STRUCT>
-												<CALLFUNCTION Id="RDK:18935838">
-													<PAR Name="FuncName">
-														<EXP><![CDATA[$C$WriteShapeDataFoerderer]]></EXP>
-													</PAR>
-													<PAR Name="InputExp">
-														<EXP><![CDATA[$=$RueckgabeListe]]></EXP>
-													</PAR>
-													<PAR Name="ResultRef">
-														<EXP><![CDATA[$V$]]></EXP>
-													</PAR>
-													<PAR Name="Options" />
-												</CALLFUNCTION>
-											</GROUP>
-										</IFTHENELSE>
-									</GROUP>
-									<GROUP Id="RDK:18935847" SubType="Else">
-										<CALLFUNCTION Id="RDK:18935842">
-											<PAR Name="FuncName">
-												<EXP><![CDATA[$C$Calculate Foerderer Data]]></EXP>
-											</PAR>
-											<PAR Name="InputExp">
-												<EXP><![CDATA[$=$Param.Input[1].shapeID]]></EXP>
-											</PAR>
-											<PAR Name="ResultRef">
-												<EXP><![CDATA[$V$RueckgabeListe]]></EXP>
-											</PAR>
-											<PAR Name="Options" />
-										</CALLFUNCTION>
-										<IFTHENELSE Id="RDK:18935846">
-											<VALUECONDITION Value="false">
-												<EXP><![CDATA[$=$IsEmpty(RueckgabeListe)]]></EXP>
-											</VALUECONDITION>
-											<GROUP Id="RDK:18935845" SubType="Then">
-												<SET_STRUCT Id="RDK:18935843" VarRef="SSGParameter" ClearAll="True" ListRef="RueckgabeListe">
-													<PAR Name="Key">
-														<EXP><![CDATA[$C$shapeID]]></EXP>
-													</PAR>
-													<PAR Name="Str">
-														<EXP><![CDATA[$=$Param.Input[1].shapeID]]></EXP>
-													</PAR>
-													<PAR Name="Dbl" />
-													<PAR Name="Int" />
-													<PAR Name="Boo" />
-												</SET_STRUCT>
-												<CALLFUNCTION Id="RDK:18935844">
-													<PAR Name="FuncName">
-														<EXP><![CDATA[$C$WriteShapeDataFoerderer]]></EXP>
-													</PAR>
-													<PAR Name="InputExp">
-														<EXP><![CDATA[$=$RueckgabeListe]]></EXP>
-													</PAR>
-													<PAR Name="ResultRef">
-														<EXP><![CDATA[$V$]]></EXP>
-													</PAR>
-													<PAR Name="Options" />
-												</CALLFUNCTION>
-											</GROUP>
-										</IFTHENELSE>
-									</GROUP>
-								</IFTHENELSE>
+							<GROUP Id="RDK:19474664" SubType="Then">
+								<CALLFUNCTION Id="RDK:19474698">
+									<PAR Name="FuncName">
+										<EXP><![CDATA[$C$SetStatus_Ok]]></EXP>
+									</PAR>
+									<PAR Name="InputExp">
+										<EXP><![CDATA[$=$Param.Input[1].shapeID]]></EXP>
+									</PAR>
+									<PAR Name="ResultRef">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+									<PAR Name="Options" />
+								</CALLFUNCTION>
 							</GROUP>
-						</IFTHENELSE>
-						<IFTHENELSE Id="RDK:18935870" Suppressed="True">
-							<VALUECONDITION Value="true" Oper="OR">
-								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family="Gefaellestrecke"]]></EXP>
-							</VALUECONDITION>
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Gefaellestrecke"]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:18935869" SubType="Then">
-								<IFTHENELSE Id="RDK:18935868">
-									<VALUECONDITION Value="true">
-										<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family="Gefaellestrecke"]]></EXP>
-									</VALUECONDITION>
-									<GROUP Id="RDK:18935865" SubType="Then">
-										<CALLFUNCTION Id="RDK:18935864">
-											<PAR Name="FuncName">
-												<EXP><![CDATA[$C$Check_LH_fits_gefaelle]]></EXP>
-											</PAR>
-											<PAR Name="InputExp">
-												<EXP><![CDATA[$=$Param.Input[0].shapeID]]></EXP>
-											</PAR>
-											<PAR Name="ResultRef">
-												<EXP><![CDATA[$V$]]></EXP>
-											</PAR>
-											<PAR Name="Options" />
-										</CALLFUNCTION>
-									</GROUP>
-									<GROUP Id="RDK:18935867" SubType="Else">
-										<CALLFUNCTION Id="RDK:18935866">
-											<PAR Name="FuncName">
-												<EXP><![CDATA[$C$Check_LH_fits_gefaelle]]></EXP>
-											</PAR>
-											<PAR Name="InputExp">
-												<EXP><![CDATA[$=$Param.Input[1].shapeID]]></EXP>
-											</PAR>
-											<PAR Name="ResultRef">
-												<EXP><![CDATA[$V$]]></EXP>
-											</PAR>
-											<PAR Name="Options" />
-										</CALLFUNCTION>
-									</GROUP>
-								</IFTHENELSE>
+							<GROUP Id="RDK:19474665" SubType="Else">
+								<CALLFUNCTION Id="RDK:19474671">
+									<PAR Name="FuncName">
+										<EXP><![CDATA[$C$SetStatus_False]]></EXP>
+									</PAR>
+									<PAR Name="InputExp">
+										<EXP><![CDATA[$=$Param.Input[1].shapeID]]></EXP>
+									</PAR>
+									<PAR Name="ResultRef">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+									<PAR Name="Options" />
+								</CALLFUNCTION>
 							</GROUP>
 						</IFTHENELSE>
 					</CASEGROUP>
@@ -13357,116 +13435,6 @@ me.x
 					</CASEGROUP>
 					<CASEGROUP Id="RDK:1606858" CaseType="0">
 						<EXP><![CDATA[$C$Gefaellestrecke]]></EXP>
-						<IFTHENELSE Id="RDK:18735202" Suppressed="True">
-							<VALUECONDITION Value="true" Oper="OR">
-								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family="Kreisel"]]></EXP>
-							</VALUECONDITION>
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Kreisel"]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:18735222" SubType="Then">
-								<CALLFUNCTION Id="RDK:1608528">
-									<PAR Name="FuncName">
-										<EXP><![CDATA[$C$AddWeiche]]></EXP>
-									</PAR>
-									<PAR Name="InputExp">
-										<EXP><![CDATA[$=$Param.Input]]></EXP>
-									</PAR>
-									<PAR Name="ResultRef">
-										<EXP><![CDATA[$V$]]></EXP>
-									</PAR>
-									<PAR Name="Options" />
-								</CALLFUNCTION>
-								<CALLFUNCTION Id="RDK:1698067">
-									<PAR Name="FuncName">
-										<EXP><![CDATA[$C$SetHeightOnConnect]]></EXP>
-									</PAR>
-									<PAR Name="InputExp">
-										<EXP><![CDATA[$=$Param.Input]]></EXP>
-									</PAR>
-									<PAR Name="ResultRef">
-										<EXP><![CDATA[$V$RueckgabeListe]]></EXP>
-									</PAR>
-									<PAR Name="Options" />
-								</CALLFUNCTION>
-								<IFTHENELSE Id="RDK:18397881">
-									<VALUECONDITION Value="false">
-										<EXP><![CDATA[$=$IsEmpty(RueckgabeListe)]]></EXP>
-									</VALUECONDITION>
-									<GROUP Id="RDK:18397897" SubType="Then">
-										<SET Id="RDK:18399135" VarRef="shape_id">
-											<EXP><![CDATA[$=$RueckgabeListe["key=ShapeId"].Str]]></EXP>
-											<PAR Name="AdvancedOptions" />
-										</SET>
-										<IFTHENELSE Id="RDK:18535115">
-											<VALUECONDITION Value="true" Oper="OR">
-												<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family="Gefaellestrecke"]]></EXP>
-											</VALUECONDITION>
-											<VALUECONDITION Value="true">
-												<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Gefaellestrecke"]]></EXP>
-											</VALUECONDITION>
-											<GROUP Id="RDK:18535114" SubType="Then">
-												<IFTHENELSE Id="RDK:18535113">
-													<VALUECONDITION Value="true">
-														<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family="Gefaellestrecke"]]></EXP>
-													</VALUECONDITION>
-													<GROUP Id="RDK:18535110" SubType="Then">
-														<CALLFUNCTION Id="RDK:18535109">
-															<PAR Name="FuncName">
-																<EXP><![CDATA[$C$Check_LH_fits_gefaelle]]></EXP>
-															</PAR>
-															<PAR Name="InputExp">
-																<EXP><![CDATA[$=$Param.Input[0].shapeID]]></EXP>
-															</PAR>
-															<PAR Name="ResultRef">
-																<EXP><![CDATA[$V$]]></EXP>
-															</PAR>
-															<PAR Name="Options" />
-														</CALLFUNCTION>
-													</GROUP>
-													<GROUP Id="RDK:18535112" SubType="Else">
-														<CALLFUNCTION Id="RDK:18535111">
-															<PAR Name="FuncName">
-																<EXP><![CDATA[$C$Check_LH_fits_gefaelle]]></EXP>
-															</PAR>
-															<PAR Name="InputExp">
-																<EXP><![CDATA[$=$Param.Input[1].shapeID]]></EXP>
-															</PAR>
-															<PAR Name="ResultRef">
-																<EXP><![CDATA[$V$]]></EXP>
-															</PAR>
-															<PAR Name="Options" />
-														</CALLFUNCTION>
-													</GROUP>
-												</IFTHENELSE>
-											</GROUP>
-										</IFTHENELSE>
-									</GROUP>
-								</IFTHENELSE>
-							</GROUP>
-						</IFTHENELSE>
-						<IFTHENELSE Id="RDK:18740477" Suppressed="True">
-							<VALUECONDITION Value="true" Oper="OR">
-								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family="Strecke"]]></EXP>
-							</VALUECONDITION>
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Strecke"]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:18740494" SubType="Then">
-								<CALLFUNCTION Id="RDK:18740496">
-									<PAR Name="FuncName">
-										<EXP><![CDATA[$C$SetHeightOfStreckeOnConnect]]></EXP>
-									</PAR>
-									<PAR Name="InputExp">
-										<EXP><![CDATA[$=$Param.Input]]></EXP>
-									</PAR>
-									<PAR Name="ResultRef">
-										<EXP><![CDATA[$V$RueckgabeListe]]></EXP>
-									</PAR>
-									<PAR Name="Options" />
-								</CALLFUNCTION>
-							</GROUP>
-						</IFTHENELSE>
 						<IFTHENELSE Id="RDK:18827017">
 							<VALUECONDITION Value="true">
 								<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID].family="Kreisel"]]></EXP>
@@ -13501,7 +13469,7 @@ me.x
 										<EXP><![CDATA[$=$IsEmpty(RueckgabeListe)]]></EXP>
 									</VALUECONDITION>
 									<GROUP Id="RDK:18827014" SubType="Then">
-										<CALLFUNCTION Id="RDK:18827007">
+										<CALLFUNCTION Id="RDK:19474708">
 											<PAR Name="FuncName">
 												<EXP><![CDATA[$C$Check_LH_fits_gefaelle]]></EXP>
 											</PAR>
@@ -13509,10 +13477,43 @@ me.x
 												<EXP><![CDATA[$=$Param.Input[0].shapeID]]></EXP>
 											</PAR>
 											<PAR Name="ResultRef">
-												<EXP><![CDATA[$V$]]></EXP>
+												<EXP><![CDATA[$V$LH_fits]]></EXP>
 											</PAR>
 											<PAR Name="Options" />
 										</CALLFUNCTION>
+										<IFTHENELSE Id="RDK:19474720">
+											<VALUECONDITION Value="true">
+												<EXP><![CDATA[$=$LH_fits]]></EXP>
+											</VALUECONDITION>
+											<GROUP Id="RDK:19474717" SubType="Then">
+												<CALLFUNCTION Id="RDK:19474716">
+													<PAR Name="FuncName">
+														<EXP><![CDATA[$C$SetStatus_Ok]]></EXP>
+													</PAR>
+													<PAR Name="InputExp">
+														<EXP><![CDATA[$=$Param.Input[0].shapeID]]></EXP>
+													</PAR>
+													<PAR Name="ResultRef">
+														<EXP><![CDATA[$V$]]></EXP>
+													</PAR>
+													<PAR Name="Options" />
+												</CALLFUNCTION>
+											</GROUP>
+											<GROUP Id="RDK:19474719" SubType="Else">
+												<CALLFUNCTION Id="RDK:19474718">
+													<PAR Name="FuncName">
+														<EXP><![CDATA[$C$SetStatus_False]]></EXP>
+													</PAR>
+													<PAR Name="InputExp">
+														<EXP><![CDATA[$=$Param.Input[0].shapeID]]></EXP>
+													</PAR>
+													<PAR Name="ResultRef">
+														<EXP><![CDATA[$V$]]></EXP>
+													</PAR>
+													<PAR Name="Options" />
+												</CALLFUNCTION>
+											</GROUP>
+										</IFTHENELSE>
 									</GROUP>
 								</IFTHENELSE>
 							</GROUP>
@@ -13991,7 +13992,7 @@ me.x
 							<PAR Name="AdvancedOptions" />
 						</SET>
 						<SET Id="RDK:18656471" VarRef="shape_item.source">
-							<EXP><![CDATA[$=$IIF(shape_item.FoerdererDefinition.LH_fits=True,"Foerderer_Richtig","Foerderer_Falsch")]]></EXP>
+							<EXP><![CDATA[$=$"Foerderer_Default"]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
 						<GROUP Id="RDK:18474160" Name="Write Properties" SubType="Generic">
@@ -15450,6 +15451,12 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<VALUECONDITION Value="true" Oper="OR">
 								<EXP><![CDATA[$=$IsEmpty(shape_item.GefaelleDefinition.HoeheUnten)]]></EXP>
 							</VALUECONDITION>
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$shape_item.GefaelleDefinition.HoeheUnten = 0]]></EXP>
+							</VALUECONDITION>
+							<VALUECONDITION Value="true">
+								<EXP><![CDATA[$=$shape_item.GefaelleDefinition.HoeheOben = 0]]></EXP>
+							</VALUECONDITION>
 							<GROUP Id="RDK:19265775" SubType="Then">
 								<SET Id="RDK:19265774" VarRef="Param.Result">
 									<EXP><![CDATA[$=$False]]></EXP>
@@ -15537,7 +15544,10 @@ ShapeList["id="+Param.Input[1].shapeID].name
 						<EXP><![CDATA[$=$shape_item.family = "Gefaellestrecke"]]></EXP>
 					</VALUECONDITION>
 					<GROUP Id="RDK:18330618" SubType="Then">
-						<EXIT_PROCESS Id="RDK:18330627" BreakType="4" ExitStatus="0" />
+						<SET Id="RDK:19474686" VarRef="Param.Result">
+							<EXP><![CDATA[$C$False]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
 					</GROUP>
 					<GROUP Id="RDK:18330619" SubType="Else">
 						<SET Id="RDK:18330638" VarRef="L_th">
@@ -15564,39 +15574,10 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<EXP><![CDATA[$=$shape_item]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
-						<IFTHENELSE Id="RDK:19306684">
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$shape_item.GefaelleDefinition.LH_fits]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:19306685" SubType="Then">
-								<CALLFUNCTION Id="RDK:19281369">
-									<PAR Name="FuncName">
-										<EXP><![CDATA[$C$SetStatus_Ok]]></EXP>
-									</PAR>
-									<PAR Name="InputExp">
-										<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
-									</PAR>
-									<PAR Name="ResultRef">
-										<EXP><![CDATA[$V$]]></EXP>
-									</PAR>
-									<PAR Name="Options" />
-								</CALLFUNCTION>
-							</GROUP>
-							<GROUP Id="RDK:19306686" SubType="Else">
-								<CALLFUNCTION Id="RDK:19306690">
-									<PAR Name="FuncName">
-										<EXP><![CDATA[$C$SetStatus_False]]></EXP>
-									</PAR>
-									<PAR Name="InputExp">
-										<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
-									</PAR>
-									<PAR Name="ResultRef">
-										<EXP><![CDATA[$V$]]></EXP>
-									</PAR>
-									<PAR Name="Options" />
-								</CALLFUNCTION>
-							</GROUP>
-						</IFTHENELSE>
+						<SET Id="RDK:19474679" VarRef="Param.Result">
+							<EXP><![CDATA[$=$shape_item.GefaelleDefinition.LH_fits]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
 					</GROUP>
 				</IFTHENELSE>
 			</FUNCTION>
@@ -15902,21 +15883,52 @@ ShapeList["id="+Param.Input[1].shapeID].name
 				<GROUP Id="RDK:19287454" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
 					<VAR Id="RDK:19290238" Name="shapeID" Type="string" />
 					<VAR Id="RDK:19290240" Name="color" Type="string" />
+					<VAR Id="RDK:19440121" Name="UebergabeListe" Type="SSGParameter[]" />
+					<VAR Id="RDK:19441478" Name="shapeList_idx" Type="integer" />
 				</GROUP>
-				<COMMENTS Id="RDK:19302617" DesignTimeRemark="Param.Input" />
-				<COMMENTS Id="RDK:19302619" DesignTimeRemark="Param.Input[&quot;Key=id&quot;].Str" />
 				<SET Id="RDK:19290237" VarRef="shapeID">
 					<EXP><![CDATA[$=$Param.Input["key=id"].Str]]></EXP>
 					<PAR Name="AdvancedOptions" />
 				</SET>
-				<SET Id="RDK:19290242" VarRef="color">
-					<EXP><![CDATA[$=$Param.Input["key=color"].Str]]></EXP>
-					<PAR Name="AdvancedOptions" />
-				</SET>
-				<SET Id="RDK:19290213" VarRef="ShapeList[IndexOfByFieldValue(ShapeList, &quot;id&quot;, shapeID)].lineColor">
-					<EXP><![CDATA[$=$color]]></EXP>
-					<PAR Name="AdvancedOptions" />
-				</SET>
+				<SET_STRUCT Id="RDK:19440123" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+					<PAR Name="Key">
+						<EXP><![CDATA[$C$id]]></EXP>
+					</PAR>
+					<PAR Name="Str">
+						<EXP><![CDATA[$=$shapeID]]></EXP>
+					</PAR>
+					<PAR Name="Dbl" />
+					<PAR Name="Int" />
+					<PAR Name="Boo" />
+				</SET_STRUCT>
+				<IFTHENELSE Id="RDK:19434514">
+					<VALUECONDITION Value="true">
+						<EXP><![CDATA[$=$Count(FilterByFieldValue(ShapeList, "id", shapeID, false)) = 1
+]]></EXP>
+					</VALUECONDITION>
+					<GROUP Id="RDK:19434525" SubType="Then">
+						<CALLFUNCTION Id="RDK:19440119">
+							<PAR Name="FuncName">
+								<EXP><![CDATA[$C$IndexOfByFieldValue_SSG]]></EXP>
+							</PAR>
+							<PAR Name="InputExp">
+								<EXP><![CDATA[$=$UebergabeListe]]></EXP>
+							</PAR>
+							<PAR Name="ResultRef">
+								<EXP><![CDATA[$V$shapeList_idx]]></EXP>
+							</PAR>
+							<PAR Name="Options" />
+						</CALLFUNCTION>
+						<SET Id="RDK:19290242" VarRef="color">
+							<EXP><![CDATA[$=$Param.Input["key=color"].Str]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<SET Id="RDK:19290213" VarRef="ShapeList[shapeList_idx].lineColor">
+							<EXP><![CDATA[$=$color]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+					</GROUP>
+				</IFTHENELSE>
 			</FUNCTION>
 			<FUNCTION Id="RDK:19290191" Name="SetStatus_False" InputTypeName="string" ResultTypeName="boolean">
 				<GROUP Id="RDK:19290203" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
@@ -15929,51 +15941,44 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<VAR Id="RDK:19290202" Name="UebergabeListe" Type="SSGParameter[]" />
 					<VAR Id="RDK:19290288" Name="color" Type="string" />
 				</GROUP>
-				<IFTHENELSE Id="RDK:19290219">
-					<VALUECONDITION Value="true">
-						<EXP><![CDATA[$=$IndexOfByFieldValue(ShapeList, "id", shape_item.id) > -1]]></EXP>
-					</VALUECONDITION>
-					<GROUP Id="RDK:19290215" SubType="Then">
-						<SET Id="RDK:19290301" VarRef="color">
-							<EXP><![CDATA[$C$#f33256]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET_STRUCT Id="RDK:19290187" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
-							<PAR Name="Key">
-								<EXP><![CDATA[$C$id]]></EXP>
-							</PAR>
-							<PAR Name="Str">
-								<EXP><![CDATA[$=$Param.Input]]></EXP>
-							</PAR>
-							<PAR Name="Dbl" />
-							<PAR Name="Int" />
-							<PAR Name="Boo" />
-						</SET_STRUCT>
-						<SET_STRUCT Id="RDK:19290189" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
-							<PAR Name="Key">
-								<EXP><![CDATA[$C$color]]></EXP>
-							</PAR>
-							<PAR Name="Str">
-								<EXP><![CDATA[$=$color]]></EXP>
-							</PAR>
-							<PAR Name="Dbl" />
-							<PAR Name="Int" />
-							<PAR Name="Boo" />
-						</SET_STRUCT>
-						<CALLFUNCTION Id="RDK:19290445">
-							<PAR Name="FuncName">
-								<EXP><![CDATA[$C$SetColorOfShape]]></EXP>
-							</PAR>
-							<PAR Name="InputExp">
-								<EXP><![CDATA[$=$UebergabeListe]]></EXP>
-							</PAR>
-							<PAR Name="ResultRef">
-								<EXP><![CDATA[$V$]]></EXP>
-							</PAR>
-							<PAR Name="Options" />
-						</CALLFUNCTION>
-					</GROUP>
-				</IFTHENELSE>
+				<SET Id="RDK:19435216" VarRef="color">
+					<EXP><![CDATA[$C$#f33256]]></EXP>
+					<PAR Name="AdvancedOptions" />
+				</SET>
+				<SET_STRUCT Id="RDK:19435214" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+					<PAR Name="Key">
+						<EXP><![CDATA[$C$id]]></EXP>
+					</PAR>
+					<PAR Name="Str">
+						<EXP><![CDATA[$=$Param.Input]]></EXP>
+					</PAR>
+					<PAR Name="Dbl" />
+					<PAR Name="Int" />
+					<PAR Name="Boo" />
+				</SET_STRUCT>
+				<SET_STRUCT Id="RDK:19435212" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+					<PAR Name="Key">
+						<EXP><![CDATA[$C$color]]></EXP>
+					</PAR>
+					<PAR Name="Str">
+						<EXP><![CDATA[$=$color]]></EXP>
+					</PAR>
+					<PAR Name="Dbl" />
+					<PAR Name="Int" />
+					<PAR Name="Boo" />
+				</SET_STRUCT>
+				<CALLFUNCTION Id="RDK:19290445">
+					<PAR Name="FuncName">
+						<EXP><![CDATA[$C$SetColorOfShape]]></EXP>
+					</PAR>
+					<PAR Name="InputExp">
+						<EXP><![CDATA[$=$UebergabeListe]]></EXP>
+					</PAR>
+					<PAR Name="ResultRef">
+						<EXP><![CDATA[$V$]]></EXP>
+					</PAR>
+					<PAR Name="Options" />
+				</CALLFUNCTION>
 			</FUNCTION>
 			<FUNCTION Id="RDK:19290193" Name="SetStatus_Undef" InputTypeName="string" ResultTypeName="boolean">
 				<GROUP Id="RDK:19290315" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
@@ -15986,51 +15991,44 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<VAR Id="RDK:19290313" Name="UebergabeListe" Type="SSGParameter[]" />
 					<VAR Id="RDK:19290314" Name="color" Type="string" />
 				</GROUP>
-				<IFTHENELSE Id="RDK:19290373">
-					<VALUECONDITION Value="true">
-						<EXP><![CDATA[$=$IndexOfByFieldValue(ShapeList, "id", shape_item.id) > -1]]></EXP>
-					</VALUECONDITION>
-					<GROUP Id="RDK:19290370" SubType="Then">
-						<SET Id="RDK:19290442" VarRef="color">
-							<EXP><![CDATA[$C$#ffa700]]></EXP>
-							<PAR Name="AdvancedOptions" />
-						</SET>
-						<SET_STRUCT Id="RDK:19290367" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
-							<PAR Name="Key">
-								<EXP><![CDATA[$C$id]]></EXP>
-							</PAR>
-							<PAR Name="Str">
-								<EXP><![CDATA[$=$Param.Input]]></EXP>
-							</PAR>
-							<PAR Name="Dbl" />
-							<PAR Name="Int" />
-							<PAR Name="Boo" />
-						</SET_STRUCT>
-						<SET_STRUCT Id="RDK:19290368" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
-							<PAR Name="Key">
-								<EXP><![CDATA[$C$color]]></EXP>
-							</PAR>
-							<PAR Name="Str">
-								<EXP><![CDATA[$=$color]]></EXP>
-							</PAR>
-							<PAR Name="Dbl" />
-							<PAR Name="Int" />
-							<PAR Name="Boo" />
-						</SET_STRUCT>
-						<CALLFUNCTION Id="RDK:19290447">
-							<PAR Name="FuncName">
-								<EXP><![CDATA[$C$SetColorOfShape]]></EXP>
-							</PAR>
-							<PAR Name="InputExp">
-								<EXP><![CDATA[$=$UebergabeListe]]></EXP>
-							</PAR>
-							<PAR Name="ResultRef">
-								<EXP><![CDATA[$V$]]></EXP>
-							</PAR>
-							<PAR Name="Options" />
-						</CALLFUNCTION>
-					</GROUP>
-				</IFTHENELSE>
+				<SET_STRUCT Id="RDK:19435244" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+					<PAR Name="Key">
+						<EXP><![CDATA[$C$color]]></EXP>
+					</PAR>
+					<PAR Name="Str">
+						<EXP><![CDATA[$=$color]]></EXP>
+					</PAR>
+					<PAR Name="Dbl" />
+					<PAR Name="Int" />
+					<PAR Name="Boo" />
+				</SET_STRUCT>
+				<SET_STRUCT Id="RDK:19435243" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+					<PAR Name="Key">
+						<EXP><![CDATA[$C$id]]></EXP>
+					</PAR>
+					<PAR Name="Str">
+						<EXP><![CDATA[$=$Param.Input]]></EXP>
+					</PAR>
+					<PAR Name="Dbl" />
+					<PAR Name="Int" />
+					<PAR Name="Boo" />
+				</SET_STRUCT>
+				<SET Id="RDK:19435242" VarRef="color">
+					<EXP><![CDATA[$C$#ffa700]]></EXP>
+					<PAR Name="AdvancedOptions" />
+				</SET>
+				<CALLFUNCTION Id="RDK:19290447">
+					<PAR Name="FuncName">
+						<EXP><![CDATA[$C$SetColorOfShape]]></EXP>
+					</PAR>
+					<PAR Name="InputExp">
+						<EXP><![CDATA[$=$UebergabeListe]]></EXP>
+					</PAR>
+					<PAR Name="ResultRef">
+						<EXP><![CDATA[$V$]]></EXP>
+					</PAR>
+					<PAR Name="Options" />
+				</CALLFUNCTION>
 			</FUNCTION>
 			<FUNCTION Id="RDK:19290195" Name="SetStatus_Ok" InputTypeName="string" ResultTypeName="boolean">
 				<GROUP Id="RDK:19290325" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
@@ -16043,106 +16041,99 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<VAR Id="RDK:19290323" Name="UebergabeListe" Type="SSGParameter[]" />
 					<VAR Id="RDK:19290324" Name="color" Type="string" />
 				</GROUP>
-				<IFTHENELSE Id="RDK:19290423">
-					<VALUECONDITION Value="true">
-						<EXP><![CDATA[$=$IndexOfByFieldValue(ShapeList, "id", shape_item.id) > -1]]></EXP>
-					</VALUECONDITION>
-					<GROUP Id="RDK:19290420" SubType="Then">
-						<SELECTCASE Id="RDK:19290416">
-							<EXP><![CDATA[$=$shape_item.family]]></EXP>
-							<CASEGROUP Id="RDK:19290401" CaseType="0">
-								<EXP><![CDATA[$C$Kreisel]]></EXP>
-								<SET Id="RDK:19302622" VarRef="color">
-									<EXP><![CDATA[$C$#0E499F]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</CASEGROUP>
-							<CASEGROUP Id="RDK:19290403" CaseType="0">
-								<EXP><![CDATA[$C$Eckrad]]></EXP>
-								<SET Id="RDK:19290402" VarRef="color">
-									<EXP><![CDATA[$C$#0E499F]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</CASEGROUP>
-							<CASEGROUP Id="RDK:19290405" CaseType="0">
-								<EXP><![CDATA[$C$Gefaellestrecke]]></EXP>
-								<SET Id="RDK:19290404" VarRef="color">
-									<EXP><![CDATA[$C$#6C6E70]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</CASEGROUP>
-							<CASEGROUP Id="RDK:19290407" CaseType="0">
-								<EXP><![CDATA[$C$Strecke]]></EXP>
-								<SET Id="RDK:19290406" VarRef="color">
-									<EXP><![CDATA[$C$#6C6E70]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</CASEGROUP>
-							<CASEGROUP Id="RDK:19290409" CaseType="0">
-								<EXP><![CDATA[$C$Foerderer]]></EXP>
-								<SET Id="RDK:19290408" VarRef="color">
-									<EXP><![CDATA[$C$#0E499F]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</CASEGROUP>
-							<CASEGROUP Id="RDK:19290411" CaseType="0">
-								<EXP><![CDATA[$C$BTMTBeladung]]></EXP>
-								<SET Id="RDK:19290410" VarRef="color">
-									<EXP><![CDATA[$C$#DBDBDB]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</CASEGROUP>
-							<CASEGROUP Id="RDK:19290413" CaseType="0">
-								<EXP><![CDATA[$C$BTMTEntladung]]></EXP>
-								<SET Id="RDK:19290412" VarRef="color">
-									<EXP><![CDATA[$C$#DBDBDB]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</CASEGROUP>
-							<CASEGROUP Id="RDK:19290415" CaseType="1">
-								<EXP />
-								<SET Id="RDK:19290414" VarRef="color">
-									<EXP><![CDATA[$C$#ffffff]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</CASEGROUP>
-						</SELECTCASE>
-						<SET_STRUCT Id="RDK:19290417" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
-							<PAR Name="Key">
-								<EXP><![CDATA[$C$id]]></EXP>
-							</PAR>
-							<PAR Name="Str">
-								<EXP><![CDATA[$=$Param.Input]]></EXP>
-							</PAR>
-							<PAR Name="Dbl" />
-							<PAR Name="Int" />
-							<PAR Name="Boo" />
-						</SET_STRUCT>
-						<SET_STRUCT Id="RDK:19290418" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
-							<PAR Name="Key">
-								<EXP><![CDATA[$C$color]]></EXP>
-							</PAR>
-							<PAR Name="Str">
-								<EXP><![CDATA[$=$color]]></EXP>
-							</PAR>
-							<PAR Name="Dbl" />
-							<PAR Name="Int" />
-							<PAR Name="Boo" />
-						</SET_STRUCT>
-						<CALLFUNCTION Id="RDK:19290449">
-							<PAR Name="FuncName">
-								<EXP><![CDATA[$C$SetColorOfShape]]></EXP>
-							</PAR>
-							<PAR Name="InputExp">
-								<EXP><![CDATA[$=$UebergabeListe]]></EXP>
-							</PAR>
-							<PAR Name="ResultRef">
-								<EXP><![CDATA[$V$]]></EXP>
-							</PAR>
-							<PAR Name="Options" />
-						</CALLFUNCTION>
-					</GROUP>
-				</IFTHENELSE>
+				<SELECTCASE Id="RDK:19435290">
+					<EXP><![CDATA[$=$shape_item.family]]></EXP>
+					<CASEGROUP Id="RDK:19435275" CaseType="0">
+						<EXP><![CDATA[$C$Kreisel]]></EXP>
+						<SET Id="RDK:19435274" VarRef="color">
+							<EXP><![CDATA[$C$#0E499F]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+					</CASEGROUP>
+					<CASEGROUP Id="RDK:19435277" CaseType="0">
+						<EXP><![CDATA[$C$Eckrad]]></EXP>
+						<SET Id="RDK:19435276" VarRef="color">
+							<EXP><![CDATA[$C$#0E499F]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+					</CASEGROUP>
+					<CASEGROUP Id="RDK:19435279" CaseType="0">
+						<EXP><![CDATA[$C$Gefaellestrecke]]></EXP>
+						<SET Id="RDK:19435278" VarRef="color">
+							<EXP><![CDATA[$C$#6C6E70]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+					</CASEGROUP>
+					<CASEGROUP Id="RDK:19435281" CaseType="0">
+						<EXP><![CDATA[$C$Strecke]]></EXP>
+						<SET Id="RDK:19435280" VarRef="color">
+							<EXP><![CDATA[$C$#6C6E70]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+					</CASEGROUP>
+					<CASEGROUP Id="RDK:19435283" CaseType="0">
+						<EXP><![CDATA[$C$Foerderer]]></EXP>
+						<SET Id="RDK:19435282" VarRef="color">
+							<EXP><![CDATA[$C$#0E499F]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+					</CASEGROUP>
+					<CASEGROUP Id="RDK:19435285" CaseType="0">
+						<EXP><![CDATA[$C$BTMTBeladung]]></EXP>
+						<SET Id="RDK:19435284" VarRef="color">
+							<EXP><![CDATA[$C$#DBDBDB]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+					</CASEGROUP>
+					<CASEGROUP Id="RDK:19435287" CaseType="0">
+						<EXP><![CDATA[$C$BTMTEntladung]]></EXP>
+						<SET Id="RDK:19435286" VarRef="color">
+							<EXP><![CDATA[$C$#DBDBDB]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+					</CASEGROUP>
+					<CASEGROUP Id="RDK:19435289" CaseType="1">
+						<EXP />
+						<SET Id="RDK:19435288" VarRef="color">
+							<EXP><![CDATA[$C$#ffffff]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+					</CASEGROUP>
+				</SELECTCASE>
+				<SET_STRUCT Id="RDK:19435292" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+					<PAR Name="Key">
+						<EXP><![CDATA[$C$color]]></EXP>
+					</PAR>
+					<PAR Name="Str">
+						<EXP><![CDATA[$=$color]]></EXP>
+					</PAR>
+					<PAR Name="Dbl" />
+					<PAR Name="Int" />
+					<PAR Name="Boo" />
+				</SET_STRUCT>
+				<SET_STRUCT Id="RDK:19435291" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+					<PAR Name="Key">
+						<EXP><![CDATA[$C$id]]></EXP>
+					</PAR>
+					<PAR Name="Str">
+						<EXP><![CDATA[$=$Param.Input]]></EXP>
+					</PAR>
+					<PAR Name="Dbl" />
+					<PAR Name="Int" />
+					<PAR Name="Boo" />
+				</SET_STRUCT>
+				<CALLFUNCTION Id="RDK:19290449">
+					<PAR Name="FuncName">
+						<EXP><![CDATA[$C$SetColorOfShape]]></EXP>
+					</PAR>
+					<PAR Name="InputExp">
+						<EXP><![CDATA[$=$UebergabeListe]]></EXP>
+					</PAR>
+					<PAR Name="ResultRef">
+						<EXP><![CDATA[$V$]]></EXP>
+					</PAR>
+					<PAR Name="Options" />
+				</CALLFUNCTION>
 			</FUNCTION>
 			<FUNCTION Id="RDK:18732540" Name="SetHeightOfStreckeOnConnect" InputTypeName="Editor2DEventArgumentsTypeList" ResultTypeName="SSGParameter[]">
 				<GROUP Id="RDK:18742673" Name="LocalVariables" SubType="VarSet" IncludeDate="0">