diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index d1e8d01..c9d4daf 100644
--- a/MAIN_SSG.rdx
+++ b/MAIN_SSG.rdx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PROCESS Id="RDK:0001" Name="MAIN_SSG" ModernUI="True" Options="(GITSAVEMODE)(NOUPDATEINCLUDEFILES)" Expanded="True">
-	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2025-02-25T17:26:50" LanguageVersion="2014.1.3.699" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2025-02-26T11:21:28" LanguageVersion="2014.1.3.699" />
 	<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">
@@ -167,7 +167,7 @@
 					<FIELD Id="RDK:23017101" Name="n_Sep" Type="integer" />
 					<FIELD Id="RDK:23017102" Name="n_Scan" Type="integer" />
 				</TYPE>
-				<TYPE Id="RDK:23017447" Name="OFBogenType" SubType="structure" HasArrayType="True">
+				<TYPE Id="RDK:23017447" Name="OFBogenType" Expanded="True" SubType="structure" HasArrayType="True">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:23017438" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:23017439" Name="L1" Type="double" />
@@ -249,7 +249,7 @@
 					<FIELD Id="RDK:23221871" Name="OFWeicheDefinition" Type="OFWeicheType" />
 					<FIELD Id="RDK:21686356" Name="KurveFoerdererDefinition" Type="KurveFoerdererType" />
 				</TYPE>
-				<TYPE Id="RDK:1783792" Name="SSGParameter" Expanded="True" SubType="structure" HasArrayType="True">
+				<TYPE Id="RDK:1783792" Name="SSGParameter" SubType="structure" HasArrayType="True">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:1783794" Name="Key" Type="string" />
 					<FIELD Id="RDK:21032090" Name="StrArr" Type="string[]" />
@@ -1297,7 +1297,6 @@
 			<VAR Id="RDK:22938910" Name="KeyValues" Type="SSGDictArr[]" DesignTimeRemark="Array von Key-Value paaren, um sich eine liste von Begriffen zu einem Key zu merken" />
 			<VAR Id="RDK:23222557" Name="OFBogenData" Type="OFBogenType[]" />
 			<VAR Id="RDK:23222658" Name="OFWeichenData" Type="OFWeicheType[]" />
-			<VAR Id="RDK:23270710" Name="Ergebnis" Type="SSGParameter" DesignTimeRemark="Generated by RD" />
 		</GROUP>
 		<GROUP Id="RDK:0006" Name="Profiles" SubType="ProfileSet">
 			<PROFILE Id="RDK:383" Name="ImportBackgroundProfile" TypeName="ImportBackgroundType" />
@@ -8460,42 +8459,24 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 								<PAR Name="AdvancedOptions" />
 							</SET>
 						</VAR>
-						<VAR Id="RDK:23016655" Name="anzahlKurvenOFLinks90" Type="integer">
+						<VAR Id="RDK:23016655" Name="anzahlKurvenOF90" Type="integer">
 							<SET Id="RDK:23016654" VarRef="Me">
 								<EXP><![CDATA[$C$0]]></EXP>
 								<PAR Name="AdvancedOptions" />
 							</SET>
 						</VAR>
-						<VAR Id="RDK:23016659" Name="anzahlKurvenOFLinks60" Type="integer">
+						<VAR Id="RDK:23016659" Name="anzahlKurvenOF60" Type="integer">
 							<SET Id="RDK:23016658" VarRef="Me">
 								<EXP><![CDATA[$C$0]]></EXP>
 								<PAR Name="AdvancedOptions" />
 							</SET>
 						</VAR>
-						<VAR Id="RDK:23016663" Name="anzahlKurvenOFLinks30" Type="integer">
+						<VAR Id="RDK:23016663" Name="anzahlKurvenOF30" Type="integer">
 							<SET Id="RDK:23016662" VarRef="Me">
 								<EXP><![CDATA[$C$0]]></EXP>
 								<PAR Name="AdvancedOptions" />
 							</SET>
 						</VAR>
-						<VAR Id="RDK:23016667" Name="anzahlKurvenOFRechts90" Type="integer">
-							<SET Id="RDK:23016666" VarRef="Me">
-								<EXP><![CDATA[$C$0]]></EXP>
-								<PAR Name="AdvancedOptions" />
-							</SET>
-						</VAR>
-						<VAR Id="RDK:23016671" Name="anzahlKurvenOFRechts60" Type="integer">
-							<SET Id="RDK:23016670" VarRef="Me">
-								<EXP><![CDATA[$C$0]]></EXP>
-								<PAR Name="AdvancedOptions" />
-							</SET>
-						</VAR>
-						<VAR Id="RDK:23016675" Name="anzahlKurvenOFRechts30" Type="integer">
-							<SET Id="RDK:23016674" VarRef="Me">
-								<EXP><![CDATA[$C$0]]></EXP>
-								<PAR Name="AdvancedOptions" />
-							</SET>
-						</VAR>
 						<VAR Id="RDK:22029359" Name="result" Type="GefälleStreckeMerkmaleType" />
 					</GROUP>
 					<FOREACHLOOP Id="RDK:22029094" ItemVarRef="shapeId" IndexVarRef="i">
@@ -8659,29 +8640,12 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 							<CASEGROUP Id="RDK:23016648" CaseType="0">
 								<EXP><![CDATA[$C$OFBogen]]></EXP>
 								<IFTHENELSE Id="RDK:23016632">
-									<VALUECONDITION Value="true">
-										<EXP><![CDATA[$=$shapeItem.OFBogenDefinition.KurvenRichtung = "links"]]></EXP>
-									</VALUECONDITION>
 									<VALUECONDITION Value="true">
 										<EXP><![CDATA[$=$shapeItem.OFBogenDefinition.KurvenWinkel = 30]]></EXP>
 									</VALUECONDITION>
 									<GROUP Id="RDK:23016631" SubType="Then">
-										<SET Id="RDK:23016630" VarRef="anzahlKurvenOFLinks30">
-											<EXP><![CDATA[$=$anzahlKurvenOFLinks30 + 1]]></EXP>
-											<PAR Name="AdvancedOptions" />
-										</SET>
-									</GROUP>
-								</IFTHENELSE>
-								<IFTHENELSE Id="RDK:23016635">
-									<VALUECONDITION Value="true">
-										<EXP><![CDATA[$=$shapeItem.OFBogenDefinition.KurvenRichtung = "rechts"]]></EXP>
-									</VALUECONDITION>
-									<VALUECONDITION Value="true">
-										<EXP><![CDATA[$=$shapeItem.OFBogenDefinition.KurvenWinkel = 30]]></EXP>
-									</VALUECONDITION>
-									<GROUP Id="RDK:23016634" SubType="Then">
-										<SET Id="RDK:23016633" VarRef="anzahlKurvenOFRechts30">
-											<EXP><![CDATA[$=$anzahlKurvenOFRechts30 + 1]]></EXP>
+										<SET Id="RDK:23016630" VarRef="anzahlKurvenOF30">
+											<EXP><![CDATA[$=$anzahlKurvenOF30 + 1]]></EXP>
 											<PAR Name="AdvancedOptions" />
 										</SET>
 									</GROUP>
@@ -8694,22 +8658,8 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<EXP><![CDATA[$=$shapeItem.OFBogenDefinition.KurvenWinkel = 60]]></EXP>
 									</VALUECONDITION>
 									<GROUP Id="RDK:23016637" SubType="Then">
-										<SET Id="RDK:23016636" VarRef="anzahlKurvenOFLinks60">
-											<EXP><![CDATA[$=$anzahlKurvenOFLinks60 + 1]]></EXP>
-											<PAR Name="AdvancedOptions" />
-										</SET>
-									</GROUP>
-								</IFTHENELSE>
-								<IFTHENELSE Id="RDK:23016641">
-									<VALUECONDITION Value="true">
-										<EXP><![CDATA[$=$shapeItem.OFBogenDefinition.KurvenRichtung = "rechts"]]></EXP>
-									</VALUECONDITION>
-									<VALUECONDITION Value="true">
-										<EXP><![CDATA[$=$shapeItem.OFBogenDefinition.KurvenWinkel = 60]]></EXP>
-									</VALUECONDITION>
-									<GROUP Id="RDK:23016640" SubType="Then">
-										<SET Id="RDK:23016639" VarRef="anzahlKurvenOFRechts60">
-											<EXP><![CDATA[$=$anzahlKurvenOFRechts60 + 1]]></EXP>
+										<SET Id="RDK:23016636" VarRef="anzahlKurvenOF60">
+											<EXP><![CDATA[$=$anzahlKurvenOF60 + 1]]></EXP>
 											<PAR Name="AdvancedOptions" />
 										</SET>
 									</GROUP>
@@ -8722,22 +8672,8 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<EXP><![CDATA[$=$shapeItem.OFBogenDefinition.KurvenWinkel = 90]]></EXP>
 									</VALUECONDITION>
 									<GROUP Id="RDK:23016643" SubType="Then">
-										<SET Id="RDK:23016642" VarRef="anzahlKurvenOFLinks90">
-											<EXP><![CDATA[$=$anzahlKurvenOFLinks90 + 1]]></EXP>
-											<PAR Name="AdvancedOptions" />
-										</SET>
-									</GROUP>
-								</IFTHENELSE>
-								<IFTHENELSE Id="RDK:23016647">
-									<VALUECONDITION Value="true">
-										<EXP><![CDATA[$=$shapeItem.OFBogenDefinition.KurvenRichtung = "rechts"]]></EXP>
-									</VALUECONDITION>
-									<VALUECONDITION Value="true">
-										<EXP><![CDATA[$=$shapeItem.OFBogenDefinition.KurvenWinkel = 90]]></EXP>
-									</VALUECONDITION>
-									<GROUP Id="RDK:23016646" SubType="Then">
-										<SET Id="RDK:23016645" VarRef="anzahlKurvenOFRechts90">
-											<EXP><![CDATA[$=$anzahlKurvenOFRechts90 + 1]]></EXP>
+										<SET Id="RDK:23016642" VarRef="anzahlKurvenOF90">
+											<EXP><![CDATA[$=$anzahlKurvenOF90 + 1]]></EXP>
 											<PAR Name="AdvancedOptions" />
 										</SET>
 									</GROUP>
@@ -12050,52 +11986,43 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 							<PAR Name="AdvancedOptions" />
 						</SET>
 					</FUNCTION>
-					<FUNCTION Id="RDK:23222043" Name="SetDropdownOFWeiche" InputTypeName="SSGParameter[]">
+					<FUNCTION Id="RDK:23222043" Name="SetDropdownOFWeiche" InputTypeName="OFWeicheType">
 						<GROUP Id="RDK:23222011" Name="Local Variables" SubType="VarSet" IncludeDate="0">
 							<VAR Id="RDK:23222010" Name="Local_OFWeicheItemList" Type="DataSourceValInfo[]" />
 							<VAR Id="RDK:23265069" Name="ToAdd" Type="OFWeicheType" />
-							<VAR Id="RDK:23270593" Name="Sivasnr" Type="string">
-								<SET Id="RDK:23270604" VarRef="Me" Suppressed="True">
-									<EXP><![CDATA[$=$Param.Input["key=Sivasnr"].Str]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</VAR>
-							<VAR Id="RDK:23270608" Name="Winkel" Type="string">
-								<SET Id="RDK:23270607" VarRef="Me">
-									<EXP><![CDATA[$=$Param.Input["key=Winkel"].Dbl]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</VAR>
-							<VAR Id="RDK:23270612" Name="Länge" Type="string">
-								<SET Id="RDK:23270611" VarRef="Me" Suppressed="True">
-									<EXP><![CDATA[$=$Param.Input["key=Länge"].Dbl]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</VAR>
-							<VAR Id="RDK:23270616" Name="Breite" Type="string">
-								<SET Id="RDK:23270615" VarRef="Me" Suppressed="True">
-									<EXP><![CDATA[$=$Param.Input["key=Breite"].Dbl]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</VAR>
-							<VAR Id="RDK:23270620" Name="MechanischPneumatisch" Type="string">
-								<SET Id="RDK:23270619" VarRef="Me" Suppressed="True">
-									<EXP><![CDATA[$=$Param.Input["key=MechPneu"].Str]]></EXP>
+							<VAR Id="RDK:23270593" Name="Sivasnr" Type="string" />
+							<VAR Id="RDK:23270608" Name="Winkel" Type="string" />
+							<VAR Id="RDK:23270612" Name="Länge" Type="string" />
+							<VAR Id="RDK:23270616" Name="Breite" Type="string" />
+							<VAR Id="RDK:23270620" Name="MechanischPneumatisch" Type="string" />
+							<VAR Id="RDK:23270729" Name="Weiche" Type="OFWeicheType">
+								<SET Id="RDK:23270802" VarRef="Me">
+									<EXP><![CDATA[$=$Param.Input]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 							</VAR>
 						</GROUP>
 						<IFTHENELSE Id="RDK:23270653">
-							<VALUECONDITION Value="true">
-								<EXP><![CDATA[$=$SSGParamKeyExists("Sivasnr", Param.Input)]]></EXP>
+							<VALUECONDITION Value="false">
+								<EXP><![CDATA[$=$IsEmpty(Weiche.Sivasnr)]]></EXP>
 							</VALUECONDITION>
 							<GROUP Id="RDK:23270654" SubType="Then">
 								<SET Id="RDK:23270663" VarRef="Sivasnr">
-									<EXP><![CDATA[$=$Param.Input["key=Sivasnr"].Str]]></EXP>
+									<EXP><![CDATA[$=$Weiche.Sivasnr]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</GROUP>
+						</IFTHENELSE>
+						<IFTHENELSE Id="RDK:23270747">
+							<VALUECONDITION Value="false">
+								<EXP><![CDATA[$=$IsEmpty(Weiche.KurvenWinkel)]]></EXP>
+							</VALUECONDITION>
+							<GROUP Id="RDK:23270745" SubType="Then">
+								<SET Id="RDK:23270744" VarRef="Winkel">
+									<EXP><![CDATA[$=$Weiche.KurvenWinkel]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 							</GROUP>
-							<GROUP Id="RDK:23270655" SubType="Else" />
 						</IFTHENELSE>
 						<FOREACHLOOP Id="RDK:23265063" ItemVarRef="ToAdd">
 							<PAR Name="ArrayValueExp">
@@ -20472,30 +20399,27 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 				</FUNCTION>
 				<FUNCTION Id="RDK:23222230" Name="OFWeicheUI">
 					<GROUP Id="RDK:23270581" Name="Local Variables" SubType="VarSet" IncludeDate="0">
-						<VAR Id="RDK:23270583" Name="VarParam" Type="SSGParameter[]">
-							<SET_STRUCT Id="RDK:23270567" VarRef="SSGParameter" ClearAll="True" ListRef="VarParam">
-								<PAR Name="Key">
-									<EXP><![CDATA[$C$WeichenArt]]></EXP>
-								</PAR>
-								<PAR Name="StrArr" />
-								<PAR Name="Str">
-									<EXP><![CDATA[$C$Einzelweiche]]></EXP>
-								</PAR>
-								<PAR Name="Dbl" />
-								<PAR Name="Int" />
-								<PAR Name="Boo" />
-							</SET_STRUCT>
-							<SET_STRUCT Id="RDK:23270650" VarRef="SSGParameter" ClearAll="True" ListRef="VarParam" Bookmarked="True">
-								<PAR Name="Key">
-									<EXP><![CDATA[$C$Winkel]]></EXP>
-								</PAR>
-								<PAR Name="StrArr" />
-								<PAR Name="Str" />
-								<PAR Name="Dbl">
+						<VAR Id="RDK:23270583" Name="Weiche" Type="OFWeicheType">
+							<SET_STRUCT Id="RDK:23270650" VarRef="Me" ClearAll="True" Bookmarked="True">
+								<PAR Name="Beschreibung" />
+								<PAR Name="WeichenTyp" />
+								<PAR Name="L1" />
+								<PAR Name="L2" />
+								<PAR Name="L3" />
+								<PAR Name="Hoehe" />
+								<PAR Name="KurvenWinkel">
 									<EXP><![CDATA[$C$45]]></EXP>
 								</PAR>
-								<PAR Name="Int" />
-								<PAR Name="Boo" />
+								<PAR Name="KurvenRichtung" />
+								<PAR Name="isOk" />
+								<PAR Name="Sivasnr" />
+								<PAR Name="ProfilTyp" />
+								<PAR Name="Schaltungstyp" />
+								<PAR Name="AntriebKurve" />
+								<PAR Name="n_Sep" />
+								<PAR Name="n_Scan" />
+								<PAR Name="Länge" />
+								<PAR Name="Breite" />
 							</SET_STRUCT>
 						</VAR>
 					</GROUP>
@@ -20504,7 +20428,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 							<EXP><![CDATA[$C$SetDropdownOfWeiche]]></EXP>
 						</PAR>
 						<PAR Name="InputExp">
-							<EXP><![CDATA[$=$VarParam]]></EXP>
+							<EXP><![CDATA[$=$Weiche]]></EXP>
 						</PAR>
 						<PAR Name="ResultRef">
 							<EXP><![CDATA[$V$]]></EXP>
@@ -44547,6 +44471,8 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					</PAR>
 					<PAR Name="AntriebInnen" />
 					<PAR Name="AntriebAussen" />
+					<PAR Name="Länge" />
+					<PAR Name="Breite" />
 				</SET_STRUCT>
 			</GROUP>
 			<GROUP Id="RDK:23222540" Name="OFWeiche" SubType="Generic">
@@ -44563,13 +44489,13 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<PAR Name="KurvenRichtung" />
 					<PAR Name="isOk" />
 					<PAR Name="Sivasnr" />
+					<PAR Name="ProfilTyp" />
 					<PAR Name="Schaltungstyp" />
-					<PAR Name="Radius">
-						<EXP><![CDATA[$C$630]]></EXP>
-					</PAR>
 					<PAR Name="AntriebKurve" />
 					<PAR Name="n_Sep" />
 					<PAR Name="n_Scan" />
+					<PAR Name="Länge" />
+					<PAR Name="Breite" />
 				</SET_STRUCT>
 			</GROUP>
 			<GROUP Id="RDK:23125038" Name="OFGerade" SubType="Generic">