diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 8acdb99..102cb34 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-26T23:24:54" LanguageVersion="2014.1.3.699" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2025-02-27T11:04:19" 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">
@@ -11953,17 +11953,10 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 					</FUNCTION>
 					<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:23222010" Name="Local_Buffer" Type="DataSourceValInfo[]" />
 							<VAR Id="RDK:23265069" Name="ToAdd" Type="OFWeicheType" />
-							<VAR Id="RDK:23278519" Name="nUnknown" Type="integer">
-								<SET Id="RDK:23278523" VarRef="Me">
-									<EXP><![CDATA[$=$0]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</VAR>
 							<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:23270616" Name="Richtung" Type="integer" DesignTimeRemark="rechs, links, geradeaus oder Kombinationen davon" />
 							<VAR Id="RDK:23270620" Name="MechanischPneumatisch" Type="string" />
 							<VAR Id="RDK:23270729" Name="Weiche" Type="OFWeicheType">
 								<SET Id="RDK:23270802" VarRef="Me">
@@ -11983,20 +11976,9 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 								</SET>
 							</GROUP>
 						</IFTHENELSE>
-						<IFTHENELSE Id="RDK:23278547">
-							<VALUECONDITION Value="false">
-								<EXP><![CDATA[$=$isEmpty(Weiche.Länge)]]></EXP>
-							</VALUECONDITION>
-							<GROUP Id="RDK:23278546" SubType="Then">
-								<SET Id="RDK:23278545" VarRef="nUnknown">
-									<EXP><![CDATA[$=$nUnknown+1]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-							</GROUP>
-						</IFTHENELSE>
 						<IFTHENELSE Id="RDK:23278555">
 							<VALUECONDITION Value="false">
-								<EXP><![CDATA[$=$isEmpty(Weiche.Breite)]]></EXP>
+								<EXP><![CDATA[$=$isEmpty(Weiche.KurvenRichtung)]]></EXP>
 							</VALUECONDITION>
 							<GROUP Id="RDK:23278554" SubType="Then">
 								<SET Id="RDK:23278553" VarRef="nUnknown">
@@ -12057,34 +12039,12 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 													<EXIT_PROCESS Id="RDK:23275664" BreakType="2" ExitStatus="0" />
 												</GROUP>
 											</IFTHENELSE>
-											<IFTHENELSE Id="RDK:23275565">
-												<VALUECONDITION Value="false">
-													<EXP><![CDATA[$=$IsEmpty(Weiche.Länge)]]></EXP>
-												</VALUECONDITION>
-												<VALUECONDITION Value="true">
-													<EXP><![CDATA[$=$Weiche.Länge= ToAdd.Länge]]></EXP>
-												</VALUECONDITION>
-												<GROUP Id="RDK:23275564" SubType="Then">
-													<SET_STRUCT Id="RDK:23275563" VarRef="OFWeicheItem" ClearAll="True" ListRef="Local_Buffer">
-														<PAR Name="Value">
-															<EXP><![CDATA[$=$ToAdd.Sivasnr]]></EXP>
-														</PAR>
-														<PAR Name="Prompt">
-															<EXP><![CDATA[$=$ToAdd.ProfilTyp]]></EXP>
-														</PAR>
-														<PAR Name="Image" />
-														<PAR Name="Tooltip" />
-														<PAR Name="Tags" />
-													</SET_STRUCT>
-													<EXIT_PROCESS Id="RDK:23275666" BreakType="2" ExitStatus="0" />
-												</GROUP>
-											</IFTHENELSE>
 											<IFTHENELSE Id="RDK:23275580">
 												<VALUECONDITION Value="false">
-													<EXP><![CDATA[$=$IsEmpty(Weiche.Breite)]]></EXP>
+													<EXP><![CDATA[$=$IsEmpty(Weiche.KurvenRichtung)]]></EXP>
 												</VALUECONDITION>
 												<VALUECONDITION Value="true">
-													<EXP><![CDATA[$=$Weiche.Breite= ToAdd.Breite]]></EXP>
+													<EXP><![CDATA[$=$Weiche.KurvenRichtung= ToAdd.KurvenRichtung]]></EXP>
 												</VALUECONDITION>
 												<GROUP Id="RDK:23275579" SubType="Then">
 													<SET_STRUCT Id="RDK:23275578" VarRef="OFWeicheItem" ClearAll="True" ListRef="Local_Buffer">
@@ -12113,10 +12073,10 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<GROUP Id="RDK:23275605" SubType="Then">
 											<IFTHENELSE Id="RDK:23275612">
 												<VALUECONDITION Value="false">
-													<EXP><![CDATA[$=$IsEmpty(Weiche.Breite)]]></EXP>
+													<EXP><![CDATA[$=$IsEmpty(Weiche.KurvenRichtung)]]></EXP>
 												</VALUECONDITION>
 												<VALUECONDITION Value="true">
-													<EXP><![CDATA[$=$Weiche.Breite= ToAdd.Breite]]></EXP>
+													<EXP><![CDATA[$=$Weiche.KurvenRichtung= ToAdd.KurvenRichtung]]></EXP>
 												</VALUECONDITION>
 												<GROUP Id="RDK:23275611" SubType="Then">
 													<SET_STRUCT Id="RDK:23275610" VarRef="OFWeicheItem" ClearAll="True" ListRef="Local_Buffer">
@@ -12133,60 +12093,6 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 													<EXIT_PROCESS Id="RDK:23275670" BreakType="2" ExitStatus="0" />
 												</GROUP>
 											</IFTHENELSE>
-											<IFTHENELSE Id="RDK:23275609">
-												<VALUECONDITION Value="false">
-													<EXP><![CDATA[$=$IsEmpty(Weiche.Länge)]]></EXP>
-												</VALUECONDITION>
-												<VALUECONDITION Value="true">
-													<EXP><![CDATA[$=$Weiche.Länge= ToAdd.Länge]]></EXP>
-												</VALUECONDITION>
-												<GROUP Id="RDK:23275608" SubType="Then">
-													<SET_STRUCT Id="RDK:23275607" VarRef="OFWeicheItem" ClearAll="True" ListRef="Local_Buffer">
-														<PAR Name="Value">
-															<EXP><![CDATA[$=$ToAdd.Sivasnr]]></EXP>
-														</PAR>
-														<PAR Name="Prompt">
-															<EXP><![CDATA[$=$ToAdd.ProfilTyp]]></EXP>
-														</PAR>
-														<PAR Name="Image" />
-														<PAR Name="Tooltip" />
-														<PAR Name="Tags" />
-													</SET_STRUCT>
-													<EXIT_PROCESS Id="RDK:23275672" BreakType="2" ExitStatus="0" />
-												</GROUP>
-											</IFTHENELSE>
-										</GROUP>
-									</IFTHENELSE>
-									<IFTHENELSE Id="RDK:23275646">
-										<VALUECONDITION Value="false">
-											<EXP><![CDATA[$=$IsEmpty(Weiche.Breite)]]></EXP>
-										</VALUECONDITION>
-										<VALUECONDITION Value="true">
-											<EXP><![CDATA[$=$Weiche.Breite= ToAdd.Breite]]></EXP>
-										</VALUECONDITION>
-										<GROUP Id="RDK:23275645" SubType="Then">
-											<IFTHENELSE Id="RDK:23275649">
-												<VALUECONDITION Value="false">
-													<EXP><![CDATA[$=$IsEmpty(Weiche.Länge)]]></EXP>
-												</VALUECONDITION>
-												<VALUECONDITION Value="true">
-													<EXP><![CDATA[$=$Weiche.Länge= ToAdd.Länge]]></EXP>
-												</VALUECONDITION>
-												<GROUP Id="RDK:23275648" SubType="Then">
-													<SET_STRUCT Id="RDK:23275647" VarRef="OFWeicheItem" ClearAll="True" ListRef="Local_Buffer">
-														<PAR Name="Value">
-															<EXP><![CDATA[$=$ToAdd.Sivasnr]]></EXP>
-														</PAR>
-														<PAR Name="Prompt">
-															<EXP><![CDATA[$=$ToAdd.ProfilTyp]]></EXP>
-														</PAR>
-														<PAR Name="Image" />
-														<PAR Name="Tooltip" />
-														<PAR Name="Tags" />
-													</SET_STRUCT>
-													<EXIT_PROCESS Id="RDK:23275674" BreakType="2" ExitStatus="0" />
-												</GROUP>
-											</IFTHENELSE>
 										</GROUP>
 									</IFTHENELSE>
 								</CASEGROUP>
@@ -12216,10 +12122,10 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									</IFTHENELSE>
 									<IFTHENELSE Id="RDK:23275706">
 										<VALUECONDITION Value="false">
-											<EXP><![CDATA[$=$IsEmpty(Weiche.Breite)]]></EXP>
+											<EXP><![CDATA[$=$IsEmpty(Weiche.KurvenRichtung)]]></EXP>
 										</VALUECONDITION>
 										<VALUECONDITION Value="true">
-											<EXP><![CDATA[$=$Weiche.Breite= ToAdd.Breite]]></EXP>
+											<EXP><![CDATA[$=$Weiche.KurvenRichtung= ToAdd.KurvenRichtung]]></EXP>
 										</VALUECONDITION>
 										<GROUP Id="RDK:23275705" SubType="Then">
 											<SET_STRUCT Id="RDK:23275703" VarRef="OFWeicheItem" ClearAll="True" ListRef="Local_Buffer">
@@ -12236,28 +12142,6 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 											<EXIT_PROCESS Id="RDK:23275704" BreakType="2" ExitStatus="0" />
 										</GROUP>
 									</IFTHENELSE>
-									<IFTHENELSE Id="RDK:23275702">
-										<VALUECONDITION Value="false">
-											<EXP><![CDATA[$=$IsEmpty(Weiche.Länge)]]></EXP>
-										</VALUECONDITION>
-										<VALUECONDITION Value="true">
-											<EXP><![CDATA[$=$Weiche.Länge= ToAdd.Länge]]></EXP>
-										</VALUECONDITION>
-										<GROUP Id="RDK:23275701" SubType="Then">
-											<SET_STRUCT Id="RDK:23275699" VarRef="OFWeicheItem" ClearAll="True" ListRef="Local_Buffer">
-												<PAR Name="Value">
-													<EXP><![CDATA[$=$ToAdd.Sivasnr]]></EXP>
-												</PAR>
-												<PAR Name="Prompt">
-													<EXP><![CDATA[$=$ToAdd.ProfilTyp]]></EXP>
-												</PAR>
-												<PAR Name="Image" />
-												<PAR Name="Tooltip" />
-												<PAR Name="Tags" />
-											</SET_STRUCT>
-											<EXIT_PROCESS Id="RDK:23275700" BreakType="2" ExitStatus="0" />
-										</GROUP>
-									</IFTHENELSE>
 									<IFTHENELSE Id="RDK:23275698">
 										<VALUECONDITION Value="false">
 											<EXP><![CDATA[$=$IsEmpty(Weiche.Schaltungstyp)]]></EXP>
@@ -12287,7 +12171,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 							</SELECTCASE>
 						</FOREACHLOOP>
 						<SET Id="RDK:23222041" VarRef="OFWeicheItemList">
-							<EXP><![CDATA[$=$Local_OFWeicheItemList]]></EXP>
+							<EXP><![CDATA[$=$Local_Buffer]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
 						<ACTION_CALL Id="RDK:23222042" Name="RDEngineering_ModernUIControl" DesignTimeRemark="{ActionType} {PanelName} &lt;-- {UIType}:{Field} {Id} {ParentID}">
@@ -20806,7 +20690,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 								<PAR Name="Sivasnr" />
 								<PAR Name="ProfilTyp" />
 								<PAR Name="Schaltungstyp">
-									<EXP><![CDATA[$C$Shape_Prototype.OFWeicheDefinition.Schaltungstyp]]></EXP>
+									<EXP><![CDATA[$=$Shape_Prototype.OFWeicheDefinition.Schaltungstyp]]></EXP>
 								</PAR>
 								<PAR Name="AntriebKurve" />
 								<PAR Name="n_Sep" />
@@ -20833,7 +20717,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 							<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
 						</PAR>
 						<PAR Name="RenderList">
-							<EXP><![CDATA[$=$Render_OFBogen
+							<EXP><![CDATA[$=$Render_OFWeiche
 ]]></EXP>
 						</PAR>
 						<PAR Name="BindingMode">
@@ -20903,7 +20787,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 								</VALUECONDITION>
 								<CALLFUNCTION Id="RDK:23222222">
 									<PAR Name="FuncName">
-										<EXP><![CDATA[$C$RefreshOFWeichUI]]></EXP>
+										<EXP><![CDATA[$C$RefreshOFWeicheUI]]></EXP>
 									</PAR>
 									<PAR Name="InputExp">
 										<EXP><![CDATA[$=$Shape_Prototype.OFWeicheDefinition.Sivasnr]]></EXP>
@@ -20913,6 +20797,116 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									</PAR>
 									<PAR Name="Options" />
 								</CALLFUNCTION>
+								<GROUP Id="RDK:23285072" Name="Switch Prototype" SubType="Generic" Suppressed="True">
+									<ACTION_CALL Id="RDK:23285070" Name="RDEngineering_E2DManageShape">
+										<PAR Name="RDLibraryName">
+											<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+										</PAR>
+										<PAR Name="e2dMode">
+											<EXP><![CDATA[$C$0]]></EXP>
+										</PAR>
+										<PAR Name="libraryID">
+											<EXP><![CDATA[$=$GS2DLibraryName]]></EXP>
+										</PAR>
+										<PAR Name="operType">
+											<EXP><![CDATA[$C$0]]></EXP>
+										</PAR>
+										<PAR Name="shpId">
+											<EXP><![CDATA[$=$Shape_Prototype.OFBogenDefinition.Sivasnr]]></EXP>
+										</PAR>
+										<PAR Name="catId">
+											<EXP><![CDATA[$C$c_OmnifloParts]]></EXP>
+										</PAR>
+										<PAR Name="shpItemId" />
+										<PAR Name="shpItem">
+											<EXP><![CDATA[$=$Property_Prototype]]></EXP>
+										</PAR>
+										<PAR Name="shpItemList">
+											<EXP><![CDATA[$V$]]></EXP>
+										</PAR>
+										<PAR Name="shpList">
+											<EXP><![CDATA[$V$]]></EXP>
+										</PAR>
+										<PAR Name="outShapeIdList">
+											<EXP><![CDATA[$V$]]></EXP>
+										</PAR>
+										<PAR Name="Options" />
+									</ACTION_CALL>
+									<SET_STRUCT Id="RDK:23285071" VarRef="Shape_Prototype">
+										<PAR Name="SivasNummer" />
+										<PAR Name="Rotationsklasse" />
+										<PAR Name="IDCounter" />
+										<PAR Name="KreiselDefinition" />
+										<PAR Name="EckradDefinition" />
+										<PAR Name="GefaelleDefinition" />
+										<PAR Name="FoerdererDefinition" />
+										<PAR Name="VarioFoerdererDefinition" />
+										<PAR Name="KurveDefinition" />
+										<PAR Name="KurveFoerdererDefinition" />
+										<PAR Name="OFGeradeDefinition" />
+										<PAR Name="OFBogenDefinition" />
+										<PAR Name="OFWeicheDefinition" />
+										<PAR Name="WeicheDefinition" />
+										<PAR Name="BTMTBeladungDefinition" />
+										<PAR Name="BTMTEntladungDefinition" />
+										<PAR Name="isDefined" />
+										<PAR Name="source">
+											<EXP><![CDATA[$=$Shape_Prototype.OFBogenDefinition.Sivasnr]]></EXP>
+										</PAR>
+										<PAR Name="sourceLibrary" />
+										<PAR Name="signature" />
+										<PAR Name="id" />
+										<PAR Name="name" />
+										<PAR Name="family" />
+										<PAR Name="description" />
+										<PAR Name="x" />
+										<PAR Name="y" />
+										<PAR Name="z" />
+										<PAR Name="width">
+											<EXP><![CDATA[$=$ConvertFromPixel(Property_Prototype.width, "mm", 96)]]></EXP>
+										</PAR>
+										<PAR Name="height">
+											<EXP><![CDATA[$=$ConvertFromPixel(Property_Prototype.height, "mm", 96)]]></EXP>
+										</PAR>
+										<PAR Name="depth">
+											<EXP><![CDATA[$=$ConvertFromPixel(Property_Prototype.depth, "mm", 96)]]></EXP>
+										</PAR>
+										<PAR Name="rotation" />
+										<PAR Name="text" />
+										<PAR Name="behaviour" />
+										<PAR Name="datadump" />
+										<PAR Name="path" />
+										<PAR Name="ctrl1x" />
+										<PAR Name="ctrl1y" />
+										<PAR Name="ctrl2x" />
+										<PAR Name="ctrl2y" />
+										<PAR Name="shapeFromId" />
+										<PAR Name="shapeFromPointIndex" />
+										<PAR Name="shapeToId" />
+										<PAR Name="shapeToPointIndex" />
+										<PAR Name="dimStack" />
+										<PAR Name="dimType" />
+										<PAR Name="dimDriving" />
+										<PAR Name="dimValue" />
+										<PAR Name="color" />
+										<PAR Name="colorOpacity" />
+										<PAR Name="color3D" />
+										<PAR Name="colorOpacity3D" />
+										<PAR Name="lineWidth" />
+										<PAR Name="lineColor" />
+										<PAR Name="lineOpacity" />
+										<PAR Name="lineColor3D" />
+										<PAR Name="lineOpacity3D" />
+										<PAR Name="links" />
+										<PAR Name="group" />
+										<PAR Name="layer" />
+										<PAR Name="connectionPoints" />
+										<PAR Name="modified" />
+										<PAR Name="pinned" />
+										<PAR Name="selected" />
+										<PAR Name="includeInBOM" />
+									</SET_STRUCT>
+								</GROUP>
 							</GROUP>
 							<GROUP Id="RDK:23285047" Name="Group" SubType="Generic">
 								<VALUECONDITION Value="true">
@@ -20953,18 +20947,6 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									</PAR>
 									<PAR Name="Options" />
 								</CALLFUNCTION>
-								<CALLFUNCTION Id="RDK:23285046">
-									<PAR Name="FuncName">
-										<EXP><![CDATA[$C$RefreshOFWeicheUI]]></EXP>
-									</PAR>
-									<PAR Name="InputExp">
-										<EXP><![CDATA[$=$Shape_Prototype.OFWeicheDefinition.Sivasnr]]></EXP>
-									</PAR>
-									<PAR Name="ResultRef">
-										<EXP><![CDATA[$V$]]></EXP>
-									</PAR>
-									<PAR Name="Options" />
-								</CALLFUNCTION>
 							</GROUP>
 						</CASEGROUP>
 						<CASEGROUP Id="RDK:23222228" CaseType="0">
@@ -44559,7 +44541,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
 							</PAR>
 							<PAR Name="RenderList">
-								<EXP><![CDATA[$=$Render_OFBogen]]></EXP>
+								<EXP><![CDATA[$=$Render_OFWeiche]]></EXP>
 							</PAR>
 							<PAR Name="PanelName">
 								<EXP><![CDATA[$C$2]]></EXP>
@@ -44610,7 +44592,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
 							</PAR>
 							<PAR Name="RenderList">
-								<EXP><![CDATA[$=$Render_OFBogen]]></EXP>
+								<EXP><![CDATA[$=$Render_OFWeiche]]></EXP>
 							</PAR>
 							<PAR Name="PanelName">
 								<EXP><![CDATA[$C$2]]></EXP>
@@ -46111,4 +46093,4 @@ ShapeList["id="+Param.Input[1].shapeID].name
 		</PROFILES_DATA>
 		<BOM_DATA />
 	</EXTERNAL_DATA>
-</PROCESS>
+</PROCESS>
\ No newline at end of file