diff --git a/CAD/templates/Gefaellestrecke_Verbinder.par b/CAD/templates/Gefaellestrecke_Verbinder.par
index c528a85..8385309 100644
Binary files a/CAD/templates/Gefaellestrecke_Verbinder.par and b/CAD/templates/Gefaellestrecke_Verbinder.par differ
diff --git a/CAD/templates/Gefaellestrecke_allgemein.asm b/CAD/templates/Gefaellestrecke_allgemein.asm
index a57ca01..85f3f29 100644
Binary files a/CAD/templates/Gefaellestrecke_allgemein.asm and b/CAD/templates/Gefaellestrecke_allgemein.asm differ
diff --git a/CAD/templates/Gefaellestrecke_allgemein.cfg b/CAD/templates/Gefaellestrecke_allgemein.cfg
index 5f66f2e..fb9b775 100644
Binary files a/CAD/templates/Gefaellestrecke_allgemein.cfg and b/CAD/templates/Gefaellestrecke_allgemein.cfg differ
diff --git a/CAD/templates/Kreisel.asm b/CAD/templates/Kreisel.asm
index d68a2a0..4d89f19 100644
Binary files a/CAD/templates/Kreisel.asm and b/CAD/templates/Kreisel.asm differ
diff --git a/CAD/templates/Kreisel.cfg b/CAD/templates/Kreisel.cfg
index ee767ff..32106bb 100644
Binary files a/CAD/templates/Kreisel.cfg and b/CAD/templates/Kreisel.cfg differ
diff --git a/CAD/templates/T_Bogen.par b/CAD/templates/T_Bogen.par
index 4e1cc42..b9eadc2 100644
Binary files a/CAD/templates/T_Bogen.par and b/CAD/templates/T_Bogen.par differ
diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 595c7c4..5a8d505 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="s.schmutzler [ANGEBOT-NB06]" ModDate="2024-08-12T12:14:40" LanguageVersion="2014.1.3.688" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2024-08-16T11:49:03" LanguageVersion="2014.1.3.686" />
 	<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">
@@ -755,7 +755,7 @@
 				</TYPE>
 			</GROUP>
 			<GROUP Id="RDK:900065" Name="CSV EXPORT" SubType="TypeSet" IncludeDate="0">
-				<TYPE Id="RDK:1516708" Name="CSVType" SubType="structure" HasArrayType="True" DesignTimeNotes="Der Rest der Datei ist eine Liste aller Objekte, welche vom Benutzer angelegt wurden.  Die Merkmale jedes Objektes werden wie in die Datei geschrieben, wie sie im RD verwendet werden. Eine Übersetzung in die Merkmale für das ERP findet ausserhalb statt.">
+				<TYPE Id="RDK:1516708" Name="CSVType" Expanded="True" SubType="structure" HasArrayType="True" DesignTimeNotes="Der Rest der Datei ist eine Liste aller Objekte, welche vom Benutzer angelegt wurden.  Die Merkmale jedes Objektes werden wie in die Datei geschrieben, wie sie im RD verwendet werden. Eine Übersetzung in die Merkmale für das ERP findet ausserhalb statt.">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:1516701" Name="Elementnummer" Type="integer" DesignTimeNotes="Die Elementnummer ist einfach eine laufende Nummer" />
 					<FIELD Id="RDK:1516702" Name="TeileArt" Type="string" />
@@ -822,7 +822,7 @@
 					<FIELD Id="RDK:18946343" Name="value" Type="double" />
 					<FIELD Id="RDK:18946345" Name="filename" Type="string" />
 				</TYPE>
-				<TYPE Id="RDK:18753212" Name="SEType" SubType="structure" HasArrayType="True" DesignTimeNotes="Der Rest der Datei ist eine Liste aller Objekte, welche vom Benutzer angelegt wurden.  Die Merkmale jedes Objektes werden wie in die Datei geschrieben, wie sie im RD verwendet werden. Eine Übersetzung in die Merkmale für das ERP findet ausserhalb statt.">
+				<TYPE Id="RDK:18753212" Name="SEType" Expanded="True" SubType="structure" HasArrayType="True" DesignTimeNotes="Der Rest der Datei ist eine Liste aller Objekte, welche vom Benutzer angelegt wurden.  Die Merkmale jedes Objektes werden wie in die Datei geschrieben, wie sie im RD verwendet werden. Eine Übersetzung in die Merkmale für das ERP findet ausserhalb statt.">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:18753205" Name="Elementnummer" Type="integer" DesignTimeNotes="Die Elementnummer ist einfach eine laufende Nummer" />
 					<FIELD Id="RDK:18753206" Name="TeileArt" Type="string" />
@@ -867,8 +867,8 @@
 				<VAR Id="RDK:1007751" Name="PolyLineShapeList" Type="Editor2DShapeTypeList" />
 				<VAR Id="RDK:412307" Name="Shape_Prototype" Type="Editor2DShapeType" />
 				<VAR Id="RDK:260961" Name="LinkedShapeIDs" Type="string[]" />
-				<VAR Id="RDK:1544029" Name="IndirectConnKreiselList" Type="string[]" DesignTimeNotes="20231011 -1-" />
-				<VAR Id="RDK:1280575" Name="RemovedKreiselGroupList" Type="string[]" DesignTimeNotes="20231005 -1-" />
+				<VAR Id="RDK:1544029" Name="IndirectConnKreiselList" Type="string[]" Suppressed="True" DesignTimeNotes="20231011 -1-" />
+				<VAR Id="RDK:1280575" Name="RemovedKreiselGroupList" Type="string[]" Suppressed="True" DesignTimeNotes="20231005 -1-" />
 				<VAR Id="RDK:1345490" Name="InheritHeightData" Type="InheritHeightType" DesignTimeNotes="20231005 -1-" />
 				<VAR Id="RDK:9052" Name="ShapeItem" Type="Editor2DShapeType" />
 				<VAR Id="RDK:98465" Name="ShapeTotalLength" Type="double" />
@@ -16142,7 +16142,7 @@ me.x
 						<EXP><![CDATA[$=$newId]]></EXP>
 					</PAR>
 					<PAR Name="shapeFromPointID">
-						<EXP><![CDATA[$C$cp1]]></EXP>
+						<EXP><![CDATA[$C$cp2]]></EXP>
 					</PAR>
 					<PAR Name="shapeToID">
 						<EXP><![CDATA[$=$kreisel2]]></EXP>
@@ -17579,8 +17579,11 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<GROUP Id="RDK:18760824" Name="Local Variables" SubType="VarSet" IncludeDate="0">
 						<VAR Id="RDK:18760826" Name="SE_Item" Type="SEType" />
 						<VAR Id="RDK:18760945" Name="Source" Type="string" />
+						<VAR Id="RDK:20782843" Name="Parts" Type="string[]" />
+						<VAR Id="RDK:20782867" Name="Part" Type="string" />
 						<VAR Id="RDK:18931684" Name="LevelOfDetail" Type="string" />
 						<VAR Id="RDK:18760947" Name="Destination" Type="string" />
+						<VAR Id="RDK:20801347" Name="winkel" Type="double" />
 						<VAR Id="RDK:18950416" Name="Par" Type="SEExportParamType" />
 						<VAR Id="RDK:18951794" Name="Par1" Type="SEExportParamType" />
 						<VAR Id="RDK:18950424" Name="Par2" Type="SEExportParamType" />
@@ -17597,6 +17600,10 @@ ShapeList["id="+Param.Input[1].shapeID].name
 							<EXP><![CDATA[$=$""]]></EXP>
 							<PAR Name="AdvancedOptions" />
 						</SET>
+						<SET Id="RDK:18760836" VarRef="LevelOfDetail">
+							<EXP><![CDATA[$C$templates]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
 						<SELECTCASE Id="RDK:18760757">
 							<EXP><![CDATA[$=$ShapeItem.family]]></EXP>
 							<CASEGROUP Id="RDK:18760764" CaseType="0">
@@ -17621,7 +17628,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 										<EXP />
 									</CASEGROUP>
 								</SELECTCASE>
-								<SET Id="RDK:18760828" VarRef="SE_Item.X">
+								<SET Id="RDK:20782855" VarRef="SE_Item.X">
 									<EXP><![CDATA[$=$ShapeItem.x]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
@@ -17634,8 +17641,8 @@ ShapeList["id="+Param.Input[1].shapeID].name
 									<EXP><![CDATA[$=$ShapeItem.KreiselDefinition.Hoehe]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
-								<SET Id="RDK:18838081" VarRef="SE_Item.rotation" DesignTimeRemark="ShapeItem.rotation">
-									<EXP><![CDATA[$=$270]]></EXP>
+								<SET Id="RDK:18838081" VarRef="SE_Item.rotation">
+									<EXP><![CDATA[$=$ShapeItem.rotation]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 								<SET Id="RDK:18760838" VarRef="SE_Item.ItemName">
@@ -17647,42 +17654,25 @@ ShapeList["id="+Param.Input[1].shapeID].name
 									<PAR Name="AdvancedOptions" />
 								</SET>
 								<COMMENTS Id="RDK:18950428" DesignTimeRemark="try to set Parameter with a struct" />
-								<SET Id="RDK:18950422" VarRef="Par2.filename">
-									<EXP><![CDATA[$C$Verbinder.par]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-								<SET Id="RDK:18950418" VarRef="Par2.key">
-									<EXP><![CDATA[$C$Laenge]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-								<SET Id="RDK:18950420" VarRef="Par2.value">
-									<EXP><![CDATA[$=$ShapeItem.KreiselDefinition.AbstandMS]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
-								<LIST_ADD Id="RDK:18950431" ListRef="SE_Item.toSetParameters">
-									<PAR Name="VALUE_TO_ADD">
-										<EXP><![CDATA[$=$Par2]]></EXP>
-									</PAR>
-									<PAR Name="POS_TO_ADD" />
-								</LIST_ADD>
-								<SET Id="RDK:18960567" VarRef="Par1.filename">
-									<EXP><![CDATA[$C$Verbinder.par]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
 								<SET Id="RDK:18960569" VarRef="Par1.key">
-									<EXP><![CDATA[$C$Rotation_um_z]]></EXP>
+									<EXP><![CDATA[$C$Kreisellaenge]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
-								<SET Id="RDK:18960571" VarRef="Par1.value">
-									<EXP><![CDATA[$=$DegToRad(ShapeItem.KreiselDefinition.OrientierungHV)]]></EXP>
+								<SET Id="RDK:20773290" VarRef="Par1.value">
+									<EXP><![CDATA[$=$ShapeItem.KreiselDefinition.AbstandMS]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 								<LIST_ADD Id="RDK:18960573" ListRef="SE_Item.toSetParameters">
 									<PAR Name="VALUE_TO_ADD">
-										<EXP><![CDATA[$=$Par2]]></EXP>
+										<EXP><![CDATA[$=$Par1]]></EXP>
 									</PAR>
 									<PAR Name="POS_TO_ADD" />
 								</LIST_ADD>
+								<COMMENTS Id="RDK:20782870" DesignTimeRemark="set all parts which should be copied and are used within the assembly" />
+								<SET Id="RDK:20782872" VarRef="Parts">
+									<EXP><![CDATA[$=$NewList("Kreiselstrecke.par", "Motor.par", "Spannstation.par")]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
 							</CASEGROUP>
 							<CASEGROUP Id="RDK:18931682" CaseType="0">
 								<EXP><![CDATA[$C$Gefaellestrecke]]></EXP>
@@ -17698,12 +17688,37 @@ ShapeList["id="+Param.Input[1].shapeID].name
 									<EXP><![CDATA[$=$ShapeItem.y]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
+								<IFTHENELSE Id="RDK:20801331">
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$ShapeItem.GefaelleDefinition.HoeheUnten  > ShapeItem.GefaelleDefinition.HoeheOben]]></EXP>
+									</VALUECONDITION>
+									<GROUP Id="RDK:20801328" SubType="Then">
+										<SET Id="RDK:20801343" VarRef="SE_Item.Z">
+											<EXP><![CDATA[$=$ShapeItem.GefaelleDefinition.HoeheUnten - (ShapeItem.GefaelleDefinition.HoeheUnten - ShapeItem.GefaelleDefinition.HoeheOben)/2 ]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+										<SET Id="RDK:20801349" VarRef="winkel">
+											<EXP><![CDATA[$=$ShapeItem.GefaelleDefinition.winkel]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+									</GROUP>
+									<GROUP Id="RDK:20801330" SubType="Else">
+										<SET Id="RDK:20801345" VarRef="SE_Item.Z">
+											<EXP><![CDATA[$=$ShapeItem.GefaelleDefinition.HoeheUnten + (ShapeItem.GefaelleDefinition.HoeheOben - ShapeItem.GefaelleDefinition.HoeheUnten)/2 ]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+										<SET Id="RDK:20801351" VarRef="winkel">
+											<EXP><![CDATA[$=$ShapeItem.GefaelleDefinition.winkel*-1]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+									</GROUP>
+								</IFTHENELSE>
 								<SET Id="RDK:18931672" VarRef="SE_Item.Z">
 									<EXP><![CDATA[$=$ShapeItem.GefaelleDefinition.HoeheUnten + (ShapeItem.GefaelleDefinition.HoeheOben - ShapeItem.GefaelleDefinition.HoeheUnten)/2 ]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
-								<SET Id="RDK:18931673" VarRef="SE_Item.rotation" DesignTimeRemark="ShapeItem.rotation">
-									<EXP><![CDATA[$=$270]]></EXP>
+								<SET Id="RDK:18931673" VarRef="SE_Item.rotation">
+									<EXP><![CDATA[$=$ShapeItem.rotation]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 								<SET Id="RDK:18931674" VarRef="SE_Item.ItemName">
@@ -17711,16 +17726,12 @@ ShapeList["id="+Param.Input[1].shapeID].name
 									<PAR Name="AdvancedOptions" />
 								</SET>
 								<SET Id="RDK:18931675" VarRef="SE_Item.SEFilename">
-									<EXP><![CDATA[$C$Gefaellestrecke_rechts]]></EXP>
+									<EXP><![CDATA[$C$Gefaellestrecke_allgemein]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 								<COMMENTS Id="RDK:18951798" DesignTimeRemark="try to set Parameter with a struct" />
-								<SET Id="RDK:18951800" VarRef="Par1.filename">
-									<EXP><![CDATA[$C$Gefaellestrecke.par]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
 								<SET Id="RDK:18951802" VarRef="Par1.key">
-									<EXP><![CDATA[$C$Länge]]></EXP>
+									<EXP><![CDATA[$C$Gesamtlaenge]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 								<SET Id="RDK:18951804" VarRef="Par1.value">
@@ -17733,16 +17744,12 @@ ShapeList["id="+Param.Input[1].shapeID].name
 									</PAR>
 									<PAR Name="POS_TO_ADD" />
 								</LIST_ADD>
-								<SET Id="RDK:18951806" VarRef="Par2.filename">
-									<EXP><![CDATA[$C$Gefaellestrecke.par]]></EXP>
-									<PAR Name="AdvancedOptions" />
-								</SET>
 								<SET Id="RDK:18951808" VarRef="Par2.key">
-									<EXP><![CDATA[$C$Neigung]]></EXP>
+									<EXP><![CDATA[$C$Winkel]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 								<SET Id="RDK:18951810" VarRef="Par2.value">
-									<EXP><![CDATA[$=$ShapeItem.GefaelleDefinition.winkel]]></EXP>
+									<EXP><![CDATA[$=$winkel]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 								<LIST_ADD Id="RDK:18951814" ListRef="SE_Item.toSetParameters">
@@ -17751,6 +17758,11 @@ ShapeList["id="+Param.Input[1].shapeID].name
 									</PAR>
 									<PAR Name="POS_TO_ADD" />
 								</LIST_ADD>
+								<COMMENTS Id="RDK:20782874" DesignTimeRemark="set all parts which should be copied and are used within the assembly" />
+								<SET Id="RDK:20793814" VarRef="Parts">
+									<EXP><![CDATA[$=$NewList("Gefaellestrecke_Verbinder.par", "T_Bogen.par")]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
 							</CASEGROUP>
 							<CASEGROUP Id="RDK:18760766" CaseType="0">
 								<EXP><![CDATA[$C$Foerderer]]></EXP>
@@ -17783,7 +17795,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 									<PAR Name="AdvancedOptions" />
 								</SET>
 								<SET Id="RDK:18958519" VarRef="SE_Item.rotation" DesignTimeRemark="ShapeItem.rotation">
-									<EXP><![CDATA[$=$270]]></EXP>
+									<EXP><![CDATA[$=$ShapeItem.rotation]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 								<SET Id="RDK:18958520" VarRef="SE_Item.ItemName">
@@ -17803,11 +17815,39 @@ ShapeList["id="+Param.Input[1].shapeID].name
 								</SET>
 							</CASEGROUP>
 						</SELECTCASE>
-						<GROUP Id="RDK:18760875" Name="PlaceInSolidEdge" SubType="Generic">
-							<SET Id="RDK:18760836" VarRef="LevelOfDetail">
-								<EXP><![CDATA[$C$templates]]></EXP>
+						<FOREACHLOOP Id="RDK:20782847" DesignTimeRemark="Copy all parts which are used for given Assembly" ItemVarRef="Part">
+							<PAR Name="ArrayValueExp">
+								<EXP><![CDATA[$=$Parts]]></EXP>
+							</PAR>
+							<PAR Name="ExitCondExp">
+								<EXP><![CDATA[$V$]]></EXP>
+							</PAR>
+							<SET Id="RDK:20782849" VarRef="Source">
+								<EXP><![CDATA[$=$ProcPath()+"CAD\"+ LevelOfDetail+ "\"+Part]]></EXP>
 								<PAR Name="AdvancedOptions" />
 							</SET>
+							<SET Id="RDK:20782851" VarRef="Destination">
+								<EXP><![CDATA[$=$ProcPath()+"CAD\"+Part]]></EXP>
+								<PAR Name="AdvancedOptions" />
+							</SET>
+							<ACTION_CALL Id="RDK:20782853" Name="RDEngineering_CopyFile" DesignTimeRemark="{Source File} --&gt; {Destination File}">
+								<PAR Name="RDLibraryName">
+									<EXP><![CDATA[$C$RDEngineering_MISC]]></EXP>
+								</PAR>
+								<PAR Name="FileName">
+									<EXP><![CDATA[$=$Source]]></EXP>
+								</PAR>
+								<PAR Name="NewFileName">
+									<EXP><![CDATA[$=$Destination]]></EXP>
+								</PAR>
+								<PAR Name="AcceptWildcards" />
+								<PAR Name="Overwrite">
+									<EXP><![CDATA[$C$True]]></EXP>
+								</PAR>
+								<PAR Name="Options" />
+							</ACTION_CALL>
+						</FOREACHLOOP>
+						<GROUP Id="RDK:18760875" Name="PlaceInSolidEdge" SubType="Generic">
 							<IFTHENELSE Id="RDK:18958534">
 								<VALUECONDITION Value="true">
 									<EXP><![CDATA[$=$StrLength(SE_Item.SEFilename) > 0]]></EXP>
@@ -17867,7 +17907,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 										</PAR>
 										<PAR Name="AngleY" />
 										<PAR Name="AngleZ">
-											<EXP><![CDATA[$=$90]]></EXP>
+											<EXP><![CDATA[$=$SE_Item.rotation -90]]></EXP>
 										</PAR>
 										<PAR Name="AsmCoordSys" />
 										<PAR Name="RefPartName" />
@@ -17901,7 +17941,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 												<EXP><![CDATA[$C$0]]></EXP>
 											</PAR>
 											<PAR Name="SubPartName">
-												<EXP><![CDATA[$=$Par.filename+":1@"+Path2File(Destination)+":1"]]></EXP>
+												<EXP><![CDATA[$=$Path2File(Destination)+":1"]]></EXP>
 											</PAR>
 											<PAR Name="WriteMode">
 												<EXP><![CDATA[$C$0]]></EXP>
@@ -17919,9 +17959,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 											<PAR Name="InVarNames" />
 											<PAR Name="InVarValues" />
 											<PAR Name="InVarUoms" />
-											<PAR Name="Options">
-												<EXP><![CDATA[$C$(ADJUSTABLEVAR)]]></EXP>
-											</PAR>
+											<PAR Name="Options" />
 										</ACTION_CALL>
 									</FOREACHLOOP>
 								</GROUP>
@@ -26053,4 +26091,4 @@ ShapeList["id="+Param.Input[1].shapeID].name
 		</PROFILES_DATA>
 		<BOM_DATA />
 	</EXTERNAL_DATA>
-</PROCESS>
\ No newline at end of file
+</PROCESS>