diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index dea7ea0..ba4021c 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-03-05T13:26:35" LanguageVersion="2014.1.3.699" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2025-03-06T15:37:17" 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">
@@ -25,7 +25,7 @@
 					<FIELD Id="RDK:20734834" Name="direction_x" Type="double" DesignTimeRemark="1 if direction posititve x-axis, -1 if is negative x-axis, 0 if it is in y-direction" />
 					<FIELD Id="RDK:20734836" Name="direction_y" Type="double" DesignTimeRemark="1 if direction posititve y-axis, -1 if is negative y-axis, 0 if it is in x-direction" />
 				</TYPE>
-				<TYPE Id="RDK:26388" Name="KreiselType" SubType="structure">
+				<TYPE Id="RDK:26388" Name="KreiselType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:95024" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:26389" Name="AbstandMS" Type="double" />
@@ -148,7 +148,7 @@
 					<FIELD Id="RDK:973716" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:973714" Name="Weichenart" Type="string" />
 				</TYPE>
-				<TYPE Id="RDK:23017103" Name="OFGeradeType" SubType="structure">
+				<TYPE Id="RDK:23017103" Name="OFGeradeType" Expanded="True" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:23017087" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:23017088" Name="L1" Type="double" />
@@ -171,7 +171,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" Expanded="True" SubType="structure" HasArrayType="True">
+				<TYPE Id="RDK:23017447" Name="OFBogenType" SubType="structure" HasArrayType="True">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:23017438" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:23017439" Name="L1" Type="double" />
@@ -217,7 +217,7 @@
 					<FIELD Id="RDK:16525231" Name="Drehung" Type="integer" DesignTimeNotes="1= im Uhrzeigersinn=rechts&#xD;&#xA;-1= Gegen Uhrzeigersinn=links" />
 					<FIELD Id="RDK:16577441" Name="Beschreibung" Type="string" />
 				</TYPE>
-				<TYPE Id="RDK:79642" Name="SSG_ShapeType" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:79642" Name="SSG_ShapeType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:79643" Name="SivasNummer" Type="string" />
 					<FIELD Id="RDK:1561689" Name="Rotationsklasse" Type="string" />
@@ -237,7 +237,7 @@
 					<FIELD Id="RDK:16525361" Name="BTMTEntladungDefinition" Type="BTMTEntladungType" />
 					<FIELD Id="RDK:19961198" Name="isDefined" Type="boolean" />
 				</TYPE>
-				<TYPE Id="RDK:18530527" Name="SSG_ShapeType_limit" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:18530527" Name="SSG_ShapeType_limit" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:18530520" Name="KreiselDefinition" Type="KreiselType" />
 					<FIELD Id="RDK:18530521" Name="EckradDefinition" Type="EckradType" />
@@ -269,7 +269,7 @@
 					<FIELD Id="RDK:22938802" Name="Key" Type="string" />
 					<FIELD Id="RDK:22938803" Name="StrArr" Type="string[]" />
 				</TYPE>
-				<TYPE Id="RDK:18530545" Name="SSG_Limits" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:18530545" Name="SSG_Limits" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:18530548" Name="Kreisel_top" Type="KreiselType" />
 					<FIELD Id="RDK:18530546" Name="Kreisel_bot" Type="KreiselType" />
@@ -979,7 +979,7 @@
 					<FIELD Id="RDK:23017778" Name="Höhe oben" Type="string" />
 					<FIELD Id="RDK:23017779" Name="Höhe unten" Type="string" />
 				</TYPE>
-				<TYPE Id="RDK:23017792" Name="OFBogenMerkmaleType" Expanded="True" SubType="structure">
+				<TYPE Id="RDK:23017792" Name="OFBogenMerkmaleType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:23017787" Name="Länge in Meter" Type="string" />
 					<FIELD Id="RDK:23017788" Name="Kurvenrichtung" Type="string" />
@@ -3455,22 +3455,6 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 									<PAR Name="id">
 										<EXP><![CDATA[$=$"defcp"+Me_idx]]></EXP>
 									</PAR>
-									<PAR Name="x" />
-									<PAR Name="y" />
-									<PAR Name="z" />
-									<PAR Name="xMin" />
-									<PAR Name="xMax" />
-									<PAR Name="xStep" />
-									<PAR Name="yMin" />
-									<PAR Name="yMax" />
-									<PAR Name="yStep" />
-									<PAR Name="zMin" />
-									<PAR Name="zMax" />
-									<PAR Name="zStep" />
-									<PAR Name="direction" />
-									<PAR Name="linkClass" />
-									<PAR Name="label" />
-									<PAR Name="isDimension" />
 								</EXEC_ON_VALUES>
 								<SET Id="RDK:187101" VarRef="Property_Prototype.connectionPoints">
 									<EXP><![CDATA[$=$ToJSON(ConnectionPointList)]]></EXP>
@@ -4386,11 +4370,11 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 									<EXP><![CDATA[$C$True]]></EXP>
 								</PAR>
 							</SET_STRUCT>
-							<SET Id="RDK:23017422" VarRef="Property_Prototype.connectionPoints">
-								<EXP><![CDATA[$=$ToJSON(ConnectionPointList)]]></EXP>
-								<PAR Name="AdvancedOptions" />
-							</SET>
 						</GROUP>
+						<SET Id="RDK:23017422" VarRef="Property_Prototype.connectionPoints">
+							<EXP><![CDATA[$=$ToJSON(ConnectionPointList)]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
 					</FUNCTION>
 					<FUNCTION Id="RDK:18732260" Name="CreatePrototype_OFBogen">
 						<COMMENTS Id="RDK:18732257" DesignTimeRemark="Angle definition in GS2D" DesignTimeNotes="           0&#xD;&#xA;            |&#xD;&#xA;270 &lt;-------&gt;90&#xD;&#xA;            |&#xD;&#xA;          180&#xD;&#xA;" />
@@ -4821,14 +4805,19 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										</PAR>
 										<PAR Name="EckradDefinition" />
 										<PAR Name="GefaelleDefinition" />
-										<PAR Name="KurveDefinition" />
 										<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.id]]></EXP>
+											<EXP><![CDATA[$=$Shape_Prototype.source]]></EXP>
 										</PAR>
 										<PAR Name="sourceLibrary">
 											<EXP><![CDATA[$=$GS2DLibraryName]]></EXP>
@@ -4890,11 +4879,6 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="pinned" />
 										<PAR Name="selected" />
 										<PAR Name="includeInBOM" />
-										<PAR Name="VarioFoerdererDefinition" />
-										<PAR Name="KurveFoerdererDefinition" />
-										<PAR Name="OFGeradeDefinition" />
-										<PAR Name="OFBogenDefinition" />
-										<PAR Name="OFWeicheDefinition" />
 									</SET_STRUCT>
 								</GROUP>
 							</CASEGROUP>
@@ -6708,7 +6692,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2)
 										<PAR Name="BTMTEntladungDefinition" />
 										<PAR Name="isDefined" />
 										<PAR Name="source">
-											<EXP><![CDATA[$=$Shape_Prototype.source]]></EXP>
+											<EXP><![CDATA[$=$Shape_Prototype.id]]></EXP>
 										</PAR>
 										<PAR Name="sourceLibrary">
 											<EXP><![CDATA[$=$GS2DLibraryName]]></EXP>
@@ -7331,6 +7315,70 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 						</EXEC_ON_VALUES>
 						<SET Id="RDK:591732" VarRef="Property_Prototype.connectionPoints">
 							<EXP><![CDATA[$=$ToJSON(ListJoin(FromJSON(Property_Prototype.connectionPoints), ConnectionPointList))
+]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+					</FUNCTION>
+					<FUNCTION Id="RDK:23719669" Name="WriteCPsFromDataToPrototype_OFGerade">
+						<SET Id="RDK:23719652" VarRef="ConnectionPointList">
+							<EXP><![CDATA[$C$NOTHING]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+						<FOREACHLOOP Id="RDK:23719658" ItemVarRef="SSGConnectionPoint" IndexVarRef="i">
+							<PAR Name="ArrayValueExp">
+								<EXP><![CDATA[$=$Shape_Prototype.OFGeradeDefinition.M_Strecke]]></EXP>
+							</PAR>
+							<PAR Name="ExitCondExp">
+								<EXP><![CDATA[$V$]]></EXP>
+							</PAR>
+							<GROUP Id="RDK:23719657" Name="Group" SubType="Generic">
+								<VALUECONDITION Value="true">
+									<EXP><![CDATA[$=$SSGConnectionPoint.aktiv]]></EXP>
+								</VALUECONDITION>
+								<COMMENTS Id="RDK:23719653" DesignTimeRemark="CP Gefällestrecke" />
+								<SET_STRUCT Id="RDK:23719654" VarRef="ConnectionPointItem" ClearAll="True" ListRef="ConnectionPointList" DesignTimeRemark="Links mitte" DesignTimeTip="Links mitte">
+									<PAR Name="id">
+										<EXP><![CDATA[$=$SSGConnectionPoint.id]]></EXP>
+									</PAR>
+									<PAR Name="x">
+										<EXP><![CDATA[$C$0]]></EXP>
+									</PAR>
+									<PAR Name="y">
+										<EXP><![CDATA[$=$Call("mm2pxBOX", NewListDbl(
+' Param 1 Gesamtlänge in mm
+Shape_Prototype.OFGeradeDefinition.L1
+,
+' Param 2 Position in mm
+SSGConnectionPoint.x_M
+))]]></EXP>
+									</PAR>
+									<PAR Name="z" />
+									<PAR Name="xMin" />
+									<PAR Name="xMax" />
+									<PAR Name="xStep" />
+									<PAR Name="yMin" />
+									<PAR Name="yMax" />
+									<PAR Name="yStep" />
+									<PAR Name="zMin" />
+									<PAR Name="zMax" />
+									<PAR Name="zStep" />
+									<PAR Name="direction">
+										<EXP><![CDATA[$=$SSGConnectionPoint.direction]]></EXP>
+									</PAR>
+									<PAR Name="linkClass">
+										<EXP><![CDATA[$C$TEFItems]]></EXP>
+									</PAR>
+									<PAR Name="label">
+										<EXP><![CDATA[$=$SSGConnectionPoint.label+" OFGerade"]]></EXP>
+									</PAR>
+									<PAR Name="isDimension">
+										<EXP><![CDATA[$C$True]]></EXP>
+									</PAR>
+								</SET_STRUCT>
+							</GROUP>
+						</FOREACHLOOP>
+						<SET Id="RDK:23719668" VarRef="Property_Prototype.connectionPoints">
+							<EXP><![CDATA[$=$ToJSON(ListJoin(FromJSON(Property_Prototype.connectionPoints), ConnectionPointList))
 ]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
@@ -16682,15 +16730,6 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									<PAR Name="aktiv">
 										<EXP><![CDATA[$=$IIF(me.x_M<=(Shape_Prototype.KreiselDefinition.AbstandMS-Shape_Prototype.KreiselDefinition.d_min),TRUE,FALSE)]]></EXP>
 									</PAR>
-									<PAR Name="label" />
-									<PAR Name="linkClass" />
-									<PAR Name="direction" />
-									<PAR Name="z" />
-									<PAR Name="y" />
-									<PAR Name="x" />
-									<PAR Name="x_S" />
-									<PAR Name="x_M" />
-									<PAR Name="id" />
 								</EXEC_ON_VALUES>
 								<EXEC_ON_VALUES Id="RDK:812298" VarRef="Shape_Prototype.KreiselDefinition.S_Strecke">
 									<PAR Name="aktiv">
@@ -20760,6 +20799,16 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 									</PAR>
 									<PAR Name="Options" />
 								</CALLFUNCTION>
+								<CALLFUNCTION Id="RDK:23719672">
+									<PAR Name="FuncName">
+										<EXP><![CDATA[$C$WriteCPsFromDataToPrototype_OFGerade]]></EXP>
+									</PAR>
+									<PAR Name="InputExp" />
+									<PAR Name="ResultRef">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+									<PAR Name="Options" />
+								</CALLFUNCTION>
 								<CALLFUNCTION Id="RDK:23017239">
 									<PAR Name="FuncName">
 										<EXP><![CDATA[$C$Create/Update Shape]]></EXP>
@@ -21612,7 +21661,7 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 											</ACTION_CALL>
 											<SET_STRUCT Id="RDK:23484015" VarRef="SSGConnectionPoint" ClearAll="True" ListRef="Shape_Prototype.OFGeradeDefinition.M_Strecke">
 												<PAR Name="id">
-													<EXP><![CDATA[$=$"ncp"+CPs+"M"]]></EXP>
+													<EXP><![CDATA[$=$"ncp"+CPs]]></EXP>
 												</PAR>
 												<PAR Name="x_M">
 													<EXP><![CDATA[$=$IIF(CPs=0,1,LastPosition+Shape_Prototype.OFGeradeDefinition.d_cp)]]></EXP>
@@ -21840,10 +21889,10 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 														</ACTION_CALL>
 														<SET_STRUCT Id="RDK:23484026" VarRef="SSGConnectionPoint" ClearAll="True" ListRef="Shape_Prototype.OFGeradeDefinition.M_Strecke" Options="$=$&quot;(INSERTIDX=&quot;+(IndexOfByFieldValue(Shape_Prototype.OFGeradeDefinition.M_Strecke,&quot;x_M&quot;,i)+1)+&quot;)&quot;">
 															<PAR Name="id">
-																<EXP><![CDATA[$=$"ncp"+CPs+"M"]]></EXP>
+																<EXP><![CDATA[$=$"ncp"+CPs]]></EXP>
 															</PAR>
 															<PAR Name="x_M">
-																<EXP><![CDATA[$=$i+Shape_Prototype.KreiselDefinition.d_cp]]></EXP>
+																<EXP><![CDATA[$=$i+Shape_Prototype.OFGeradeDefinition.d_cp]]></EXP>
 															</PAR>
 															<PAR Name="x_S" />
 															<PAR Name="x" />
@@ -24124,6 +24173,18 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 							</PAR>
 							<PAR Name="Options" />
 						</CALLFUNCTION>
+						<CALLFUNCTION Id="RDK:23747130">
+							<PAR Name="FuncName">
+								<EXP><![CDATA[$C$DistributeOFGeradeCPs]]></EXP>
+							</PAR>
+							<PAR Name="InputExp">
+								<EXP><![CDATA[$C$M]]></EXP>
+							</PAR>
+							<PAR Name="ResultRef">
+								<EXP><![CDATA[$V$]]></EXP>
+							</PAR>
+							<PAR Name="Options" />
+						</CALLFUNCTION>
 						<GROUP Id="RDK:23017651" Name="UI" SubType="Generic">
 							<VALUECONDITION Value="true">
 								<EXP><![CDATA[$=$Param.Input[0].class<>"OnPasted"]]></EXP>
@@ -46984,10 +47045,10 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<PAR Name="M_Strecke" />
 					<PAR Name="M_Strecke_selected" />
 					<PAR Name="d_cp">
-						<EXP><![CDATA[$C$100]]></EXP>
+						<EXP><![CDATA[$C$500]]></EXP>
 					</PAR>
 					<PAR Name="d_min">
-						<EXP><![CDATA[$C$10]]></EXP>
+						<EXP><![CDATA[$C$250]]></EXP>
 					</PAR>
 					<PAR Name="n_Sep">
 						<EXP><![CDATA[$C$0]]></EXP>