diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 200f844..7ec3685 100644
--- a/MAIN_SSG.rdx
+++ b/MAIN_SSG.rdx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PROCESS Id="RDK:0001" Name="MAIN_SSG" ModernUI="True" Options="(GITSAVEMODE)(NOUPDATEINCLUDEFILES)" Expanded="True">
-	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="y.wang [ANGEBOT-NB02]" ModDate="2024-04-22T11:48:25" LanguageVersion="2014.1.3.635" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2024-04-22T16:42:51" LanguageVersion="2014.1.3.644" />
 	<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">
@@ -982,6 +982,8 @@
 			<VAR Id="RDK:18732561" Name="kreiselhoehe" Type="string" DesignTimeRemark="Generated by RD" />
 			<VAR Id="RDK:18741955" Name="stohoehe" Type="string" DesignTimeRemark="Generated by RD" />
 			<VAR Id="RDK:18741969" Name="cpId" Type="string" DesignTimeRemark="Generated by RD" />
+			<VAR Id="RDK:18742631" Name="shapeId" Type="string" DesignTimeRemark="Generated by RD" />
+			<VAR Id="RDK:18747299" Name="cp_partner" Type="variant" DesignTimeRemark="Generated by RD" />
 		</GROUP>
 		<GROUP Id="RDK:0006" Name="Profiles" SubType="ProfileSet">
 			<PROFILE Id="RDK:383" Name="ImportBackgroundProfile" TypeName="ImportBackgroundType" />
@@ -14575,113 +14577,124 @@ ShapeList["id="+Param.Input[1].shapeID].name
 				</SET>
 			</FUNCTION>
 			<FUNCTION Id="RDK:18732540" Name="SetHeightOfStreckeOnConnect" InputTypeName="Editor2DEventArgumentsTypeList" ResultTypeName="SSGParameter[]">
-				<GROUP Id="RDK:18732536" Name="Filter" SubType="Generic" DesignTimeNotes="(ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].family=&quot;Gefaellestrecke&quot; And  (ShapeList[&quot;id=&quot;+Param.Input[1].shapeID].Rotationsklasse=&quot;Rotationsobjekt&quot;and IsTagInString(Param.Input[1].connectionPointID, &quot;defcp&quot;)))  &#xA;Or &#xA;(ShapeList[&quot;id=&quot;+Param.Input[1].shapeID].family=&quot;Gefaellestrecke&quot; And  (ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].Rotationsklasse=&quot;Rotationsobjekt&quot; and IsTagInString(Param.Input[0].connectionPointID, &quot;defcp&quot;)))  &#xA;">
+				<GROUP Id="RDK:18742673" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
+					<VAR Id="RDK:18742667" Name="item_strecke" Type="Editor2DShapeType" />
+					<VAR Id="RDK:18742737" Name="item_0" Type="Editor2DShapeType" />
+					<VAR Id="RDK:18742668" Name="item_1" Type="Editor2DShapeType" />
+					<VAR Id="RDK:18742669" Name="cp_gefaellestrecke" Type="SSGConnectionPoint" />
+					<VAR Id="RDK:18742670" Name="streckenhoehe" Type="double" />
+					<VAR Id="RDK:18742671" Name="UebergabeListe" Type="SSGParameter[]" />
+					<VAR Id="RDK:18742672" Name="RueckgabeListe" Type="SSGParameter[]" />
+				</GROUP>
+				<SET Id="RDK:18742693" VarRef="item_0">
+					<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID]]]></EXP>
+					<PAR Name="AdvancedOptions" />
+				</SET>
+				<SET Id="RDK:18742695" VarRef="item_1">
+					<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID]]]></EXP>
+					<PAR Name="AdvancedOptions" />
+				</SET>
+				<IFTHENELSE Id="RDK:18742723">
 					<VALUECONDITION Value="true">
-						<EXP><![CDATA[$=$(ShapeList["id="+Param.Input[0].shapeID].family="Gefaellestrecke" and ShapeList["id="+Param.Input[1].shapeID].family="Strecke") or
-(ShapeList["id="+Param.Input[1].shapeID].family="Gefaellestrecke" and ShapeList["id="+Param.Input[0].shapeID].family="Strecke")]]></EXP>
+						<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family="Strecke"]]></EXP>
 					</VALUECONDITION>
-					<GROUP Id="RDK:18732508" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
-						<VAR Id="RDK:18732500" Name="item_0" Type="Editor2DShapeType" />
-						<VAR Id="RDK:18732501" Name="item_1" Type="Editor2DShapeType" />
-						<VAR Id="RDK:18732503" Name="cp_gefaellestrecke" Type="SSGConnectionPoint" />
-						<VAR Id="RDK:18732563" Name="streckenhoehe" Type="double" />
-						<VAR Id="RDK:18732504" Name="sto" Type="double" />
-						<VAR Id="RDK:18732565" Name="stu" Type="double" />
-						<VAR Id="RDK:18732505" Name="jsonValues" Type="string" />
-						<VAR Id="RDK:18732506" Name="UebergabeListe" Type="SSGParameter[]" />
-					</GROUP>
-					<SET Id="RDK:18732509" VarRef="item_0">
-						<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID]]]></EXP>
-						<PAR Name="AdvancedOptions" />
-					</SET>
-					<SET Id="RDK:18732510" VarRef="item_1">
-						<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID]]]></EXP>
-						<PAR Name="AdvancedOptions" />
-					</SET>
-					<IFTHENELSE Id="RDK:18732533">
-						<VALUECONDITION Value="true">
-							<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID].family="Strecke"]]></EXP>
-						</VALUECONDITION>
-						<GROUP Id="RDK:18732521" SubType="Then">
-							<COMMENTS Id="RDK:18732511" DesignTimeRemark="//Gefällestrecke Index == 1" />
-							<SET Id="RDK:18732514" VarRef="cp_gefaellestrecke" DesignTimeNotes="ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].connectionPoints[&quot;cpId=&quot;+cpId]">
-								<EXP><![CDATA[$=$FromJSON(ShapeList["id="+Param.Input[1].shapeID].connectionPoints)["cpId="+cpId]]]></EXP>
-								<PAR Name="AdvancedOptions" />
-							</SET>
-							<SET_STRUCT Id="RDK:18732515" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
-								<PAR Name="Key">
-									<EXP><![CDATA[$C$itemID]]></EXP>
-								</PAR>
-								<PAR Name="Str">
-									<EXP><![CDATA[$=$Param.Input[1].shapeID]]]></EXP>
-								</PAR>
-								<PAR Name="Dbl" />
-								<PAR Name="Int" />
-								<PAR Name="Boo" />
-							</SET_STRUCT>
-							<SET_STRUCT Id="RDK:18732517" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
-								<PAR Name="Key">
-									<EXP><![CDATA[$C$cpId]]></EXP>
-								</PAR>
-								<PAR Name="Str">
-									<EXP><![CDATA[$=$Param.Input[0].connectionPointID]]></EXP>
-								</PAR>
-								<PAR Name="Dbl" />
-								<PAR Name="Int" />
-								<PAR Name="Boo" />
-							</SET_STRUCT>
-							<CALLFUNCTION Id="RDK:18732518">
-								<PAR Name="FuncName">
-									<EXP><![CDATA[$C$GetHeightOfItem]]></EXP>
-								</PAR>
-								<PAR Name="InputExp">
-									<EXP><![CDATA[$=$UebergabeListe]]></EXP>
-								</PAR>
-								<PAR Name="ResultRef">
-									<EXP><![CDATA[$V$]]></EXP>
-								</PAR>
-								<PAR Name="Options" />
-							</CALLFUNCTION>
-						</GROUP>
-						<GROUP Id="RDK:18732532" SubType="Else">
-							<COMMENTS Id="RDK:18732522" DesignTimeRemark="//Gefällestrecke Index == 0" />
-							<SET Id="RDK:18732523" VarRef="cpId">
+					<GROUP Id="RDK:18742716" SubType="Then">
+						<COMMENTS Id="RDK:18742711" DesignTimeRemark="//Strecke hat Index == 0" />
+						<SET Id="RDK:18742739" VarRef="item_strecke">
+							<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID]]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<SET_STRUCT Id="RDK:18742713" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+							<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>
+						<SET_STRUCT Id="RDK:18742714" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+							<PAR Name="Key">
+								<EXP><![CDATA[$C$cpId]]></EXP>
+							</PAR>
+							<PAR Name="Str">
 								<EXP><![CDATA[$=$Param.Input[0].connectionPointID]]></EXP>
-								<PAR Name="AdvancedOptions" />
-							</SET>
-							<SET Id="RDK:18732524" VarRef="streckenhoehe">
-								<EXP><![CDATA[$=$item_1.StreckeDefinition.Hoehe]]></EXP>
-								<PAR Name="AdvancedOptions" />
-							</SET>
-							<CALLFUNCTION Id="RDK:18732529">
-								<PAR Name="FuncName">
-									<EXP><![CDATA[$C$GetHeightOfItem]]></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:18732534" VarRef="Param.Result">
-						<EXP><![CDATA[$=$RueckgabeListe]]></EXP>
-						<PAR Name="AdvancedOptions" />
-					</SET>
-					<EXIT_PROCESS Id="RDK:18732535" BreakType="4" ExitStatus="0" />
-				</GROUP>
-				<GROUP Id="RDK:18732538" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
-					<VAR Id="RDK:18732537" Name="RueckgabeListe" Type="SSGParameter[]" />
-				</GROUP>
-				<SET Id="RDK:18732539" VarRef="Param.Result">
+							</PAR>
+							<PAR Name="Dbl" />
+							<PAR Name="Int" />
+							<PAR Name="Boo" />
+						</SET_STRUCT>
+						<SET Id="RDK:18747301" VarRef="cpId">
+							<EXP><![CDATA[$=$Param.Input[1].connectionPointID]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<SET Id="RDK:18747298" VarRef="cp_partner" DesignTimeNotes="ShapeList[&quot;id=&quot;+Param.Input[0].shapeID].connectionPoints[&quot;cpId=&quot;+cpId]">
+							<EXP><![CDATA[$=$FromJSON(ShapeList["id="+Param.Input[1].shapeID].connectionPoints)["cpId="+cpId]]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<CALLFUNCTION Id="RDK:18742715">
+							<PAR Name="FuncName">
+								<EXP><![CDATA[$C$GetHeightOfItem]]></EXP>
+							</PAR>
+							<PAR Name="InputExp">
+								<EXP><![CDATA[$=$UebergabeListe]]></EXP>
+							</PAR>
+							<PAR Name="ResultRef">
+								<EXP><![CDATA[$V$RueckgabeListe]]></EXP>
+							</PAR>
+							<PAR Name="Options" />
+						</CALLFUNCTION>
+					</GROUP>
+					<GROUP Id="RDK:18742722" SubType="Else">
+						<COMMENTS Id="RDK:18742717" DesignTimeRemark="//Strecke hat Index == 1" />
+						<SET Id="RDK:18742741" VarRef="item_strecke">
+							<EXP><![CDATA[$=$ShapeList["id="+Param.Input[1].shapeID]]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<SET_STRUCT Id="RDK:18742719" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+							<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>
+						<SET_STRUCT Id="RDK:18742720" VarRef="SSGParameter" ClearAll="True" ListRef="UebergabeListe">
+							<PAR Name="Key">
+								<EXP><![CDATA[$C$cpId]]></EXP>
+							</PAR>
+							<PAR Name="Str">
+								<EXP><![CDATA[$=$Param.Input[1].connectionPointID]]></EXP>
+							</PAR>
+							<PAR Name="Dbl" />
+							<PAR Name="Int" />
+							<PAR Name="Boo" />
+						</SET_STRUCT>
+						<CALLFUNCTION Id="RDK:18742721">
+							<PAR Name="FuncName">
+								<EXP><![CDATA[$C$GetHeightOfItem]]></EXP>
+							</PAR>
+							<PAR Name="InputExp">
+								<EXP><![CDATA[$=$UebergabeListe]]></EXP>
+							</PAR>
+							<PAR Name="ResultRef">
+								<EXP><![CDATA[$V$RueckgabeListe]]></EXP>
+							</PAR>
+							<PAR Name="Options" />
+						</CALLFUNCTION>
+					</GROUP>
+				</IFTHENELSE>
+				<SET Id="RDK:18742729" VarRef="Param.Result">
 					<EXP><![CDATA[$=$RueckgabeListe]]></EXP>
 					<PAR Name="AdvancedOptions" />
 				</SET>
 			</FUNCTION>
-			<FUNCTION Id="RDK:18741851" Name="GetHeightOfItem" InputTypeName="Editor2DEventArgumentsTypeList" ResultTypeName="SSGParameter[]">
+			<FUNCTION Id="RDK:18741851" Name="GetHeightOfItem" InputTypeName="SSGParameter[]" ResultTypeName="SSGParameter[]">
 				<GROUP Id="RDK:18741873" Name="LocalVariables" SubType="VarSet" IncludeDate="0">
 					<VAR Id="RDK:18741864" Name="item" Type="Editor2DShapeType" />
 					<VAR Id="RDK:18732502" Name="cpId" Type="string" />
@@ -14693,16 +14706,24 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<VAR Id="RDK:18741959" Name="hoehe_oben" Type="double" />
 					<VAR Id="RDK:18741961" Name="hoehe_unten" Type="double" />
 				</GROUP>
-				<SET Id="RDK:18741948" VarRef="item">
-					<EXP><![CDATA[$=$ShapeList["id="+Param.Input[0].shapeID]]]></EXP>
+				<SET Id="RDK:18742628" VarRef="shapeID">
+					<EXP><![CDATA[$=$Param.Input["key=shapeID"].Str]]></EXP>
 					<PAR Name="AdvancedOptions" />
 				</SET>
-				<SET Id="RDK:18741899" VarRef="cpId">
-					<EXP><![CDATA[$=$Param.Input[1].connectionPointID]]></EXP>
+				<SET Id="RDK:18742630" VarRef="cpId">
+					<EXP><![CDATA[$=$Param.Input["key=cpId"].Str]]></EXP>
+					<PAR Name="AdvancedOptions" />
+				</SET>
+				<SET Id="RDK:18741948" VarRef="item">
+					<EXP><![CDATA[$=$ShapeList["id="+shapeID]]]></EXP>
+					<PAR Name="AdvancedOptions" />
+				</SET>
+				<SET Id="RDK:18753151" VarRef="hoehe">
+					<EXP><![CDATA[$C$0]]></EXP>
 					<PAR Name="AdvancedOptions" />
 				</SET>
 				<SELECTCASE Id="RDK:18741918">
-					<EXP><![CDATA[$C$ShapeList["id="+Param.Input[0].shapeID].family]]></EXP>
+					<EXP><![CDATA[$=$item.family]]></EXP>
 					<CASEGROUP Id="RDK:18741919" CaseType="0">
 						<EXP><![CDATA[$C$Kreisel]]></EXP>
 						<SET Id="RDK:18741946" VarRef="hoehe">
@@ -14713,11 +14734,15 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<CASEGROUP Id="RDK:18741924" CaseType="0">
 						<EXP><![CDATA[$C$Gefaellestrecke]]></EXP>
 						<SET Id="RDK:18741952" VarRef="hoehe_oben">
-							<EXP><![CDATA[$=$item.GefaellestreckeDefinition.HoeheOben]]></EXP>
+							<EXP><![CDATA[$=$item.GefaelleDefinition.HoeheOben]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
 						<SET Id="RDK:18741954" VarRef="hoehe_unten">
-							<EXP><![CDATA[$=$item.GefaellestreckeDefinition.HoeheUnten]]></EXP>
+							<EXP><![CDATA[$=$item.GefaelleDefinition.HoeheUnten]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<SET Id="RDK:18753154" VarRef="hoehe">
+							<EXP><![CDATA[$=$IIF(hoehe_oben<0.001, hoehe_unten, hoehe_oben)]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
 					</CASEGROUP>
@@ -14731,6 +14756,10 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<EXP><![CDATA[$=$item.FoerdererDefinition.HoeheUnten]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
+						<SET Id="RDK:18753165" VarRef="hoehe">
+							<EXP><![CDATA[$=$IIF(hoehe_oben<0.001, float(hoehe_unten), float(hoehe_oben))]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
 					</CASEGROUP>
 					<CASEGROUP Id="RDK:18741920" CaseType="1">
 						<EXP />
@@ -14739,7 +14768,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
 							</PAR>
 							<PAR Name="MsgText">
-								<EXP><![CDATA[$C$das auslesende höhe ist nicht implementiert]]></EXP>
+								<EXP><![CDATA[$C$Dieses Element zum Auslesen der Höhe ist noch nicht implementiert]]></EXP>
 							</PAR>
 							<PAR Name="MsgStyle" />
 							<PAR Name="BtnLayout" />
@@ -19167,7 +19196,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 						</CALLFUNCTION>
 					</CASEGROUP>
 					<CASEGROUP Id="RDK:1241408" CaseType="0" DesignTimeNotes="20230928 -1-">
-						<EXP><![CDATA[$C$SaveSession ]]></EXP>
+						<EXP><![CDATA[$C$SaveSession]]></EXP>
 						<SET Id="RDK:1520381" VarRef="SessionZip">
 							<EXP><![CDATA[$C$Nothing]]></EXP>
 							<PAR Name="AdvancedOptions" />
@@ -19237,7 +19266,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 						</GROUP>
 					</CASEGROUP>
 					<CASEGROUP Id="RDK:1519840" CaseType="0" DesignTimeNotes="20230928 -1-">
-						<EXP><![CDATA[$C$LoadSession ]]></EXP>
+						<EXP><![CDATA[$C$LoadSession]]></EXP>
 						<SET Id="RDK:1520383" VarRef="SessionZip">
 							<EXP><![CDATA[$C$Nothing]]></EXP>
 							<PAR Name="AdvancedOptions" />