diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 85e99f5..de74ea5 100644
--- a/MAIN_SSG.rdx
+++ b/MAIN_SSG.rdx
@@ -184,7 +184,7 @@
 					<FIELD Id="RDK:23222856" Name="Länge" Options="Ausdehnung im Bild nach oben" Type="double" />
 					<FIELD Id="RDK:23222860" Name="Breite" Options="Ausdehnung im Bild nach rechts" Type="double" />
 				</TYPE>
-				<TYPE Id="RDK:23221861" Name="OFWeicheType" SubType="structure" HasArrayType="True">
+				<TYPE Id="RDK:23221861" Name="OFWeicheType" Expanded="True" SubType="structure" HasArrayType="True">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:23221848" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:23221857" Name="WeichenTyp" Type="string" />
@@ -20794,7 +20794,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 											<EXP><![CDATA[$C$0]]></EXP>
 										</PAR>
 										<PAR Name="shpId">
-											<EXP><![CDATA[$=$Shape_Prototype.OFBogenDefinition.Sivasnr]]></EXP>
+											<EXP><![CDATA[$=$Shape_Prototype.OFWeicheDefinition.Sivasnr]]></EXP>
 										</PAR>
 										<PAR Name="catId">
 											<EXP><![CDATA[$C$c_OmnifloParts]]></EXP>
@@ -20833,7 +20833,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 										<PAR Name="BTMTEntladungDefinition" />
 										<PAR Name="isDefined" />
 										<PAR Name="source">
-											<EXP><![CDATA[$=$Shape_Prototype.OFBogenDefinition.Sivasnr]]></EXP>
+											<EXP><![CDATA[$=$Shape_Prototype.OFWeicheDefinition.Sivasnr]]></EXP>
 										</PAR>
 										<PAR Name="sourceLibrary" />
 										<PAR Name="signature" />
@@ -22441,6 +22441,45 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 								</PAR>
 								<PAR Name="Options" />
 							</CALLFUNCTION>
+							<GROUP Id="RDK:23404729" Name="Local Variables" SubType="VarSet" IncludeDate="0">
+								<VAR Id="RDK:23404728" Name="Weiche" Type="OFWeicheType">
+									<SET_STRUCT Id="RDK:23404727" 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[$=$Shape_Prototype.OFWeicheDefinition.KurvenWinkel]]></EXP>
+										</PAR>
+										<PAR Name="KurvenRichtung" />
+										<PAR Name="isOk" />
+										<PAR Name="Sivasnr" />
+										<PAR Name="ProfilTyp" />
+										<PAR Name="Schaltungstyp">
+											<EXP><![CDATA[$=$Shape_Prototype.OFWeicheDefinition.Schaltungstyp]]></EXP>
+										</PAR>
+										<PAR Name="AntriebKurve" />
+										<PAR Name="n_Sep" />
+										<PAR Name="n_Scan" />
+										<PAR Name="Länge" />
+										<PAR Name="Breite" />
+									</SET_STRUCT>
+								</VAR>
+							</GROUP>
+							<CALLFUNCTION Id="RDK:23404723" DesignTimeRemark="Setze die Dropdownlist der Weichen nach dem Typ des eben hereingezogenen Objekts fest.">
+								<PAR Name="FuncName">
+									<EXP><![CDATA[$C$SetDropdownOfWeiche]]></EXP>
+								</PAR>
+								<PAR Name="InputExp">
+									<EXP><![CDATA[$=$Weiche]]></EXP>
+								</PAR>
+								<PAR Name="ResultRef">
+									<EXP><![CDATA[$V$]]></EXP>
+								</PAR>
+								<PAR Name="Options" />
+							</CALLFUNCTION>
 						</GROUP>
 						<SET Id="RDK:23222252" VarRef="Shape_Prototype.Rotationsklasse">
 							<EXP><![CDATA[$C$Rotationsobjekt]]></EXP>
@@ -45079,45 +45118,6 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					</PAR>
 					<PAR Name="Options" />
 				</CALLFUNCTION>
-				<GROUP Id="RDK:23331141" Name="Local Variables" SubType="VarSet" IncludeDate="0">
-					<VAR Id="RDK:23331140" Name="Weiche" Type="OFWeicheType">
-						<SET_STRUCT Id="RDK:23331139" 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$90]]></EXP>
-							</PAR>
-							<PAR Name="KurvenRichtung" />
-							<PAR Name="isOk" />
-							<PAR Name="Sivasnr" />
-							<PAR Name="ProfilTyp" />
-							<PAR Name="Schaltungstyp">
-								<EXP><![CDATA[$C$M]]></EXP>
-							</PAR>
-							<PAR Name="AntriebKurve" />
-							<PAR Name="n_Sep" />
-							<PAR Name="n_Scan" />
-							<PAR Name="Länge" />
-							<PAR Name="Breite" />
-						</SET_STRUCT>
-					</VAR>
-				</GROUP>
-				<CALLFUNCTION Id="RDK:23331143" DesignTimeRemark="Setze die Dropdownlist der Weichen nach dem Default fest. ">
-					<PAR Name="FuncName">
-						<EXP><![CDATA[$C$SetDropdownOfWeiche]]></EXP>
-					</PAR>
-					<PAR Name="InputExp">
-						<EXP><![CDATA[$=$Weiche]]></EXP>
-					</PAR>
-					<PAR Name="ResultRef">
-						<EXP><![CDATA[$V$]]></EXP>
-					</PAR>
-					<PAR Name="Options" />
-				</CALLFUNCTION>
 			</GROUP>
 		</GROUP>
 		<GROUP Id="RDK:93787" Name="Default Settings" SubType="Generic">
@@ -46491,4 +46491,4 @@ ShapeList["id="+Param.Input[1].shapeID].name
 		</PROFILES_DATA>
 		<BOM_DATA />
 	</EXTERNAL_DATA>
-</PROCESS>
\ No newline at end of file
+</PROCESS>