diff --git a/CAD/templates/Omniflo/710005021_PRT.par b/CAD/templates/Omniflo/710005021_PRT.par
new file mode 100644
index 0000000..1d8605b
Binary files /dev/null and b/CAD/templates/Omniflo/710005021_PRT.par differ
diff --git a/CAD/templates/Omniflo/720000007_1_PRT.par b/CAD/templates/Omniflo/720000007_1_PRT.par
new file mode 100644
index 0000000..f5ac57c
Binary files /dev/null and b/CAD/templates/Omniflo/720000007_1_PRT.par differ
diff --git a/CAD/templates/Omniflo/720000007_2_PRT.par b/CAD/templates/Omniflo/720000007_2_PRT.par
new file mode 100644
index 0000000..5a23c9e
Binary files /dev/null and b/CAD/templates/Omniflo/720000007_2_PRT.par differ
diff --git a/CAD/templates/Omniflo/720000007_3_PRT.par b/CAD/templates/Omniflo/720000007_3_PRT.par
new file mode 100644
index 0000000..07bb740
Binary files /dev/null and b/CAD/templates/Omniflo/720000007_3_PRT.par differ
diff --git a/CAD/templates/Omniflo/720000007_ASM.asm b/CAD/templates/Omniflo/720000007_ASM.asm
new file mode 100644
index 0000000..88efe76
Binary files /dev/null and b/CAD/templates/Omniflo/720000007_ASM.asm differ
diff --git a/CAD/templates/Omniflo/720000008_1_PRT.par b/CAD/templates/Omniflo/720000008_1_PRT.par
new file mode 100644
index 0000000..bece7dd
Binary files /dev/null and b/CAD/templates/Omniflo/720000008_1_PRT.par differ
diff --git a/CAD/templates/Omniflo/720000008_2_PRT.par b/CAD/templates/Omniflo/720000008_2_PRT.par
new file mode 100644
index 0000000..274fb30
Binary files /dev/null and b/CAD/templates/Omniflo/720000008_2_PRT.par differ
diff --git a/CAD/templates/Omniflo/720000008_ASM.asm b/CAD/templates/Omniflo/720000008_ASM.asm
new file mode 100644
index 0000000..70d3967
Binary files /dev/null and b/CAD/templates/Omniflo/720000008_ASM.asm differ
diff --git a/CAD/templates/Omniflo/821104024.asm b/CAD/templates/Omniflo/821104024.asm
index e674ecc..c00a9a6 100644
Binary files a/CAD/templates/Omniflo/821104024.asm and b/CAD/templates/Omniflo/821104024.asm differ
diff --git a/CAD/templates/Omniflo/821104024.par b/CAD/templates/Omniflo/821104024.par
index dfc44c6..09c9415 100644
Binary files a/CAD/templates/Omniflo/821104024.par and b/CAD/templates/Omniflo/821104024.par differ
diff --git a/CAD/templates/Omniflo/821104025.par b/CAD/templates/Omniflo/821104025.par
index 621a737..316d486 100644
Binary files a/CAD/templates/Omniflo/821104025.par and b/CAD/templates/Omniflo/821104025.par differ
diff --git a/CAD/templates/Omniflo/821104026.par b/CAD/templates/Omniflo/821104026.par
index ff28841..2ad5f26 100644
Binary files a/CAD/templates/Omniflo/821104026.par and b/CAD/templates/Omniflo/821104026.par differ
diff --git a/CAD/templates/Omniflo/821104027.asm b/CAD/templates/Omniflo/821104027.asm
index ce0febd..69a9439 100644
Binary files a/CAD/templates/Omniflo/821104027.asm and b/CAD/templates/Omniflo/821104027.asm differ
diff --git a/CAD/templates/Omniflo/821104027.par b/CAD/templates/Omniflo/821104027.par
index 4152ccb..da74757 100644
Binary files a/CAD/templates/Omniflo/821104027.par and b/CAD/templates/Omniflo/821104027.par differ
diff --git a/CAD/templates/Omniflo/821104031.par b/CAD/templates/Omniflo/821104031.par
index 3f46358..da782ff 100644
Binary files a/CAD/templates/Omniflo/821104031.par and b/CAD/templates/Omniflo/821104031.par differ
diff --git a/CAD/templates/Omniflo/821104041.par b/CAD/templates/Omniflo/821104041.par
index f77427a..c13d76e 100644
Binary files a/CAD/templates/Omniflo/821104041.par and b/CAD/templates/Omniflo/821104041.par differ
diff --git a/CAD/templates/Omniflo/821104043.par b/CAD/templates/Omniflo/821104043.par
index 8f10e5e..5a72284 100644
Binary files a/CAD/templates/Omniflo/821104043.par and b/CAD/templates/Omniflo/821104043.par differ
diff --git a/CAD/templates/Omniflo/821104065.par b/CAD/templates/Omniflo/821104065.par
index d547d92..23d57bf 100644
Binary files a/CAD/templates/Omniflo/821104065.par and b/CAD/templates/Omniflo/821104065.par differ
diff --git a/CAD/templates/Omniflo/821106002.asm b/CAD/templates/Omniflo/821106002.asm
index 4923059..0196cee 100644
Binary files a/CAD/templates/Omniflo/821106002.asm and b/CAD/templates/Omniflo/821106002.asm differ
diff --git a/CAD/templates/Omniflo/821106002.par b/CAD/templates/Omniflo/821106002.par
index 527ab00..07ac0b9 100644
Binary files a/CAD/templates/Omniflo/821106002.par and b/CAD/templates/Omniflo/821106002.par differ
diff --git a/CAD/templates/Omniflo/822064091.par b/CAD/templates/Omniflo/822064091.par
new file mode 100644
index 0000000..1f1b673
Binary files /dev/null and b/CAD/templates/Omniflo/822064091.par differ
diff --git a/CAD/templates/Omniflo/822064093_ASM.asm b/CAD/templates/Omniflo/822064093_ASM.asm
new file mode 100644
index 0000000..11efc63
Binary files /dev/null and b/CAD/templates/Omniflo/822064093_ASM.asm differ
diff --git a/CAD/templates/Omniflo/822066197_PRT.par b/CAD/templates/Omniflo/822066197_PRT.par
new file mode 100644
index 0000000..a4900f7
Binary files /dev/null and b/CAD/templates/Omniflo/822066197_PRT.par differ
diff --git a/CAD/templates/Omniflo/822066198_PRT.par b/CAD/templates/Omniflo/822066198_PRT.par
new file mode 100644
index 0000000..b748e60
Binary files /dev/null and b/CAD/templates/Omniflo/822066198_PRT.par differ
diff --git a/CAD/templates/Omniflo/822066199_PRT.par b/CAD/templates/Omniflo/822066199_PRT.par
new file mode 100644
index 0000000..9e767c6
Binary files /dev/null and b/CAD/templates/Omniflo/822066199_PRT.par differ
diff --git a/CAD/templates/Omniflo/822066200_PRT.par b/CAD/templates/Omniflo/822066200_PRT.par
new file mode 100644
index 0000000..d1175b0
Binary files /dev/null and b/CAD/templates/Omniflo/822066200_PRT.par differ
diff --git a/CAD/templates/Omniflo/822066201_PRT.par b/CAD/templates/Omniflo/822066201_PRT.par
new file mode 100644
index 0000000..4f8421e
Binary files /dev/null and b/CAD/templates/Omniflo/822066201_PRT.par differ
diff --git a/CAD/templates/Omniflo/822066204_PRT.par b/CAD/templates/Omniflo/822066204_PRT.par
new file mode 100644
index 0000000..86eb70b
Binary files /dev/null and b/CAD/templates/Omniflo/822066204_PRT.par differ
diff --git a/CAD/templates/Omniflo/822066205_PRT.par b/CAD/templates/Omniflo/822066205_PRT.par
new file mode 100644
index 0000000..98b7e81
Binary files /dev/null and b/CAD/templates/Omniflo/822066205_PRT.par differ
diff --git a/CAD/templates/Omniflo/822066206_PRT.par b/CAD/templates/Omniflo/822066206_PRT.par
new file mode 100644
index 0000000..a07a541
Binary files /dev/null and b/CAD/templates/Omniflo/822066206_PRT.par differ
diff --git a/CAD/templates/Omniflo/822066207_PRT.par b/CAD/templates/Omniflo/822066207_PRT.par
new file mode 100644
index 0000000..7ec02fa
Binary files /dev/null and b/CAD/templates/Omniflo/822066207_PRT.par differ
diff --git a/CAD/templates/Omniflo/822066208_PRT.par b/CAD/templates/Omniflo/822066208_PRT.par
new file mode 100644
index 0000000..5631d8c
Binary files /dev/null and b/CAD/templates/Omniflo/822066208_PRT.par differ
diff --git a/CAD/templates/Omniflo/822066212_PRT.par b/CAD/templates/Omniflo/822066212_PRT.par
new file mode 100644
index 0000000..a377963
Binary files /dev/null and b/CAD/templates/Omniflo/822066212_PRT.par differ
diff --git a/CAD/templates/Omniflo/822066220_PRT.par b/CAD/templates/Omniflo/822066220_PRT.par
new file mode 100644
index 0000000..a14907b
Binary files /dev/null and b/CAD/templates/Omniflo/822066220_PRT.par differ
diff --git a/CAD/templates/Omniflo/911021156_PRT.par b/CAD/templates/Omniflo/911021156_PRT.par
new file mode 100644
index 0000000..38540ec
Binary files /dev/null and b/CAD/templates/Omniflo/911021156_PRT.par differ
diff --git a/CAD/templates/Omniflo/911021166_PRT.par b/CAD/templates/Omniflo/911021166_PRT.par
new file mode 100644
index 0000000..5721e40
Binary files /dev/null and b/CAD/templates/Omniflo/911021166_PRT.par differ
diff --git a/CAD/templates/Omniflo/911071027_PRT.par b/CAD/templates/Omniflo/911071027_PRT.par
new file mode 100644
index 0000000..d0be357
Binary files /dev/null and b/CAD/templates/Omniflo/911071027_PRT.par differ
diff --git a/CAD/templates/Omniflo/912011010_PRT.par b/CAD/templates/Omniflo/912011010_PRT.par
new file mode 100644
index 0000000..6b3ecf6
Binary files /dev/null and b/CAD/templates/Omniflo/912011010_PRT.par differ
diff --git a/CAD/templates/Omniflo/912041005_PRT.par b/CAD/templates/Omniflo/912041005_PRT.par
new file mode 100644
index 0000000..705ba4d
Binary files /dev/null and b/CAD/templates/Omniflo/912041005_PRT.par differ
diff --git a/CAD/templates/Omniflo/913011001_PRT.par b/CAD/templates/Omniflo/913011001_PRT.par
new file mode 100644
index 0000000..9f7aa63
Binary files /dev/null and b/CAD/templates/Omniflo/913011001_PRT.par differ
diff --git a/CAD/templates/Omniflo/913011009_PRT.par b/CAD/templates/Omniflo/913011009_PRT.par
new file mode 100644
index 0000000..de1e343
Binary files /dev/null and b/CAD/templates/Omniflo/913011009_PRT.par differ
diff --git a/CAD/templates/Omniflo/913011109_PRT.par b/CAD/templates/Omniflo/913011109_PRT.par
new file mode 100644
index 0000000..364166d
Binary files /dev/null and b/CAD/templates/Omniflo/913011109_PRT.par differ
diff --git a/CAD/templates/Omniflo/D933_M8X50_PRT.par b/CAD/templates/Omniflo/D933_M8X50_PRT.par
new file mode 100644
index 0000000..f342c11
Binary files /dev/null and b/CAD/templates/Omniflo/D933_M8X50_PRT.par differ
diff --git a/CAD/templates/Omniflo/KETTE3_PRT.par b/CAD/templates/Omniflo/KETTE3_PRT.par
new file mode 100644
index 0000000..e03c9b1
Binary files /dev/null and b/CAD/templates/Omniflo/KETTE3_PRT.par differ
diff --git a/CAD/templates/Omniflo/REDUNDANT_DIN7981_PRT.par b/CAD/templates/Omniflo/REDUNDANT_DIN7981_PRT.par
new file mode 100644
index 0000000..800fb2b
Binary files /dev/null and b/CAD/templates/Omniflo/REDUNDANT_DIN7981_PRT.par differ
diff --git a/Editor2DLibrary/SSG/shapes/palettes/c_OmnifloBogen.xml b/Editor2DLibrary/SSG/shapes/palettes/c_OmnifloBogen.xml
index 4f3eff4..64f088d 100644
--- a/Editor2DLibrary/SSG/shapes/palettes/c_OmnifloBogen.xml
+++ b/Editor2DLibrary/SSG/shapes/palettes/c_OmnifloBogen.xml
@@ -2,7 +2,6 @@
 <div class="paletteItem"><div><img id="821104025+0_B10090" class="shape" title="" family="OFBogen" shapeMode="0" src="SSG/shapes/img/APB_110_R550_22_5_84_821104025_mit_0_B10090_TEFBogen_22_5_R450_32px.png" /></div><div>APB 110 R 550/22.5 84 mit TEF Innen</div></div>
 <div class="paletteItem"><div><img id="821104025+0_B10091" class="shape" title="" family="OFBogen" shapeMode="0" src="SSG/shapes/img/APB_110_R550_22_5_84_821104025_mit_0_B10091_TEFBogen_22_5_R650_32px.png" /></div><div>APB 110 R 550/22.5 84 mit TEF Aussen</div></div>
 <div class="paletteItem"><div><img id="821104021" class="shape" title="" family="OFBogen" shapeMode="0" src="SSG/shapes/img/APB_110_R400_45_400_821104021_32px.png" /></div><div>APB 110 R 400/45 400</div></div>
-<div class="paletteItem"><div><img id="Test" class="shape" title="" family="OFBogen" shapeMode="0" src="SSG/shapes/img/APB_110_R400_45_400_821104021_32px.png" /></div><div>APB 110 R 400/45 400</div></div>
 <div class="paletteItem"><div><img id="821104029" class="shape" title="" family="OFBogen" shapeMode="0" src="SSG/shapes/img/APB_110_R550_45_191_821104029_32px.png" /></div><div>APB 110 R 550/45 191</div></div>
 <div class="paletteItem"><div><img id="821104037" class="shape" title="" family="OFBogen" shapeMode="0" src="SSG/shapes/img/APB_110_R550_45_191_821104029_32px.png" /></div><div>APB 110 R 550/45 205</div></div>
 <div class="paletteItem"><div><img id="821104026" class="shape" title="" family="OFBogen" shapeMode="0" src="SSG/shapes/img/APB_110_R550_45_232_821104026_32px.png" /></div><div>APB 110 R 550/45 232</div></div>
diff --git a/Editor2DLibrary/SSG/shapes/props/821104021.txt b/Editor2DLibrary/SSG/shapes/props/821104021.txt
index 63d6194..406a18f 100644
--- a/Editor2DLibrary/SSG/shapes/props/821104021.txt
+++ b/Editor2DLibrary/SSG/shapes/props/821104021.txt
@@ -14,7 +14,7 @@
     {
       "id": "cp1",
       "x": 0.0,
-      "y": 48.269,
+      "y": 45.329,
       "z": 0.0,
       "xMin": "",
       "xMax": "",
@@ -32,8 +32,8 @@
     },
     {
       "id": "cp2",
-      "x": 978.254,
-      "y": 695.869,
+      "x": 980.194,
+      "y": 968.791,
       "z": 0.0,
       "xMin": "",
       "xMax": "",
diff --git a/Editor2DLibrary/SSG/shapes/svg/821104021.xml b/Editor2DLibrary/SSG/shapes/svg/821104021.xml
index 7a819ad..0eafe5f 100644
--- a/Editor2DLibrary/SSG/shapes/svg/821104021.xml
+++ b/Editor2DLibrary/SSG/shapes/svg/821104021.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg">
   <g transform="rotate(0)">
-    <svg viewBox="0 0 1e3 639.007" preserveAspectRatio="none" position="absolute" overflow="visible">
-      <path d="m998.66 598.72-421.15-421.8m-421.89-175.03h-155.62m577.49 175.03a596.62 597.58 0 0 0-421.89-175.03" fill="none" stroke="#ffe31b" stroke-width="1px" />
+    <svg viewBox="0 0 1e3 635.11" preserveAspectRatio="none" position="absolute" overflow="visible">
+      <g fill="none">
+        <path d="m566.51 201.57 411.79 411.83m-976.41-582.72 152.12-0.001477m412.51 170.89a583.38 583.44 0 0 0-412.51-170.89" fill="none" stroke="#ffe31b" stroke-width="1px" />
+        <path d="m956.6 635.11 43.396-43.398" stroke-width="1px" />
+        <path d="m1.8898 0v61.378" stroke-width="1px" />
+      </g>
     </svg>
   </g>
 </svg>
\ No newline at end of file
diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index f5e9bf4..7b4d7c0 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="y.wang [ANGEBOT-NB02]" ModDate="2025-04-01T11:05:14" LanguageVersion="2014.1.3.698" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="m.stangl [ENTW-NB08]" ModDate="2025-04-25T17:30:35" LanguageVersion="2014.1.3.710" />
 	<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">
@@ -177,6 +177,7 @@
 				<TYPE Id="RDK:23017103" Name="OFGeradeType" SubType="structure">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:23017087" Name="Beschreibung" Type="string" />
+					<FIELD Id="RDK:24227748" Name="Sivasnr" Type="string" />
 					<FIELD Id="RDK:23017088" Name="L1" Type="double" />
 					<FIELD Id="RDK:23017089" Name="L_th" Type="double" DesignTimeRemark="Theoretische Länge berechnet aus Winkel und L1 (projizierte Länge)" />
 					<FIELD Id="RDK:23017090" Name="LH_fits" Type="boolean" DesignTimeRemark="True wenn Länge L1 und L_toleranz zueinander passen und damit zur Höhendifferenz" />
@@ -212,7 +213,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" Expanded="True" SubType="structure" HasArrayType="True">
+				<TYPE Id="RDK:23221861" Name="OFWeicheType" SubType="structure" HasArrayType="True">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:23221848" Name="Beschreibung" Type="string" />
 					<FIELD Id="RDK:23221857" Name="WeichenTyp" Type="string" />
@@ -244,7 +245,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" />
@@ -267,7 +268,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" />
@@ -1022,8 +1023,8 @@
 					<TYPE_VALUES />
 					<FIELD Id="RDK:23017787" Name="Länge in Meter" Type="string" />
 					<FIELD Id="RDK:23017789" Name="Kurvenwinkel" Type="double" />
-					<FIELD Id="RDK:23017790" Name="Höhe Anfang" Type="string" />
-					<FIELD Id="RDK:23017791" Name="Höhe Ende" Type="string" />
+					<FIELD Id="RDK:24269555" Name="Radius" Type="double" />
+					<FIELD Id="RDK:23017790" Name="Höhe" Type="string" />
 					<FIELD Id="RDK:23017794" Name="SivasNummer" Type="string" />
 				</TYPE>
 				<TYPE Id="RDK:23221889" Name="OFWeicheMerkmaleType" SubType="structure">
@@ -1058,7 +1059,7 @@
 					<FIELD Id="RDK:23747563" Name="Sivasnr" Type="string" />
 					<FIELD Id="RDK:23747564" Name="hatMotor" Type="boolean" DesignTimeRemark="True wenn es eine Motorstation ist. Bei False ist es nur eine Umlenkstation" />
 				</TYPE>
-				<TYPE Id="RDK:22028896" Name="AngetriebeneStreckeMerkmaleType" SubType="structure" HasArrayType="True">
+				<TYPE Id="RDK:22028896" Name="AngetriebeneStreckeMerkmaleType" Expanded="True" SubType="structure" HasArrayType="True">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:22028884" Name="MotorSeite" Type="string" />
 					<FIELD Id="RDK:22028885" Name="AnzahlGeraden" Type="integer" />
@@ -1075,7 +1076,7 @@
 					<FIELD Id="RDK:22028895" Name="Anzahl der Scanner" Type="integer" />
 					<FIELD Id="RDK:22305675" Name="Höhe in m" Type="double" />
 				</TYPE>
-				<TYPE Id="RDK:22028922" Name="GefälleStreckeMerkmaleType" SubType="structure" HasArrayType="True">
+				<TYPE Id="RDK:22028922" Name="GefälleStreckeMerkmaleType" Expanded="True" SubType="structure" HasArrayType="True">
 					<TYPE_VALUES />
 					<FIELD Id="RDK:22028911" Name="AnzahlGeraden" Type="integer" />
 					<FIELD Id="RDK:22028912" Name="Länge in Meter" Type="double[]" />
@@ -1375,6 +1376,7 @@
 			<VAR Id="RDK:23611107" Name="HoeheOben" Type="double" DesignTimeRemark="Generated by RD" />
 			<VAR Id="RDK:24038425" Name="Part" Type="string" DesignTimeRemark="Generated by RD" />
 			<VAR Id="RDK:24038426" Name="Part" Type="string" DesignTimeRemark="Generated by RD" />
+			<VAR Id="RDK:24271547" Name="number" Type="string" DesignTimeRemark="Generated by RD" />
 		</GROUP>
 		<GROUP Id="RDK:0006" Name="Profiles" SubType="ProfileSet">
 			<PROFILE Id="RDK:383" Name="ImportBackgroundProfile" TypeName="ImportBackgroundType" />
@@ -9071,14 +9073,14 @@ SSGConnectionPoint.x_M
 								<CASEGROUP Id="RDK:23016604" CaseType="0">
 									<EXP><![CDATA[$C$OFBogen]]></EXP>
 									<SET Id="RDK:23016603" VarRef="idStr">
-										<EXP><![CDATA[$=$"KVOF"+shapeItem.OFBogenDefinition.KurvenWinkel+shapeItem.OFBogenDefinition.KurvenRichtung]]></EXP>
+										<EXP><![CDATA[$=$"KVOF"+shapeItem.OFBogenDefinition.Radius+shapeItem.OFBogenDefinition.KurvenWinkel+"-"+shapeItem.OFBogenDefinition.Sivasnr]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</CASEGROUP>
 								<CASEGROUP Id="RDK:23221945" CaseType="0">
 									<EXP><![CDATA[$C$OFWeiche]]></EXP>
 									<SET Id="RDK:23221944" VarRef="idStr">
-										<EXP><![CDATA[$=$"WEOF"+shapeItem.OFWeicheDefinition.WeichenTyp+shapeItem.OFWeicheDefinition.Sivasnr]]></EXP>
+										<EXP><![CDATA[$=$"WEOF"+shapeItem.OFWeicheDefinition.WeichenTyp+"-"+shapeItem.OFWeicheDefinition.Sivasnr]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</CASEGROUP>
@@ -9188,26 +9190,13 @@ SSGConnectionPoint.x_M
 								<PAR Name="AdvancedOptions" />
 							</SET>
 						</CASEGROUP>
-						<CASEGROUP Id="RDK:23016608" CaseType="0">
-							<EXP><![CDATA[$C$OFGerade]]></EXP>
-							<SET Id="RDK:23016607" VarRef="streckenArtvorher">
-								<EXP><![CDATA[$C$omniflo]]></EXP>
-								<PAR Name="AdvancedOptions" />
-							</SET>
-						</CASEGROUP>
-						<CASEGROUP Id="RDK:23017606" CaseType="0">
-							<EXP><![CDATA[$C$OFBogen]]></EXP>
-							<SET Id="RDK:23017605" VarRef="streckenArtvorher">
-								<EXP><![CDATA[$C$omniflo]]></EXP>
-								<PAR Name="AdvancedOptions" />
-							</SET>
-						</CASEGROUP>
-						<CASEGROUP Id="RDK:23221949" CaseType="0">
-							<EXP><![CDATA[$C$OFWeiche]]></EXP>
-							<SET Id="RDK:23221948" VarRef="streckenArtvorher">
-								<EXP><![CDATA[$C$omniflo]]></EXP>
+						<CASEGROUP Id="RDK:24271736" CaseType="1">
+							<EXP />
+							<SET Id="RDK:24271738" VarRef="Param.Result">
+								<EXP><![CDATA[$C$NOTHING]]></EXP>
 								<PAR Name="AdvancedOptions" />
 							</SET>
+							<EXIT_PROCESS Id="RDK:24271739" BreakType="4" ExitStatus="0" />
 						</CASEGROUP>
 					</SELECTCASE>
 					<FOREACHLOOP Id="RDK:22028287" ItemVarRef="shapeId" IndexVarRef="i">
@@ -9251,6 +9240,14 @@ SSGConnectionPoint.x_M
 									<PAR Name="AdvancedOptions" />
 								</SET>
 							</CASEGROUP>
+							<CASEGROUP Id="RDK:24271745" CaseType="1">
+								<EXP />
+								<SET Id="RDK:24271743" VarRef="Param.Result">
+									<EXP><![CDATA[$C$NOTHING]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<EXIT_PROCESS Id="RDK:24271744" BreakType="4" ExitStatus="0" />
+							</CASEGROUP>
 						</SELECTCASE>
 						<IFTHENELSE Id="RDK:22029121" DesignTimeRemark="Erzeuge eine Gefällestrecke aus den bisherigen Ids">
 							<VALUECONDITION Value="false">
@@ -10109,7 +10106,10 @@ SSGConnectionPoint.x_M
 									<EXP><![CDATA[$C$0]]></EXP>
 								</PAR>
 								<PAR Name="Länge in Meter">
-									<EXP><![CDATA[$C${}]]></EXP>
+									<EXP><![CDATA[$=$NewList(0)]]></EXP>
+								</PAR>
+								<PAR Name="Winkel">
+									<EXP><![CDATA[$=$NewList(0)]]></EXP>
 								</PAR>
 								<PAR Name="AnzahlKurvenLinks90">
 									<EXP><![CDATA[$C$0]]></EXP>
@@ -10129,7 +10129,7 @@ SSGConnectionPoint.x_M
 								<PAR Name="AnzahlKurvenRechts30">
 									<EXP><![CDATA[$C$0]]></EXP>
 								</PAR>
-								<PAR Name="Zusatzseparatoren">
+								<PAR Name="Anzahl der Separatoren">
 									<EXP><![CDATA[$C$0]]></EXP>
 								</PAR>
 								<PAR Name="Anzahl der Scanner">
@@ -10138,7 +10138,6 @@ SSGConnectionPoint.x_M
 								<PAR Name="Höhe in m">
 									<EXP><![CDATA[$C$0]]></EXP>
 								</PAR>
-								<PAR Name="Winkel" />
 							</SET_STRUCT>
 							<EXIT_PROCESS Id="RDK:22306151" BreakType="4" ExitStatus="0" />
 						</GROUP>
@@ -10322,18 +10321,22 @@ SSGConnectionPoint.x_M
 							<EXP><![CDATA[$=$IsEmpty(Param.Input)]]></EXP>
 						</VALUECONDITION>
 						<GROUP Id="RDK:22306100" SubType="Then">
-							<SET_STRUCT Id="RDK:22306944" VarRef="Param.Result" ClearAll="True" Suppressed="True">
-								<PAR Name="MotorSeite" />
+							<SET_STRUCT Id="RDK:22306944" VarRef="Param.Result" ClearAll="True">
+								<PAR Name="MotorSeite">
+									<EXP><![CDATA[$C$0]]></EXP>
+								</PAR>
 								<PAR Name="AnzahlGeraden">
 									<EXP><![CDATA[$C$0]]></EXP>
 								</PAR>
 								<PAR Name="Länge in Meter">
-									<EXP><![CDATA[$C$0]]></EXP>
+									<EXP><![CDATA[$=$NewList(0)]]></EXP>
 								</PAR>
 								<PAR Name="Winkel">
-									<EXP><![CDATA[$C$0]]></EXP>
+									<EXP><![CDATA[$=$NewList(0)]]></EXP>
+								</PAR>
+								<PAR Name="Förderrichtung">
+									<EXP><![CDATA[$=$NewListStr("")]]></EXP>
 								</PAR>
-								<PAR Name="Förderrichtung" />
 								<PAR Name="AnzahlKurvenLinks90">
 									<EXP><![CDATA[$C$0]]></EXP>
 								</PAR>
@@ -10366,7 +10369,8 @@ SSGConnectionPoint.x_M
 						</GROUP>
 					</IFTHENELSE>
 					<GROUP Id="RDK:22305971" Name="Local Variables" SubType="VarSet" IncludeDate="0">
-						<VAR Id="RDK:22305950" Name="motorSeite" Type="string[]" />
+						<VAR Id="RDK:22305950" Name="test" Type="AngetriebeneStreckeMerkmaleType" />
+						<VAR Id="RDK:24271836" Name="motorSeite" Type="string[]" />
 						<VAR Id="RDK:22306063" Name="laenge" Type="double" />
 						<VAR Id="RDK:22305951" Name="längenInMeter" Type="double[]" />
 						<VAR Id="RDK:22428971" Name="winkel" Type="double" />
@@ -33300,15 +33304,129 @@ me.x
 						</SET>
 					</VAR>
 					<VAR Id="RDK:22305381" Name="CSV_List" Type="CSVType[]" />
+					<VAR Id="RDK:24271448" Name="CSV_ListOmniflo" Type="CSVType[]" />
+					<VAR Id="RDK:24271450" Name="CSV_ListILS" Type="CSVType[]" />
+					<VAR Id="RDK:24271454" Name="CSV_ListGroup" Type="CSVType[]" />
 				</GROUP>
-				<FOREACHLOOP Id="RDK:22305523" ItemVarRef="ShapeItem">
+				<CALLFUNCTION Id="RDK:24271458">
+					<PAR Name="FuncName">
+						<EXP><![CDATA[$C$CreateCsvItemsOmniflo]]></EXP>
+					</PAR>
+					<PAR Name="InputExp">
+						<EXP><![CDATA[$=$]]></EXP>
+					</PAR>
+					<PAR Name="ResultRef">
+						<EXP><![CDATA[$V$CSV_ListOmniflo]]></EXP>
+					</PAR>
+					<PAR Name="Options" />
+				</CALLFUNCTION>
+				<CALLFUNCTION Id="RDK:24271456">
+					<PAR Name="FuncName">
+						<EXP><![CDATA[$C$CreateCsvItemsILS]]></EXP>
+					</PAR>
+					<PAR Name="InputExp">
+						<EXP><![CDATA[$=$True]]></EXP>
+					</PAR>
+					<PAR Name="ResultRef">
+						<EXP><![CDATA[$V$CSV_ListILS]]></EXP>
+					</PAR>
+					<PAR Name="Options" />
+				</CALLFUNCTION>
+				<CALLFUNCTION Id="RDK:24271452">
+					<PAR Name="FuncName">
+						<EXP><![CDATA[$C$CreateCsvItemsInGroups]]></EXP>
+					</PAR>
+					<PAR Name="InputExp">
+						<EXP><![CDATA[$=$True]]></EXP>
+					</PAR>
+					<PAR Name="ResultRef">
+						<EXP><![CDATA[$V$CSV_ListGroup]]></EXP>
+					</PAR>
+					<PAR Name="Options" />
+				</CALLFUNCTION>
+				<IFTHENELSE Id="RDK:24271693">
+					<VALUECONDITION Value="true">
+						<EXP><![CDATA[$=$Count(CSV_ListOmniflo) > 0]]></EXP>
+					</VALUECONDITION>
+					<GROUP Id="RDK:24271694" SubType="Then">
+						<LIST_ADD Id="RDK:22305539" ListRef="CSV_List">
+							<PAR Name="VALUE_TO_ADD">
+								<EXP><![CDATA[$=$CSV_ListOmniflo]]></EXP>
+							</PAR>
+							<PAR Name="POS_TO_ADD" />
+						</LIST_ADD>
+					</GROUP>
+				</IFTHENELSE>
+				<IFTHENELSE Id="RDK:24271709">
+					<VALUECONDITION Value="true">
+						<EXP><![CDATA[$=$Count(CSV_ListILS) > 0]]></EXP>
+					</VALUECONDITION>
+					<GROUP Id="RDK:24271708" SubType="Then">
+						<LIST_ADD Id="RDK:24271690" ListRef="CSV_List">
+							<PAR Name="VALUE_TO_ADD">
+								<EXP><![CDATA[$=$CSV_ListILS]]></EXP>
+							</PAR>
+							<PAR Name="POS_TO_ADD" />
+						</LIST_ADD>
+					</GROUP>
+				</IFTHENELSE>
+				<IFTHENELSE Id="RDK:24271721">
+					<VALUECONDITION Value="true">
+						<EXP><![CDATA[$=$Count(CSV_ListGroup) > 0]]></EXP>
+					</VALUECONDITION>
+					<GROUP Id="RDK:24271720" SubType="Then">
+						<LIST_ADD Id="RDK:24271692" ListRef="CSV_List">
+							<PAR Name="VALUE_TO_ADD">
+								<EXP><![CDATA[$=$CSV_ListGroup]]></EXP>
+							</PAR>
+							<PAR Name="POS_TO_ADD" />
+						</LIST_ADD>
+					</GROUP>
+				</IFTHENELSE>
+				<SET Id="RDK:22305564" VarRef="Param.Result">
+					<EXP><![CDATA[$=$CSV_List]]></EXP>
+					<PAR Name="AdvancedOptions" />
+				</SET>
+			</FUNCTION>
+			<FUNCTION Id="RDK:24270783" Name="CreateCsvItemsILS" Bookmarked="True" DesignTimeRemark="Erzeugt aus jedem ILS Element ein CSV Item" InputTypeName="boolean" ResultTypeName="CSVType[]">
+				<GROUP Id="RDK:24270601" Name="Local Variables" SubType="VarSet" IncludeDate="0">
+					<GROUP Id="RDK:24270596" Name="CSV Export" SubType="VarSet" IncludeDate="0">
+						<VAR Id="RDK:24270578" Name="KreiselMerkmale" Type="KreiselMerkmaleType" />
+						<VAR Id="RDK:24270579" Name="GefaellestreckeMerkmale" Type="GefaellestreckeMerkmaleType" />
+						<VAR Id="RDK:24270580" Name="FoerdererMerkmale" Type="FoerdererMerkmaleType" />
+						<VAR Id="RDK:24270581" Name="VarioFoerdererMerkmale" Type="VarioFoerdererMerkmaleType" />
+						<VAR Id="RDK:24270582" Name="WeicheMerkmale" Type="WeicheMerkmaleType" />
+						<VAR Id="RDK:24270583" Name="KurveMerkmale" Type="KurveMerkmaleType" />
+						<VAR Id="RDK:24270584" Name="KurveFoerdererMerkmale" Type="KurveFoerdererMerkmaleType" />
+						<VAR Id="RDK:24270585" Name="EckradMerkmale" Type="EckradMerkmaleType" />
+						<VAR Id="RDK:24270586" Name="BTMTBeladungMerkmale" Type="BTMTBeladungMerkmaleType" />
+						<VAR Id="RDK:24270587" Name="BTMTEntladungMerkmale" Type="BTMTEntladungMerkmaleType" />
+						<VAR Id="RDK:24270588" Name="OFGeradeMerkmale" Type="OFGeradeMerkmaleType" />
+						<VAR Id="RDK:24270589" Name="OFBogenMerkmale" Type="OFBogenMerkmaleType" />
+						<VAR Id="RDK:24270590" Name="OFWeicheMerkmale" Type="OFWeicheMerkmaleType" />
+						<VAR Id="RDK:24270591" Name="TEFGeradeMerkmale" Type="TEFGeradeMerkmaleType" />
+						<VAR Id="RDK:24270592" Name="TEFBogenMerkmale" Type="TEFGeradeMerkmaleType" />
+						<VAR Id="RDK:24270593" Name="TEFUmlenkMerkmale" Type="TEFUmlenkMerkmaleType" />
+						<VAR Id="RDK:24270594" Name="CSVFileName" Type="string" />
+						<VAR Id="RDK:24270595" Name="CSVFile" Type="string" />
+					</GROUP>
+					<VAR Id="RDK:24270597" Name="inGroup" Type="boolean" />
+					<VAR Id="RDK:24271467" Name="withGroups" Type="boolean">
+						<SET Id="RDK:24271466" VarRef="Me">
+							<EXP><![CDATA[$=$Param.Input]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+					</VAR>
+					<VAR Id="RDK:24270600" Name="CSV_List" Type="CSVType[]" />
+				</GROUP>
+				<FOREACHLOOP Id="RDK:24270761" DesignTimeRemark="Alle Elemente die nicht in einer Gruppe sind in CSV Elemente wandeln" ItemVarRef="ShapeItem">
 					<PAR Name="ArrayValueExp">
 						<EXP><![CDATA[$=$ShapeList]]></EXP>
 					</PAR>
 					<PAR Name="ExitCondExp">
 						<EXP><![CDATA[$V$]]></EXP>
 					</PAR>
-					<CALLFUNCTION Id="RDK:22305397">
+					<CALLFUNCTION Id="RDK:24270602">
 						<PAR Name="FuncName">
 							<EXP><![CDATA[$C$IsInGroup]]></EXP>
 						</PAR>
@@ -33320,67 +33438,82 @@ me.x
 						</PAR>
 						<PAR Name="Options" />
 					</CALLFUNCTION>
-					<IFTHENELSE Id="RDK:22305400" DesignTimeRemark="Elemente in Gruppen nicht doppelt raus schreiben">
+					<IFTHENELSE Id="RDK:24271180" DesignTimeRemark="Gruppen in eigener Funktion behandeln">
 						<VALUECONDITION Value="true">
 							<EXP><![CDATA[$=$inGroup]]></EXP>
 						</VALUECONDITION>
 						<VALUECONDITION Value="true">
 							<EXP><![CDATA[$=$withGroups]]></EXP>
 						</VALUECONDITION>
-						<GROUP Id="RDK:22305399" SubType="Then">
-							<EXIT_PROCESS Id="RDK:22305398" BreakType="2" ExitStatus="0" />
+						<GROUP Id="RDK:24271179" SubType="Then">
+							<EXIT_PROCESS Id="RDK:24271178" BreakType="2" ExitStatus="0" />
 						</GROUP>
 					</IFTHENELSE>
-					<GROUP Id="RDK:22305522" Name="Group" SubType="Generic">
+					<SELECTCASE Id="RDK:24271429" DesignTimeRemark="Omniflo in anderer Funktion behandeln">
+						<EXP><![CDATA[$=$ShapeItem.family]]></EXP>
+						<CASEGROUP Id="RDK:24271414" CaseType="0">
+							<EXP><![CDATA[$C$OFGerade]]></EXP>
+							<EXIT_PROCESS Id="RDK:24271433" BreakType="2" ExitStatus="0" />
+						</CASEGROUP>
+						<CASEGROUP Id="RDK:24271425" CaseType="0">
+							<EXP><![CDATA[$C$OFBogen]]></EXP>
+							<EXIT_PROCESS Id="RDK:24271435" BreakType="2" ExitStatus="0" />
+						</CASEGROUP>
+						<CASEGROUP Id="RDK:24271431" CaseType="0">
+							<EXP><![CDATA[$C$OFWeiche]]></EXP>
+							<EXIT_PROCESS Id="RDK:24271437" BreakType="2" ExitStatus="0" />
+						</CASEGROUP>
+					</SELECTCASE>
+					<GROUP Id="RDK:24270760" Name="Group" SubType="Generic">
 						<VALUECONDITION Value="true">
 							<EXP><![CDATA[$=$ShapeItem.family<>""]]></EXP>
 						</VALUECONDITION>
-						<GROUP Id="RDK:22305402" Name="TeileId" SubType="Generic">
-							<SET Id="RDK:22305401" VarRef="CSV_Item.TeileId">
+						<GROUP Id="RDK:24270607" Name="TeileId" SubType="Generic">
+							<SET Id="RDK:24270606" VarRef="CSV_Item.TeileId">
 								<EXP><![CDATA[$=$ToJSON(ShapeItem.id)]]></EXP>
 								<PAR Name="AdvancedOptions" />
 							</SET>
 						</GROUP>
-						<GROUP Id="RDK:22305404" Name="NachbarIds" SubType="Generic">
-							<SET Id="RDK:22305403" VarRef="CSV_Item.NachbarIds">
+						<GROUP Id="RDK:24270609" Name="NachbarIds" SubType="Generic">
+							<SET Id="RDK:24270608" VarRef="CSV_Item.NachbarIds">
 								<EXP><![CDATA[$=$ToJSON(StrListToStr(ExecOnValues(ShapeItem.links,"StrAfter("+"me"+","+""";"""+")", ""), ","))]]></EXP>
 								<PAR Name="AdvancedOptions" />
 							</SET>
 						</GROUP>
-						<SELECTCASE Id="RDK:22305521">
+						<SELECTCASE Id="RDK:24270759">
 							<EXP><![CDATA[$=$ShapeItem.family]]></EXP>
-							<CASEGROUP Id="RDK:22305420" CaseType="0">
+							<CASEGROUP Id="RDK:24270625" CaseType="0">
 								<EXP><![CDATA[$C$Kreisel]]></EXP>
-								<GROUP Id="RDK:22305411" Name="TeileArt" SubType="Generic">
-									<SELECTCASE Id="RDK:22305410">
+								<GROUP Id="RDK:24270616" Name="TeileArt" SubType="Generic">
+									<SELECTCASE Id="RDK:24270615">
 										<EXP><![CDATA[$=$ShapeItem.KreiselDefinition.Typ]]></EXP>
-										<CASEGROUP Id="RDK:22305406" CaseType="0">
+										<CASEGROUP Id="RDK:24270611" CaseType="0">
 											<EXP><![CDATA[$C$Standard]]></EXP>
-											<SET Id="RDK:22305405" VarRef="CSV_Item.TeileArt">
+											<SET Id="RDK:24270610" VarRef="CSV_Item.TeileArt">
 												<EXP><![CDATA[$=$ToJSON("ILS 2.0 Kreisel")]]></EXP>
 												<PAR Name="AdvancedOptions" />
 											</SET>
 										</CASEGROUP>
-										<CASEGROUP Id="RDK:22305408" CaseType="0">
+										<CASEGROUP Id="RDK:24270613" CaseType="0">
 											<EXP><![CDATA[$C$Pin]]></EXP>
-											<SET Id="RDK:22305407" VarRef="CSV_Item.TeileArt">
+											<SET Id="RDK:24270612" VarRef="CSV_Item.TeileArt">
 												<EXP><![CDATA[$=$ToJSON("ILS 2.0 Kreisel mit Pin")]]></EXP>
 												<PAR Name="AdvancedOptions" />
 											</SET>
 										</CASEGROUP>
-										<CASEGROUP Id="RDK:22305409" CaseType="1">
+										<CASEGROUP Id="RDK:24270614" CaseType="1">
 											<EXP />
 										</CASEGROUP>
 									</SELECTCASE>
 								</GROUP>
-								<GROUP Id="RDK:22305413" Name="Bezeichnung" SubType="Generic">
-									<SET Id="RDK:22305412" VarRef="CSV_Item.Bezeichnung">
+								<GROUP Id="RDK:24270618" Name="Bezeichnung" SubType="Generic">
+									<SET Id="RDK:24270617" VarRef="CSV_Item.Bezeichnung">
 										<EXP><![CDATA[$=$ToJSON(ShapeItem.KreiselDefinition.Beschreibung)]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
-								<GROUP Id="RDK:22305415" Name="Planquadrat" SubType="Generic">
-									<CALLFUNCTION Id="RDK:22305414">
+								<GROUP Id="RDK:24270620" Name="Planquadrat" SubType="Generic">
+									<CALLFUNCTION Id="RDK:24270619">
 										<PAR Name="FuncName">
 											<EXP><![CDATA[$C$GetPlanquadratPosition]]></EXP>
 										</PAR>
@@ -33391,8 +33524,8 @@ me.x
 										<PAR Name="Options" />
 									</CALLFUNCTION>
 								</GROUP>
-								<GROUP Id="RDK:22305418" Name="Merkmale" SubType="Generic">
-									<SET_STRUCT Id="RDK:22305416" VarRef="KreiselMerkmale" ClearAll="True">
+								<GROUP Id="RDK:24270623" Name="Merkmale" SubType="Generic">
+									<SET_STRUCT Id="RDK:24270621" VarRef="KreiselMerkmale" ClearAll="True">
 										<PAR Name="Abstand (Kreiselachse A - Kreiselachse) in Meter">
 											<EXP><![CDATA[$=$StrReplace(ShapeItem.KreiselDefinition.AbstandMS/1000, ",", ".")]]></EXP>
 										</PAR>
@@ -33409,34 +33542,34 @@ me.x
 											<EXP><![CDATA[$=$StrReplace(ShapeItem.KreiselDefinition.Hoehe/1000, ",", ".")]]></EXP>
 										</PAR>
 									</SET_STRUCT>
-									<SET Id="RDK:22305417" VarRef="CSV_Item.Merkmale">
+									<SET Id="RDK:24270622" VarRef="CSV_Item.Merkmale">
 										<EXP><![CDATA[$=$ToJSON(KreiselMerkmale)]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
-								<LIST_ADD Id="RDK:22305419" ListRef="CSV_List">
+								<LIST_ADD Id="RDK:24270624" ListRef="CSV_List">
 									<PAR Name="VALUE_TO_ADD">
 										<EXP><![CDATA[$=$CSV_Item]]></EXP>
 									</PAR>
 									<PAR Name="POS_TO_ADD" />
 								</LIST_ADD>
 							</CASEGROUP>
-							<CASEGROUP Id="RDK:22305431" CaseType="0">
+							<CASEGROUP Id="RDK:24270636" CaseType="0">
 								<EXP><![CDATA[$C$Gefaellestrecke]]></EXP>
-								<GROUP Id="RDK:22305422" Name="TeileArt" SubType="Generic">
-									<SET Id="RDK:22305421" VarRef="CSV_Item.TeileArt">
+								<GROUP Id="RDK:24270627" Name="TeileArt" SubType="Generic">
+									<SET Id="RDK:24270626" VarRef="CSV_Item.TeileArt">
 										<EXP><![CDATA[$=$ToJSON("ILS 2.0 Gefällestrecke")]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
-								<GROUP Id="RDK:22305424" Name="Bezeichnung" SubType="Generic">
-									<SET Id="RDK:22305423" VarRef="CSV_Item.Bezeichnung">
+								<GROUP Id="RDK:24270629" Name="Bezeichnung" SubType="Generic">
+									<SET Id="RDK:24270628" VarRef="CSV_Item.Bezeichnung">
 										<EXP><![CDATA[$=$ToJSON(ShapeItem.GefaelleDefinition.Beschreibung)]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
-								<GROUP Id="RDK:22305426" Name="Planquadrat" SubType="Generic">
-									<CALLFUNCTION Id="RDK:22305425">
+								<GROUP Id="RDK:24270631" Name="Planquadrat" SubType="Generic">
+									<CALLFUNCTION Id="RDK:24270630">
 										<PAR Name="FuncName">
 											<EXP><![CDATA[$C$GetPlanquadratPosition]]></EXP>
 										</PAR>
@@ -33447,8 +33580,8 @@ me.x
 										<PAR Name="Options" />
 									</CALLFUNCTION>
 								</GROUP>
-								<GROUP Id="RDK:22305429" Name="Merkmale" SubType="Generic">
-									<SET_STRUCT Id="RDK:22305427" VarRef="GefaellestreckeMerkmale" ClearAll="True">
+								<GROUP Id="RDK:24270634" Name="Merkmale" SubType="Generic">
+									<SET_STRUCT Id="RDK:24270632" VarRef="GefaellestreckeMerkmale" ClearAll="True">
 										<PAR Name="Anzahl der Separatoren">
 											<EXP><![CDATA[$=$ShapeItem.GefaelleDefinition.n_Sep]]></EXP>
 										</PAR>
@@ -33468,34 +33601,34 @@ me.x
 											<EXP><![CDATA[$=$StrReplace(ShapeItem.GefaelleDefinition.HoeheUnten/1000, ",", ".")]]></EXP>
 										</PAR>
 									</SET_STRUCT>
-									<SET Id="RDK:22305428" VarRef="CSV_Item.Merkmale">
+									<SET Id="RDK:24270633" VarRef="CSV_Item.Merkmale">
 										<EXP><![CDATA[$=$ToJSON(GefaellestreckeMerkmale)]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
-								<LIST_ADD Id="RDK:22305430" ListRef="CSV_List">
+								<LIST_ADD Id="RDK:24270635" ListRef="CSV_List">
 									<PAR Name="VALUE_TO_ADD">
 										<EXP><![CDATA[$=$CSV_Item]]></EXP>
 									</PAR>
 									<PAR Name="POS_TO_ADD" />
 								</LIST_ADD>
 							</CASEGROUP>
-							<CASEGROUP Id="RDK:22305442" CaseType="0">
+							<CASEGROUP Id="RDK:24270647" CaseType="0">
 								<EXP><![CDATA[$C$Foerderer]]></EXP>
-								<GROUP Id="RDK:22305433" Name="TeileArt" SubType="Generic">
-									<SET Id="RDK:22305432" VarRef="CSV_Item.TeileArt">
+								<GROUP Id="RDK:24270638" Name="TeileArt" SubType="Generic">
+									<SET Id="RDK:24270637" VarRef="CSV_Item.TeileArt">
 										<EXP><![CDATA[$=$ToJSON("ILS 2.0 ETF")]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
-								<GROUP Id="RDK:22305435" Name="Bezeichnung" SubType="Generic">
-									<SET Id="RDK:22305434" VarRef="CSV_Item.Bezeichnung">
+								<GROUP Id="RDK:24270640" Name="Bezeichnung" SubType="Generic">
+									<SET Id="RDK:24270639" VarRef="CSV_Item.Bezeichnung">
 										<EXP><![CDATA[$=$ToJSON(ShapeItem.FoerdererDefinition.Beschreibung)]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
-								<GROUP Id="RDK:22305437" Name="Planquadrat" SubType="Generic">
-									<CALLFUNCTION Id="RDK:22305436">
+								<GROUP Id="RDK:24270642" Name="Planquadrat" SubType="Generic">
+									<CALLFUNCTION Id="RDK:24270641">
 										<PAR Name="FuncName">
 											<EXP><![CDATA[$C$GetPlanquadratPosition]]></EXP>
 										</PAR>
@@ -33506,8 +33639,8 @@ me.x
 										<PAR Name="Options" />
 									</CALLFUNCTION>
 								</GROUP>
-								<GROUP Id="RDK:22305440" Name="Merkmale" SubType="Generic">
-									<SET_STRUCT Id="RDK:22305438" VarRef="FoerdererMerkmale" ClearAll="True">
+								<GROUP Id="RDK:24270645" Name="Merkmale" SubType="Generic">
+									<SET_STRUCT Id="RDK:24270643" VarRef="FoerdererMerkmale" ClearAll="True">
 										<PAR Name="Höhe ETF oben in Meter">
 											<EXP><![CDATA[$=$StrReplace((ShapeItem.FoerdererDefinition.H_1 + ShapeItem.FoerdererDefinition.Delta_hf)/1000, ",", ".")]]></EXP>
 										</PAR>
@@ -33533,34 +33666,34 @@ me.x
 											<EXP><![CDATA[$=$StrReplace(ShapeItem.VarioFoerdererDefinition.H_1/1000, ",", ".")]]></EXP>
 										</PAR>
 									</SET_STRUCT>
-									<SET Id="RDK:22305439" VarRef="CSV_Item.Merkmale">
+									<SET Id="RDK:24270644" VarRef="CSV_Item.Merkmale">
 										<EXP><![CDATA[$=$ToJSON(FoerdererMerkmale)]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
-								<LIST_ADD Id="RDK:22305441" ListRef="CSV_List">
+								<LIST_ADD Id="RDK:24270646" ListRef="CSV_List">
 									<PAR Name="VALUE_TO_ADD">
 										<EXP><![CDATA[$=$CSV_Item]]></EXP>
 									</PAR>
 									<PAR Name="POS_TO_ADD" />
 								</LIST_ADD>
 							</CASEGROUP>
-							<CASEGROUP Id="RDK:22305453" CaseType="0">
+							<CASEGROUP Id="RDK:24270658" CaseType="0">
 								<EXP><![CDATA[$C$VarioFoerderer]]></EXP>
-								<GROUP Id="RDK:22305444" Name="TeileArt" SubType="Generic">
-									<SET Id="RDK:22305443" VarRef="CSV_Item.TeileArt">
+								<GROUP Id="RDK:24270649" Name="TeileArt" SubType="Generic">
+									<SET Id="RDK:24270648" VarRef="CSV_Item.TeileArt">
 										<EXP><![CDATA[$=$ToJSON("ILS 2.0 VarioFoerderer")]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
-								<GROUP Id="RDK:22305446" Name="Bezeichnung" SubType="Generic">
-									<SET Id="RDK:22305445" VarRef="CSV_Item.Bezeichnung">
+								<GROUP Id="RDK:24270651" Name="Bezeichnung" SubType="Generic">
+									<SET Id="RDK:24270650" VarRef="CSV_Item.Bezeichnung">
 										<EXP><![CDATA[$=$ToJSON(ShapeItem.VarioFoerdererDefinition.Beschreibung)]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
-								<GROUP Id="RDK:22305448" Name="Planquadrat" SubType="Generic">
-									<CALLFUNCTION Id="RDK:22305447">
+								<GROUP Id="RDK:24270653" Name="Planquadrat" SubType="Generic">
+									<CALLFUNCTION Id="RDK:24270652">
 										<PAR Name="FuncName">
 											<EXP><![CDATA[$C$GetPlanquadratPosition]]></EXP>
 										</PAR>
@@ -33571,8 +33704,8 @@ me.x
 										<PAR Name="Options" />
 									</CALLFUNCTION>
 								</GROUP>
-								<GROUP Id="RDK:22305451" Name="Merkmale" SubType="Generic">
-									<SET_STRUCT Id="RDK:22305449" VarRef="VarioFoerdererMerkmale" ClearAll="True">
+								<GROUP Id="RDK:24270656" Name="Merkmale" SubType="Generic">
+									<SET_STRUCT Id="RDK:24270654" VarRef="VarioFoerdererMerkmale" ClearAll="True">
 										<PAR Name="Förderrichtung">
 											<EXP><![CDATA[$=$ShapeItem.VarioFoerdererDefinition.Typ]]></EXP>
 										</PAR>
@@ -33598,34 +33731,34 @@ me.x
 											<EXP><![CDATA[$=$StrReplace(ShapeItem.VarioFoerdererDefinition.H_Ende/1000, ",", ".")]]></EXP>
 										</PAR>
 									</SET_STRUCT>
-									<SET Id="RDK:22305450" VarRef="CSV_Item.Merkmale">
+									<SET Id="RDK:24270655" VarRef="CSV_Item.Merkmale">
 										<EXP><![CDATA[$=$ToJSON(VarioFoerdererMerkmale)]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
-								<LIST_ADD Id="RDK:22305452" ListRef="CSV_List">
+								<LIST_ADD Id="RDK:24270657" ListRef="CSV_List">
 									<PAR Name="VALUE_TO_ADD">
 										<EXP><![CDATA[$=$CSV_Item]]></EXP>
 									</PAR>
 									<PAR Name="POS_TO_ADD" />
 								</LIST_ADD>
 							</CASEGROUP>
-							<CASEGROUP Id="RDK:22305464" CaseType="0">
+							<CASEGROUP Id="RDK:24270669" CaseType="0">
 								<EXP><![CDATA[$C$Weiche]]></EXP>
-								<GROUP Id="RDK:22305455" Name="TeileArt" SubType="Generic">
-									<SET Id="RDK:22305454" VarRef="CSV_Item.TeileArt">
+								<GROUP Id="RDK:24270660" Name="TeileArt" SubType="Generic">
+									<SET Id="RDK:24270659" VarRef="CSV_Item.TeileArt">
 										<EXP><![CDATA[$=$ToJSON("ILS 2.0 Weiche")]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
-								<GROUP Id="RDK:22305457" Name="Bezeichnung" SubType="Generic" Bookmarked="True">
-									<SET Id="RDK:22305456" VarRef="CSV_Item.Bezeichnung">
+								<GROUP Id="RDK:24270662" Name="Bezeichnung" SubType="Generic" Bookmarked="True">
+									<SET Id="RDK:24270661" VarRef="CSV_Item.Bezeichnung">
 										<EXP><![CDATA[$=$ToJSON(ShapeItem.WeicheDefinition.Beschreibung)]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
-								<GROUP Id="RDK:22305459" Name="Planquadrat" SubType="Generic" Bookmarked="True">
-									<CALLFUNCTION Id="RDK:22305458">
+								<GROUP Id="RDK:24270664" Name="Planquadrat" SubType="Generic" Bookmarked="True">
+									<CALLFUNCTION Id="RDK:24270663">
 										<PAR Name="FuncName">
 											<EXP><![CDATA[$C$GetPlanquadratPosition]]></EXP>
 										</PAR>
@@ -33636,40 +33769,40 @@ me.x
 										<PAR Name="Options" />
 									</CALLFUNCTION>
 								</GROUP>
-								<GROUP Id="RDK:22305462" Name="Merkmale" SubType="Generic" Bookmarked="True">
-									<SET_STRUCT Id="RDK:22305460" VarRef="WeicheMerkmale" ClearAll="True">
+								<GROUP Id="RDK:24270667" Name="Merkmale" SubType="Generic" Bookmarked="True">
+									<SET_STRUCT Id="RDK:24270665" VarRef="WeicheMerkmale" ClearAll="True">
 										<PAR Name="Weichenart">
 											<EXP><![CDATA[$=$ShapeItem.WeicheDefinition.Weichenart]]></EXP>
 										</PAR>
 									</SET_STRUCT>
-									<SET Id="RDK:22305461" VarRef="CSV_Item.Merkmale">
+									<SET Id="RDK:24270666" VarRef="CSV_Item.Merkmale">
 										<EXP><![CDATA[$=$ToJSON(WeicheMerkmale)]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
-								<LIST_ADD Id="RDK:22305463" ListRef="CSV_List">
+								<LIST_ADD Id="RDK:24270668" ListRef="CSV_List">
 									<PAR Name="VALUE_TO_ADD">
 										<EXP><![CDATA[$=$CSV_Item]]></EXP>
 									</PAR>
 									<PAR Name="POS_TO_ADD" />
 								</LIST_ADD>
 							</CASEGROUP>
-							<CASEGROUP Id="RDK:22305475" CaseType="0">
+							<CASEGROUP Id="RDK:24270680" CaseType="0">
 								<EXP><![CDATA[$C$Kurve]]></EXP>
-								<GROUP Id="RDK:22305466" Name="TeileArt" SubType="Generic">
-									<SET Id="RDK:22305465" VarRef="CSV_Item.TeileArt">
+								<GROUP Id="RDK:24270671" Name="TeileArt" SubType="Generic">
+									<SET Id="RDK:24270670" VarRef="CSV_Item.TeileArt">
 										<EXP><![CDATA[$=$ToJSON("ILS 2.0 Kurve")]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
-								<GROUP Id="RDK:22305468" Name="Bezeichnung" SubType="Generic">
-									<SET Id="RDK:22305467" VarRef="CSV_Item.Bezeichnung">
+								<GROUP Id="RDK:24270673" Name="Bezeichnung" SubType="Generic">
+									<SET Id="RDK:24270672" VarRef="CSV_Item.Bezeichnung">
 										<EXP><![CDATA[$=$ToJSON(ShapeItem.KurveDefinition.Beschreibung)]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
-								<GROUP Id="RDK:22305470" Name="Planquadrat" SubType="Generic">
-									<CALLFUNCTION Id="RDK:22305469">
+								<GROUP Id="RDK:24270675" Name="Planquadrat" SubType="Generic">
+									<CALLFUNCTION Id="RDK:24270674">
 										<PAR Name="FuncName">
 											<EXP><![CDATA[$C$GetPlanquadratPosition]]></EXP>
 										</PAR>
@@ -33680,8 +33813,8 @@ me.x
 										<PAR Name="Options" />
 									</CALLFUNCTION>
 								</GROUP>
-								<GROUP Id="RDK:22305473" Name="Merkmale" SubType="Generic">
-									<SET_STRUCT Id="RDK:22305471" VarRef="KurveMerkmale" ClearAll="True">
+								<GROUP Id="RDK:24270678" Name="Merkmale" SubType="Generic">
+									<SET_STRUCT Id="RDK:24270676" VarRef="KurveMerkmale" ClearAll="True">
 										<PAR Name="Länge in Meter">
 											<EXP><![CDATA[$=$ShapeItem.KurveDefinition.L1]]></EXP>
 										</PAR>
@@ -33698,34 +33831,34 @@ me.x
 											<EXP><![CDATA[$=$StrReplace(ShapeItem.KurveDefinition.H_Ende/1000, ",", ".")]]></EXP>
 										</PAR>
 									</SET_STRUCT>
-									<SET Id="RDK:22305472" VarRef="CSV_Item.Merkmale">
+									<SET Id="RDK:24270677" VarRef="CSV_Item.Merkmale">
 										<EXP><![CDATA[$=$ToJSON(KurveMerkmale)]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
-								<LIST_ADD Id="RDK:22305474" ListRef="CSV_List">
+								<LIST_ADD Id="RDK:24270679" ListRef="CSV_List">
 									<PAR Name="VALUE_TO_ADD">
 										<EXP><![CDATA[$=$CSV_Item]]></EXP>
 									</PAR>
 									<PAR Name="POS_TO_ADD" />
 								</LIST_ADD>
 							</CASEGROUP>
-							<CASEGROUP Id="RDK:22305486" CaseType="0">
+							<CASEGROUP Id="RDK:24270691" CaseType="0">
 								<EXP><![CDATA[$C$KurveFoerderer]]></EXP>
-								<GROUP Id="RDK:22305477" Name="TeileArt" SubType="Generic">
-									<SET Id="RDK:22305476" VarRef="CSV_Item.TeileArt">
+								<GROUP Id="RDK:24270682" Name="TeileArt" SubType="Generic">
+									<SET Id="RDK:24270681" VarRef="CSV_Item.TeileArt">
 										<EXP><![CDATA[$=$ToJSON("ILS 2.0 Kurve angetrieben")]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
-								<GROUP Id="RDK:22305479" Name="Bezeichnung" SubType="Generic">
-									<SET Id="RDK:22305478" VarRef="CSV_Item.Bezeichnung">
+								<GROUP Id="RDK:24270684" Name="Bezeichnung" SubType="Generic">
+									<SET Id="RDK:24270683" VarRef="CSV_Item.Bezeichnung">
 										<EXP><![CDATA[$=$ToJSON(ShapeItem.KurveFoerdererDefinition.Beschreibung)]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
-								<GROUP Id="RDK:22305481" Name="Planquadrat" SubType="Generic">
-									<CALLFUNCTION Id="RDK:22305480">
+								<GROUP Id="RDK:24270686" Name="Planquadrat" SubType="Generic">
+									<CALLFUNCTION Id="RDK:24270685">
 										<PAR Name="FuncName">
 											<EXP><![CDATA[$C$GetPlanquadratPosition]]></EXP>
 										</PAR>
@@ -33736,8 +33869,8 @@ me.x
 										<PAR Name="Options" />
 									</CALLFUNCTION>
 								</GROUP>
-								<GROUP Id="RDK:22305484" Name="Merkmale" SubType="Generic">
-									<SET_STRUCT Id="RDK:22305482" VarRef="KurveFoerdererMerkmale" ClearAll="True">
+								<GROUP Id="RDK:24270689" Name="Merkmale" SubType="Generic">
+									<SET_STRUCT Id="RDK:24270687" VarRef="KurveFoerdererMerkmale" ClearAll="True">
 										<PAR Name="Länge in Meter">
 											<EXP><![CDATA[$=$ShapeItem.KurveFoerdererDefinition.L1]]></EXP>
 										</PAR>
@@ -33754,34 +33887,34 @@ me.x
 											<EXP><![CDATA[$=$StrReplace(ShapeItem.KurveFoerdererDefinition.H_Ende/1000, ",", ".")]]></EXP>
 										</PAR>
 									</SET_STRUCT>
-									<SET Id="RDK:22305483" VarRef="CSV_Item.Merkmale">
+									<SET Id="RDK:24270688" VarRef="CSV_Item.Merkmale">
 										<EXP><![CDATA[$=$ToJSON(KurveFoerdererMerkmale)]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
-								<LIST_ADD Id="RDK:22305485" ListRef="CSV_List">
+								<LIST_ADD Id="RDK:24270690" ListRef="CSV_List">
 									<PAR Name="VALUE_TO_ADD">
 										<EXP><![CDATA[$=$CSV_Item]]></EXP>
 									</PAR>
 									<PAR Name="POS_TO_ADD" />
 								</LIST_ADD>
 							</CASEGROUP>
-							<CASEGROUP Id="RDK:22305497" CaseType="0">
+							<CASEGROUP Id="RDK:24270702" CaseType="0">
 								<EXP><![CDATA[$C$BTMTBeladung]]></EXP>
-								<GROUP Id="RDK:22305488" Name="TeileArt" SubType="Generic">
-									<SET Id="RDK:22305487" VarRef="CSV_Item.TeileArt">
+								<GROUP Id="RDK:24270693" Name="TeileArt" SubType="Generic">
+									<SET Id="RDK:24270692" VarRef="CSV_Item.TeileArt">
 										<EXP><![CDATA[$=$ToJSON("BT - Beladung")]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
-								<GROUP Id="RDK:22305490" Name="Bezeichnung" SubType="Generic">
-									<SET Id="RDK:22305489" VarRef="CSV_Item.Bezeichnung">
+								<GROUP Id="RDK:24270695" Name="Bezeichnung" SubType="Generic">
+									<SET Id="RDK:24270694" VarRef="CSV_Item.Bezeichnung">
 										<EXP><![CDATA[$=$ToJSON(ShapeItem.BTMTBeladungDefinition.Beschreibung)]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
-								<GROUP Id="RDK:22305492" Name="Planquadrat" SubType="Generic">
-									<CALLFUNCTION Id="RDK:22305491">
+								<GROUP Id="RDK:24270697" Name="Planquadrat" SubType="Generic">
+									<CALLFUNCTION Id="RDK:24270696">
 										<PAR Name="FuncName">
 											<EXP><![CDATA[$C$GetPlanquadratPosition]]></EXP>
 										</PAR>
@@ -33792,38 +33925,38 @@ me.x
 										<PAR Name="Options" />
 									</CALLFUNCTION>
 								</GROUP>
-								<GROUP Id="RDK:22305495" Name="Merkmale" SubType="Generic">
-									<SET_STRUCT Id="RDK:22305493" VarRef="BTMTBeladungMerkmale" ClearAll="True">
+								<GROUP Id="RDK:24270700" Name="Merkmale" SubType="Generic">
+									<SET_STRUCT Id="RDK:24270698" VarRef="BTMTBeladungMerkmale" ClearAll="True">
 										<PAR Name="Höhe in m" />
 									</SET_STRUCT>
-									<SET Id="RDK:22305494" VarRef="CSV_Item.Merkmale">
+									<SET Id="RDK:24270699" VarRef="CSV_Item.Merkmale">
 										<EXP><![CDATA[$=$ToJSON(BTMTBeladungMerkmale)]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
-								<LIST_ADD Id="RDK:22305496" ListRef="CSV_List">
+								<LIST_ADD Id="RDK:24270701" ListRef="CSV_List">
 									<PAR Name="VALUE_TO_ADD">
 										<EXP><![CDATA[$=$CSV_Item]]></EXP>
 									</PAR>
 									<PAR Name="POS_TO_ADD" />
 								</LIST_ADD>
 							</CASEGROUP>
-							<CASEGROUP Id="RDK:22305508" CaseType="0">
+							<CASEGROUP Id="RDK:24270713" CaseType="0">
 								<EXP><![CDATA[$C$BTMTEntladung]]></EXP>
-								<GROUP Id="RDK:22305499" Name="TeileArt" SubType="Generic">
-									<SET Id="RDK:22305498" VarRef="CSV_Item.TeileArt">
+								<GROUP Id="RDK:24270704" Name="TeileArt" SubType="Generic">
+									<SET Id="RDK:24270703" VarRef="CSV_Item.TeileArt">
 										<EXP><![CDATA[$=$ToJSON("BT - Entladung")]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
-								<GROUP Id="RDK:22305501" Name="Bezeichnung" SubType="Generic">
-									<SET Id="RDK:22305500" VarRef="CSV_Item.Bezeichnung">
+								<GROUP Id="RDK:24270706" Name="Bezeichnung" SubType="Generic">
+									<SET Id="RDK:24270705" VarRef="CSV_Item.Bezeichnung">
 										<EXP><![CDATA[$=$ToJSON(ShapeItem.BTMTEntladungDefinition.Beschreibung)]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
-								<GROUP Id="RDK:22305503" Name="Planquadrat" SubType="Generic">
-									<CALLFUNCTION Id="RDK:22305502">
+								<GROUP Id="RDK:24270708" Name="Planquadrat" SubType="Generic">
+									<CALLFUNCTION Id="RDK:24270707">
 										<PAR Name="FuncName">
 											<EXP><![CDATA[$C$GetPlanquadratPosition]]></EXP>
 										</PAR>
@@ -33834,36 +33967,36 @@ me.x
 										<PAR Name="Options" />
 									</CALLFUNCTION>
 								</GROUP>
-								<GROUP Id="RDK:22305506" Name="Merkmale" SubType="Generic">
-									<SET_STRUCT Id="RDK:22305504" VarRef="BTMTEntladungMerkmale" ClearAll="True" />
-									<SET Id="RDK:22305505" VarRef="CSV_Item.Merkmale">
+								<GROUP Id="RDK:24270711" Name="Merkmale" SubType="Generic">
+									<SET_STRUCT Id="RDK:24270709" VarRef="BTMTEntladungMerkmale" ClearAll="True" />
+									<SET Id="RDK:24270710" VarRef="CSV_Item.Merkmale">
 										<EXP><![CDATA[$=$ToJSON(BTMTEntladungMerkmale)]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
-								<LIST_ADD Id="RDK:22305507" ListRef="CSV_List">
+								<LIST_ADD Id="RDK:24270712" ListRef="CSV_List">
 									<PAR Name="VALUE_TO_ADD">
 										<EXP><![CDATA[$=$CSV_Item]]></EXP>
 									</PAR>
 									<PAR Name="POS_TO_ADD" />
 								</LIST_ADD>
 							</CASEGROUP>
-							<CASEGROUP Id="RDK:22305519" CaseType="0">
+							<CASEGROUP Id="RDK:24270724" CaseType="0">
 								<EXP><![CDATA[$C$Eckrad]]></EXP>
-								<GROUP Id="RDK:22305510" Name="TeileArt" SubType="Generic">
-									<SET Id="RDK:22305509" VarRef="CSV_Item.TeileArt">
+								<GROUP Id="RDK:24270715" Name="TeileArt" SubType="Generic">
+									<SET Id="RDK:24270714" VarRef="CSV_Item.TeileArt">
 										<EXP><![CDATA[$=$ToJSON("ILS 2.0 Eckrad")]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
-								<GROUP Id="RDK:22305512" Name="Bezeichnung" SubType="Generic">
-									<SET Id="RDK:22305511" VarRef="CSV_Item.Bezeichnung">
+								<GROUP Id="RDK:24270717" Name="Bezeichnung" SubType="Generic">
+									<SET Id="RDK:24270716" VarRef="CSV_Item.Bezeichnung">
 										<EXP><![CDATA[$=$ToJSON(ShapeItem.EckradDefinition.Beschreibung)]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
-								<GROUP Id="RDK:22305514" Name="Planquadrat" SubType="Generic">
-									<CALLFUNCTION Id="RDK:22305513">
+								<GROUP Id="RDK:24270719" Name="Planquadrat" SubType="Generic">
+									<CALLFUNCTION Id="RDK:24270718">
 										<PAR Name="FuncName">
 											<EXP><![CDATA[$C$GetPlanquadratPosition]]></EXP>
 										</PAR>
@@ -33874,248 +34007,118 @@ me.x
 										<PAR Name="Options" />
 									</CALLFUNCTION>
 								</GROUP>
-								<GROUP Id="RDK:22305517" Name="Merkmale" SubType="Generic">
-									<SET_STRUCT Id="RDK:22305515" VarRef="EckradMerkmale" ClearAll="True">
+								<GROUP Id="RDK:24270722" Name="Merkmale" SubType="Generic">
+									<SET_STRUCT Id="RDK:24270720" VarRef="EckradMerkmale" ClearAll="True">
 										<PAR Name="Höhe in m">
 											<EXP><![CDATA[$=$StrReplace(ShapeItem.EckradDefinition.Hoehe/1000, ",", ".")]]></EXP>
 										</PAR>
 									</SET_STRUCT>
-									<SET Id="RDK:22305516" VarRef="CSV_Item.Merkmale">
+									<SET Id="RDK:24270721" VarRef="CSV_Item.Merkmale">
 										<EXP><![CDATA[$=$ToJSON(EckradMerkmale)]]></EXP>
 										<PAR Name="AdvancedOptions" />
 									</SET>
 								</GROUP>
-								<LIST_ADD Id="RDK:22305518" ListRef="CSV_List">
+								<LIST_ADD Id="RDK:24270723" ListRef="CSV_List">
 									<PAR Name="VALUE_TO_ADD">
 										<EXP><![CDATA[$=$CSV_Item]]></EXP>
 									</PAR>
 									<PAR Name="POS_TO_ADD" />
 								</LIST_ADD>
 							</CASEGROUP>
-							<CASEGROUP Id="RDK:23017765" CaseType="0">
-								<EXP><![CDATA[$C$OFGerade]]></EXP>
-								<GROUP Id="RDK:23017756" Name="TeileArt" SubType="Generic">
-									<SET Id="RDK:23017755" VarRef="CSV_Item.TeileArt">
-										<EXP><![CDATA[$=$ToJSON("Omniflo Gerade")]]></EXP>
-										<PAR Name="AdvancedOptions" />
-									</SET>
-								</GROUP>
-								<GROUP Id="RDK:23017758" Name="Bezeichnung" SubType="Generic">
-									<SET Id="RDK:23017757" VarRef="CSV_Item.Bezeichnung">
-										<EXP><![CDATA[$=$ToJSON(ShapeItem.OFGeradeDefinition.Beschreibung)]]></EXP>
-										<PAR Name="AdvancedOptions" />
-									</SET>
-								</GROUP>
-								<GROUP Id="RDK:23017760" Name="Planquadrat" SubType="Generic">
-									<CALLFUNCTION Id="RDK:23017759">
-										<PAR Name="FuncName">
-											<EXP><![CDATA[$C$GetPlanquadratPosition]]></EXP>
-										</PAR>
-										<PAR Name="InputExp" />
-										<PAR Name="ResultRef">
-											<EXP><![CDATA[$V$]]></EXP>
-										</PAR>
-										<PAR Name="Options" />
-									</CALLFUNCTION>
-								</GROUP>
-								<GROUP Id="RDK:23017763" Name="Merkmale" SubType="Generic">
-									<SET_STRUCT Id="RDK:23017761" VarRef="OFGeradeMerkmale" ClearAll="True">
-										<PAR Name="Anzahl der Separatoren">
-											<EXP><![CDATA[$=$ShapeItem.OFGeradeDefinition.n_Sep]]></EXP>
-										</PAR>
-										<PAR Name="Länge in Meter">
-											<EXP><![CDATA[$=$StrReplace(ShapeItem.OFGeradeDefinition.L1/1000, ",", ".")]]></EXP>
-										</PAR>
-										<PAR Name="Winkel">
-											<EXP><![CDATA[$=$StrReplace(ShapeItem.OFGeradeDefinition.winkel, ",", ".")]]></EXP>
-										</PAR>
-										<PAR Name="Anzahl der Scanner">
-											<EXP><![CDATA[$=$ShapeItem.OFGeradeDefinition.n_Scan]]></EXP>
-										</PAR>
-										<PAR Name="Höhe oben">
-											<EXP><![CDATA[$=$StrReplace(ShapeItem.OFGeradeDefinition.HoeheOben/1000, ",", ".")]]></EXP>
-										</PAR>
-										<PAR Name="Höhe unten">
-											<EXP><![CDATA[$=$StrReplace(ShapeItem.OFGeradeDefinition.HoeheUnten/1000, ",", ".")]]></EXP>
-										</PAR>
-									</SET_STRUCT>
-									<SET Id="RDK:23017762" VarRef="CSV_Item.Merkmale">
-										<EXP><![CDATA[$=$ToJSON(OFGeradeMerkmale)]]></EXP>
-										<PAR Name="AdvancedOptions" />
-									</SET>
-								</GROUP>
-								<LIST_ADD Id="RDK:23017764" ListRef="CSV_List">
-									<PAR Name="VALUE_TO_ADD">
-										<EXP><![CDATA[$=$CSV_Item]]></EXP>
-									</PAR>
-									<PAR Name="POS_TO_ADD" />
-								</LIST_ADD>
-							</CASEGROUP>
-							<CASEGROUP Id="RDK:23016870" CaseType="0">
-								<EXP><![CDATA[$C$OFBogen]]></EXP>
-								<GROUP Id="RDK:23016861" Name="TeileArt" SubType="Generic">
-									<SET Id="RDK:23016860" VarRef="CSV_Item.TeileArt">
-										<EXP><![CDATA[$=$ToJSON("Omniflo Kurve")]]></EXP>
-										<PAR Name="AdvancedOptions" />
-									</SET>
-								</GROUP>
-								<GROUP Id="RDK:23016863" Name="Bezeichnung" SubType="Generic">
-									<SET Id="RDK:23016862" VarRef="CSV_Item.Bezeichnung">
-										<EXP><![CDATA[$=$ToJSON(ShapeItem.OFBogenDefinition.Beschreibung)]]></EXP>
-										<PAR Name="AdvancedOptions" />
-									</SET>
-								</GROUP>
-								<GROUP Id="RDK:23016865" Name="Planquadrat" SubType="Generic">
-									<CALLFUNCTION Id="RDK:23016864">
-										<PAR Name="FuncName">
-											<EXP><![CDATA[$C$GetPlanquadratPosition]]></EXP>
-										</PAR>
-										<PAR Name="InputExp" />
-										<PAR Name="ResultRef">
-											<EXP><![CDATA[$V$]]></EXP>
-										</PAR>
-										<PAR Name="Options" />
-									</CALLFUNCTION>
-								</GROUP>
-								<GROUP Id="RDK:23016868" Name="Merkmale" SubType="Generic">
-									<SET_STRUCT Id="RDK:23016866" VarRef="OFBogenMerkmale" ClearAll="True">
-										<PAR Name="Länge in Meter">
-											<EXP><![CDATA[$=$ShapeItem.OFBogenDefinition.L1]]></EXP>
-										</PAR>
-										<PAR Name="Kurvenrichtung">
-											<EXP><![CDATA[$=$ShapeItem.OFBogenDefinition.]]></EXP>
-										</PAR>
-										<PAR Name="Kurvenwinkel">
-											<EXP><![CDATA[$=$ShapeItem.OFBogenDefinition.KurvenWinkel]]></EXP>
-										</PAR>
-										<PAR Name="Höhe Anfang">
-											<EXP><![CDATA[$=$StrReplace(ShapeItem.OFBogenDefinition.H_Anfang/1000, ",", ".")]]></EXP>
-										</PAR>
-										<PAR Name="Höhe Ende">
-											<EXP><![CDATA[$=$StrReplace(ShapeItem.OFBogenDefinition.H_Ende/1000, ",", ".")]]></EXP>
-										</PAR>
-										<PAR Name="SivasNummer">
-											<EXP><![CDATA[$C$notyetdone]]></EXP>
-										</PAR>
-									</SET_STRUCT>
-									<SET Id="RDK:23016867" VarRef="CSV_Item.Merkmale">
-										<EXP><![CDATA[$=$ToJSON(OFBogenMerkmale)]]></EXP>
-										<PAR Name="AdvancedOptions" />
-									</SET>
-								</GROUP>
-								<LIST_ADD Id="RDK:23016869" ListRef="CSV_List">
-									<PAR Name="VALUE_TO_ADD">
-										<EXP><![CDATA[$=$CSV_Item]]></EXP>
-									</PAR>
-									<PAR Name="POS_TO_ADD" />
-								</LIST_ADD>
-							</CASEGROUP>
-							<CASEGROUP Id="RDK:23222367" CaseType="0">
-								<EXP><![CDATA[$C$OFWeiche]]></EXP>
-								<GROUP Id="RDK:23222358" Name="TeileArt" SubType="Generic">
-									<SET Id="RDK:23222357" VarRef="CSV_Item.TeileArt">
-										<EXP><![CDATA[$=$ToJSON("Omniflo Weiche")]]></EXP>
-										<PAR Name="AdvancedOptions" />
-									</SET>
-								</GROUP>
-								<GROUP Id="RDK:23222360" Name="Bezeichnung" SubType="Generic">
-									<SET Id="RDK:23222359" VarRef="CSV_Item.Bezeichnung">
-										<EXP><![CDATA[$=$ToJSON(ShapeItem.OFWeicheDefinition.Beschreibung)]]></EXP>
-										<PAR Name="AdvancedOptions" />
-									</SET>
-								</GROUP>
-								<GROUP Id="RDK:23222362" Name="Planquadrat" SubType="Generic">
-									<CALLFUNCTION Id="RDK:23222361">
-										<PAR Name="FuncName">
-											<EXP><![CDATA[$C$GetPlanquadratPosition]]></EXP>
-										</PAR>
-										<PAR Name="InputExp" />
-										<PAR Name="ResultRef">
-											<EXP><![CDATA[$V$]]></EXP>
-										</PAR>
-										<PAR Name="Options" />
-									</CALLFUNCTION>
-								</GROUP>
-								<GROUP Id="RDK:23222365" Name="Merkmale" SubType="Generic">
-									<SET_STRUCT Id="RDK:23222363" VarRef="OFWeicheMerkmale" ClearAll="True">
-										<PAR Name="Länge in Meter links" />
-										<PAR Name="Länge in Meter rechts" />
-										<PAR Name="Länge in Meter gerade" />
-										<PAR Name="Weichentyp" />
-										<PAR Name="Richtung" />
-										<PAR Name="Weichenwinkel" />
-										<PAR Name="Höhe" />
-										<PAR Name="Antrieb Kurve" />
-										<PAR Name="SivasNummer">
-											<EXP><![CDATA[$C$notyetdone]]></EXP>
-										</PAR>
-									</SET_STRUCT>
-									<SET Id="RDK:23222364" VarRef="CSV_Item.Merkmale">
-										<EXP><![CDATA[$=$ToJSON(OFWeicheMerkmale)]]></EXP>
-										<PAR Name="AdvancedOptions" />
-									</SET>
-								</GROUP>
-								<LIST_ADD Id="RDK:23222366" ListRef="CSV_List">
-									<PAR Name="VALUE_TO_ADD">
-										<EXP><![CDATA[$=$CSV_Item]]></EXP>
-									</PAR>
-									<PAR Name="POS_TO_ADD" />
-								</LIST_ADD>
-							</CASEGROUP>
-							<CASEGROUP Id="RDK:22305520" CaseType="1">
+							<CASEGROUP Id="RDK:24270758" CaseType="1">
 								<EXP />
+								<ACTION_CALL Id="RDK:24270801" Name="RDEngineering_MsgBox" DesignTimeRemark="{Text}">
+									<PAR Name="RDLibraryName">
+										<EXP><![CDATA[$C$RDEngineering_UI]]></EXP>
+									</PAR>
+									<PAR Name="MsgText">
+										<EXP><![CDATA[$C$Element hier noch nicht implementiert]]></EXP>
+									</PAR>
+									<PAR Name="MsgStyle">
+										<EXP><![CDATA[$C$-1]]></EXP>
+									</PAR>
+									<PAR Name="BtnLayout">
+										<EXP><![CDATA[$C$-1]]></EXP>
+									</PAR>
+									<PAR Name="MsgCaption" />
+									<PAR Name="BaloonType" />
+									<PAR Name="BtnPressed">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+								</ACTION_CALL>
+								<EXIT_PROCESS Id="RDK:24270803" BreakType="4" ExitStatus="0" />
 							</CASEGROUP>
 						</SELECTCASE>
 					</GROUP>
 				</FOREACHLOOP>
-				<IFTHENELSE Id="RDK:22305662" DesignTimeRemark="Elemente in Gruppen nicht doppelt raus schreiben">
+				<SET Id="RDK:24270782" VarRef="Param.Result">
+					<EXP><![CDATA[$=$CSV_List]]></EXP>
+					<PAR Name="AdvancedOptions" />
+				</SET>
+			</FUNCTION>
+			<FUNCTION Id="RDK:24271153" Name="CreateCsvItemsInGroups" Bookmarked="True" DesignTimeRemark="Erzeugt ein CSV Item für jede Gruppe" InputTypeName="boolean" ResultTypeName="CSVType[]">
+				<GROUP Id="RDK:24271002" Name="Local Variables" SubType="VarSet" IncludeDate="0">
+					<GROUP Id="RDK:24270997" Name="CSV Export" SubType="VarSet" IncludeDate="0">
+						<VAR Id="RDK:24270995" Name="CSVFileName" Type="string" />
+						<VAR Id="RDK:24270996" Name="CSVFile" Type="string" />
+					</GROUP>
+					<VAR Id="RDK:24270998" Name="inGroup" Type="boolean" />
+					<VAR Id="RDK:24271000" Name="withGroups" Type="boolean">
+						<SET Id="RDK:24270999" VarRef="Me">
+							<EXP><![CDATA[$=$Param.Input]]></EXP>
+							<PAR Name="AdvancedOptions" />
+						</SET>
+					</VAR>
+					<VAR Id="RDK:24271001" Name="CSV_List" Type="CSVType[]" />
+				</GROUP>
+				<IFTHENELSE Id="RDK:24271151" DesignTimeRemark="Elemente in Gruppen nicht doppelt raus schreiben">
 					<VALUECONDITION Value="true">
 						<EXP><![CDATA[$=$withGroups]]></EXP>
 					</VALUECONDITION>
-					<GROUP Id="RDK:22305661" SubType="Then">
-						<GROUP Id="RDK:22305526" Name="Local Variables" SubType="VarSet" IncludeDate="0">
-							<VAR Id="RDK:22305524" Name="id" Type="string" />
-							<VAR Id="RDK:22305525" Name="group" Type="string" />
+					<GROUP Id="RDK:24271150" SubType="Then">
+						<GROUP Id="RDK:24271134" Name="Local Variables" SubType="VarSet" IncludeDate="0">
+							<VAR Id="RDK:24271132" Name="id" Type="string" />
+							<VAR Id="RDK:24271133" Name="group" Type="string" />
 						</GROUP>
-						<FOREACHLOOP Id="RDK:22305540" ItemVarRef="group" IndexVarRef="i">
+						<FOREACHLOOP Id="RDK:24271148" ItemVarRef="group" IndexVarRef="i">
 							<PAR Name="ArrayValueExp">
 								<EXP><![CDATA[$=$groupStrings]]></EXP>
 							</PAR>
 							<PAR Name="ExitCondExp">
 								<EXP><![CDATA[$V$]]></EXP>
 							</PAR>
-							<GROUP Id="RDK:22305528" Name="TeileId" SubType="Generic">
-								<SET Id="RDK:22305527" VarRef="CSV_Item.TeileId">
+							<GROUP Id="RDK:24271136" Name="TeileId" SubType="Generic">
+								<SET Id="RDK:24271135" VarRef="CSV_Item.TeileId">
 									<EXP><![CDATA[$=$StrReplace(group, ";", ",")]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 							</GROUP>
-							<GROUP Id="RDK:22305530" Name="NachbarIds" SubType="Generic">
-								<SET Id="RDK:22305529" VarRef="CSV_Item.NachbarIds">
+							<GROUP Id="RDK:24271138" Name="NachbarIds" SubType="Generic">
+								<SET Id="RDK:24271137" VarRef="CSV_Item.NachbarIds">
 									<EXP><![CDATA[$=$"-"]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 							</GROUP>
-							<GROUP Id="RDK:22305532" Name="TeileArt" SubType="Generic">
-								<SET Id="RDK:22305531" VarRef="CSV_Item.TeileArt">
+							<GROUP Id="RDK:24271140" Name="TeileArt" SubType="Generic">
+								<SET Id="RDK:24271139" VarRef="CSV_Item.TeileArt">
 									<EXP><![CDATA[$=$"ILS 2.0 Strecke"]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 							</GROUP>
-							<GROUP Id="RDK:22305534" Name="Bezeichnung" SubType="Generic">
-								<SET Id="RDK:22305533" VarRef="CSV_Item.Bezeichnung">
+							<GROUP Id="RDK:24271142" Name="Bezeichnung" SubType="Generic">
+								<SET Id="RDK:24271141" VarRef="CSV_Item.Bezeichnung">
 									<EXP><![CDATA[$=$ToJSON("Gruppe :"+i)]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 							</GROUP>
-							<GROUP Id="RDK:22305536" Name="Planquadrat" SubType="Generic">
-								<SET Id="RDK:22305535" VarRef="CSV_Item.Planquadrat">
+							<GROUP Id="RDK:24271144" Name="Planquadrat" SubType="Generic">
+								<SET Id="RDK:24271143" VarRef="CSV_Item.Planquadrat">
 									<EXP><![CDATA[$=$ToJSON("X:0 Y:0")]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 							</GROUP>
-							<GROUP Id="RDK:22305538" Name="Merkmale" SubType="Generic">
-								<CALLFUNCTION Id="RDK:22305537">
+							<GROUP Id="RDK:24271146" Name="Merkmale" SubType="Generic">
+								<CALLFUNCTION Id="RDK:24271145">
 									<PAR Name="FuncName">
 										<EXP><![CDATA[$C$SetGroupAttributes]]></EXP>
 									</PAR>
@@ -34127,22 +34130,249 @@ me.x
 									</PAR>
 									<PAR Name="Options" />
 								</CALLFUNCTION>
+								<IFTHENELSE Id="RDK:24271746" DesignTimeRemark="Falls z.B. Omniflo Elemente in der Gruppe sind, wird keine Gruppe erzeugt. ">
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$IsEmpty(CSV_Item.Merkmale)]]></EXP>
+									</VALUECONDITION>
+									<GROUP Id="RDK:24271747" SubType="Then">
+										<EXIT_PROCESS Id="RDK:24271755" BreakType="2" ExitStatus="0" />
+									</GROUP>
+								</IFTHENELSE>
 							</GROUP>
-							<LIST_ADD Id="RDK:22305539" ListRef="CSV_List">
+							<LIST_ADD Id="RDK:24271147" ListRef="CSV_List">
 								<PAR Name="VALUE_TO_ADD">
 									<EXP><![CDATA[$=$CSV_Item]]></EXP>
 								</PAR>
 								<PAR Name="POS_TO_ADD" />
 							</LIST_ADD>
 						</FOREACHLOOP>
-						<EXEC_ON_VALUES Id="RDK:22305541" VarRef="CSV_List">
-							<PAR Name="Elementnummer">
-								<EXP><![CDATA[$=$Me_idx+1]]></EXP>
-							</PAR>
-						</EXEC_ON_VALUES>
 					</GROUP>
 				</IFTHENELSE>
-				<SET Id="RDK:22305564" VarRef="Param.Result">
+				<SET Id="RDK:24271152" VarRef="Param.Result">
+					<EXP><![CDATA[$=$CSV_List]]></EXP>
+					<PAR Name="AdvancedOptions" />
+				</SET>
+			</FUNCTION>
+			<FUNCTION Id="RDK:24270369" Name="CreateCsvItemsOmniflo" Bookmarked="True" DesignTimeRemark="Erzeugt CSV Items aus allen Omniflo Elementen" ResultTypeName="CSVType[]">
+				<GROUP Id="RDK:24270150" Name="Local Variables" SubType="VarSet" IncludeDate="0">
+					<GROUP Id="RDK:24270145" Name="CSV Export" SubType="VarSet" IncludeDate="0">
+						<VAR Id="RDK:24270137" Name="OFGeradeMerkmale" Type="OFGeradeMerkmaleType" />
+						<VAR Id="RDK:24270138" Name="OFBogenMerkmale" Type="OFBogenMerkmaleType" />
+						<VAR Id="RDK:24270139" Name="OFWeicheMerkmale" Type="OFWeicheMerkmaleType" />
+					</GROUP>
+					<VAR Id="RDK:24270149" Name="CSV_List" Type="CSVType[]" />
+					<VAR Id="RDK:24271549" Name="bezeichnungen" Type="string[]" />
+					<VAR Id="RDK:24271551" Name="name" Type="string" />
+					<VAR Id="RDK:24271587" Name="toCheck" Type="string" />
+					<VAR Id="RDK:24271589" Name="isWritten" Type="boolean" />
+				</GROUP>
+				<FOREACHLOOP Id="RDK:24270347" DesignTimeRemark="Alle gleichartigen Elemente in jeweils ein CSV Element wandeln" ItemVarRef="ShapeItem">
+					<PAR Name="ArrayValueExp">
+						<EXP><![CDATA[$=$ShapeList]]></EXP>
+					</PAR>
+					<PAR Name="ExitCondExp">
+						<EXP><![CDATA[$V$]]></EXP>
+					</PAR>
+					<IFTHENELSE Id="RDK:24271640">
+						<VALUECONDITION Value="false">
+							<EXP><![CDATA[$=$ShapeItem.family = "OFGerade"]]></EXP>
+						</VALUECONDITION>
+						<VALUECONDITION Value="false">
+							<EXP><![CDATA[$=$ShapeItem.family = "OFBogen"]]></EXP>
+						</VALUECONDITION>
+						<VALUECONDITION Value="false">
+							<EXP><![CDATA[$=$ShapeItem.family = "OFWeiche"]]></EXP>
+						</VALUECONDITION>
+						<GROUP Id="RDK:24271639" SubType="Then">
+							<EXIT_PROCESS Id="RDK:24271661" BreakType="2" ExitStatus="0" />
+						</GROUP>
+					</IFTHENELSE>
+					<SET Id="RDK:24271804" VarRef="CSV_Item.TeileId">
+						<EXP><![CDATA[$=$ShapeItem.id]]></EXP>
+						<PAR Name="AdvancedOptions" />
+					</SET>
+					<SELECTCASE Id="RDK:24270187" DesignTimeRemark="Hier alle Omniflo Elemente behandeln. Hier braucht man nur eine Stückliste">
+						<EXP><![CDATA[$=$ShapeItem.family]]></EXP>
+						<CASEGROUP Id="RDK:24270162" CaseType="0">
+							<EXP><![CDATA[$C$OFGerade]]></EXP>
+							<GROUP Id="RDK:24270152" Name="TeileArt" SubType="Generic">
+								<SET Id="RDK:24270151" VarRef="CSV_Item.TeileArt">
+									<EXP><![CDATA[$=$ToJSON("Omniflo Gerade")]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</GROUP>
+							<GROUP Id="RDK:24270154" Name="Bezeichnung" SubType="Generic">
+								<SET Id="RDK:24270153" VarRef="CSV_Item.Bezeichnung">
+									<EXP><![CDATA[$=$ToJSON(ShapeItem.OFGeradeDefinition.Beschreibung)]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</GROUP>
+							<GROUP Id="RDK:24270156" Name="Planquadrat" SubType="Generic">
+								<CALLFUNCTION Id="RDK:24270155">
+									<PAR Name="FuncName">
+										<EXP><![CDATA[$C$GetPlanquadratPosition]]></EXP>
+									</PAR>
+									<PAR Name="InputExp" />
+									<PAR Name="ResultRef">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+									<PAR Name="Options" />
+								</CALLFUNCTION>
+							</GROUP>
+							<GROUP Id="RDK:24270159" Name="Merkmale" SubType="Generic">
+								<SET_STRUCT Id="RDK:24270157" VarRef="OFGeradeMerkmale" ClearAll="True">
+									<PAR Name="Anzahl der Separatoren">
+										<EXP><![CDATA[$=$ShapeItem.OFGeradeDefinition.n_Sep]]></EXP>
+									</PAR>
+									<PAR Name="Länge in Meter">
+										<EXP><![CDATA[$=$StrReplace(ShapeItem.OFGeradeDefinition.L1/1000, ",", ".")]]></EXP>
+									</PAR>
+									<PAR Name="Winkel">
+										<EXP><![CDATA[$=$StrReplace(ShapeItem.OFGeradeDefinition.winkel, ",", ".")]]></EXP>
+									</PAR>
+									<PAR Name="Anzahl der Scanner">
+										<EXP><![CDATA[$=$ShapeItem.OFGeradeDefinition.n_Scan]]></EXP>
+									</PAR>
+									<PAR Name="Höhe oben">
+										<EXP><![CDATA[$=$StrReplace(ShapeItem.OFGeradeDefinition.HoeheOben/1000, ",", ".")]]></EXP>
+									</PAR>
+									<PAR Name="Höhe unten">
+										<EXP><![CDATA[$=$StrReplace(ShapeItem.OFGeradeDefinition.HoeheUnten/1000, ",", ".")]]></EXP>
+									</PAR>
+								</SET_STRUCT>
+								<SET Id="RDK:24270158" VarRef="CSV_Item.Merkmale">
+									<EXP><![CDATA[$=$ToJSON(OFGeradeMerkmale)]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</GROUP>
+							<LIST_ADD Id="RDK:24270160" ListRef="CSV_List">
+								<PAR Name="VALUE_TO_ADD">
+									<EXP><![CDATA[$=$CSV_Item]]></EXP>
+								</PAR>
+								<PAR Name="POS_TO_ADD" />
+							</LIST_ADD>
+						</CASEGROUP>
+						<CASEGROUP Id="RDK:24270174" CaseType="0">
+							<EXP><![CDATA[$C$OFBogen]]></EXP>
+							<GROUP Id="RDK:24270164" Name="TeileArt" SubType="Generic">
+								<SET Id="RDK:24270163" VarRef="CSV_Item.TeileArt">
+									<EXP><![CDATA[$=$ToJSON("Omniflo Kurve")]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</GROUP>
+							<GROUP Id="RDK:24270166" Name="Bezeichnung" SubType="Generic">
+								<SET Id="RDK:24271688" VarRef="CSV_Item.Bezeichnung">
+									<EXP><![CDATA[$=$ShapeItem.OFBogenDefinition.Beschreibung]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</GROUP>
+							<GROUP Id="RDK:24270168" Name="Planquadrat" SubType="Generic">
+								<CALLFUNCTION Id="RDK:24270167">
+									<PAR Name="FuncName">
+										<EXP><![CDATA[$C$GetPlanquadratPosition]]></EXP>
+									</PAR>
+									<PAR Name="InputExp" />
+									<PAR Name="ResultRef">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+									<PAR Name="Options" />
+								</CALLFUNCTION>
+							</GROUP>
+							<GROUP Id="RDK:24270171" Name="Merkmale" SubType="Generic">
+								<SET_STRUCT Id="RDK:24270169" VarRef="OFBogenMerkmale" ClearAll="True">
+									<PAR Name="Länge in Meter">
+										<EXP><![CDATA[$=$ShapeItem.OFBogenDefinition.L1]]></EXP>
+									</PAR>
+									<PAR Name="Kurvenwinkel">
+										<EXP><![CDATA[$=$ShapeItem.OFBogenDefinition.KurvenWinkel]]></EXP>
+									</PAR>
+									<PAR Name="Radius">
+										<EXP><![CDATA[$=$ShapeItem.OFBogenDefinition.Radius]]></EXP>
+									</PAR>
+									<PAR Name="Höhe">
+										<EXP><![CDATA[$=$ShapeItem.OFBogenDefinition.Hoehe]]></EXP>
+									</PAR>
+									<PAR Name="SivasNummer">
+										<EXP><![CDATA[$=$ShapeItem.OFBogenDefinition.Sivasnr]]></EXP>
+									</PAR>
+								</SET_STRUCT>
+								<SET Id="RDK:24270170" VarRef="CSV_Item.Merkmale">
+									<EXP><![CDATA[$=$ToJSON(OFBogenMerkmale)]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</GROUP>
+							<LIST_ADD Id="RDK:24270172" ListRef="CSV_List">
+								<PAR Name="VALUE_TO_ADD">
+									<EXP><![CDATA[$=$CSV_Item]]></EXP>
+								</PAR>
+								<PAR Name="POS_TO_ADD" />
+							</LIST_ADD>
+						</CASEGROUP>
+						<CASEGROUP Id="RDK:24270186" CaseType="0">
+							<EXP><![CDATA[$C$OFWeiche]]></EXP>
+							<GROUP Id="RDK:24270176" Name="TeileArt" SubType="Generic">
+								<SET Id="RDK:24270175" VarRef="CSV_Item.TeileArt">
+									<EXP><![CDATA[$=$ToJSON("Omniflo Weiche")]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</GROUP>
+							<GROUP Id="RDK:24270178" Name="Bezeichnung" SubType="Generic">
+								<SET Id="RDK:24270177" VarRef="CSV_Item.Bezeichnung">
+									<EXP><![CDATA[$=$ToJSON(ShapeItem.OFWeicheDefinition.Beschreibung)]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</GROUP>
+							<GROUP Id="RDK:24270180" Name="Planquadrat" SubType="Generic">
+								<CALLFUNCTION Id="RDK:24270179">
+									<PAR Name="FuncName">
+										<EXP><![CDATA[$C$GetPlanquadratPosition]]></EXP>
+									</PAR>
+									<PAR Name="InputExp" />
+									<PAR Name="ResultRef">
+										<EXP><![CDATA[$V$]]></EXP>
+									</PAR>
+									<PAR Name="Options" />
+								</CALLFUNCTION>
+							</GROUP>
+							<GROUP Id="RDK:24270183" Name="Merkmale" SubType="Generic">
+								<SET_STRUCT Id="RDK:24270181" VarRef="OFWeicheMerkmale" ClearAll="True">
+									<PAR Name="Länge in Meter links" />
+									<PAR Name="Länge in Meter rechts" />
+									<PAR Name="Länge in Meter gerade" />
+									<PAR Name="Weichentyp">
+										<EXP><![CDATA[$=$ShapeItem.OFWeicheDefinition.WeichenTyp]]></EXP>
+									</PAR>
+									<PAR Name="Richtung">
+										<EXP><![CDATA[$=$ShapeItem.OFWeicheDefinition.AntriebKurve]]></EXP>
+									</PAR>
+									<PAR Name="Weichenwinkel">
+										<EXP><![CDATA[$=$ShapeItem.OFWeicheDefinition.KurvenWinkel]]></EXP>
+									</PAR>
+									<PAR Name="Höhe">
+										<EXP><![CDATA[$=$ShapeItem.OFWeicheDefinition.Hoehe]]></EXP>
+									</PAR>
+									<PAR Name="Antrieb Kurve">
+										<EXP><![CDATA[$=$ShapeItem.OFWeicheDefinition.AntriebKurve]]></EXP>
+									</PAR>
+									<PAR Name="SivasNummer">
+										<EXP><![CDATA[$=$ShapeItem.OFWeicheDefinition.Sivasnr]]></EXP>
+									</PAR>
+								</SET_STRUCT>
+								<SET Id="RDK:24270182" VarRef="CSV_Item.Merkmale">
+									<EXP><![CDATA[$=$ToJSON(OFWeicheMerkmale)]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+							</GROUP>
+							<LIST_ADD Id="RDK:24270184" ListRef="CSV_List">
+								<PAR Name="VALUE_TO_ADD">
+									<EXP><![CDATA[$=$CSV_Item]]></EXP>
+								</PAR>
+								<PAR Name="POS_TO_ADD" />
+							</LIST_ADD>
+						</CASEGROUP>
+					</SELECTCASE>
+				</FOREACHLOOP>
+				<SET Id="RDK:24270368" VarRef="Param.Result">
 					<EXP><![CDATA[$=$CSV_List]]></EXP>
 					<PAR Name="AdvancedOptions" />
 				</SET>
@@ -34778,6 +35008,10 @@ ShapeList["id="+Param.Input[1].shapeID].name
 									<EXP><![CDATA[$C$Eckrad.asm]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
+								<SET Id="RDK:24256911" VarRef="SE_Item.SESubdir">
+									<EXP><![CDATA[$C$ILS]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
 							</CASEGROUP>
 							<CASEGROUP Id="RDK:24026414" CaseType="0">
 								<EXP><![CDATA[$C$OFGerade]]></EXP>
@@ -34793,6 +35027,23 @@ ShapeList["id="+Param.Input[1].shapeID].name
 									<EXP><![CDATA[$=$ShapeItem.y]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
+								<IFTHENELSE Id="RDK:24236513">
+									<VALUECONDITION Value="true">
+										<EXP><![CDATA[$=$ShapeItem.OFGeradeDefinition.HoeheOben>  ShapeItem.GefaelleDefinition.HoeheUnten]]></EXP>
+									</VALUECONDITION>
+									<GROUP Id="RDK:24236510" SubType="Then">
+										<SET Id="RDK:24236509" VarRef="winkel">
+											<EXP><![CDATA[$=$ShapeItem.OFGeradeDefinition.winkel ]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+									</GROUP>
+									<GROUP Id="RDK:24236512" SubType="Else">
+										<SET Id="RDK:24236511" VarRef="winkel">
+											<EXP><![CDATA[$=$-1*ShapeItem.OFGeradeDefinition.winkel ]]></EXP>
+											<PAR Name="AdvancedOptions" />
+										</SET>
+									</GROUP>
+								</IFTHENELSE>
 								<SET Id="RDK:24026410" VarRef="SE_Item.Z">
 									<EXP><![CDATA[$=$(ShapeItem.OFGeradeDefinition.HoeheOben + ShapeItem.OFGeradeDefinition.HoeheUnten) /2]]></EXP>
 									<PAR Name="AdvancedOptions" />
@@ -34806,13 +35057,42 @@ ShapeList["id="+Param.Input[1].shapeID].name
 									<PAR Name="AdvancedOptions" />
 								</SET>
 								<SET Id="RDK:24026413" VarRef="SE_Item.SEFilename">
-									<EXP><![CDATA[$=$ShapeItem.OFGeradeDefinition.Sivasnr+".prt"]]></EXP>
+									<EXP><![CDATA[$=$ShapeItem.OFGeradeDefinition.Sivasnr+".asm"]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
 								<SET Id="RDK:24026454" VarRef="SE_Item.SESubdir">
 									<EXP><![CDATA[$C$Omniflo]]></EXP>
 									<PAR Name="AdvancedOptions" />
 								</SET>
+								<COMMENTS Id="RDK:24236489" DesignTimeRemark="try to set Parameter with a struct" />
+								<SET Id="RDK:24236491" VarRef="Par1.key">
+									<EXP><![CDATA[$C$Gesamtlänge]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET Id="RDK:24236493" VarRef="Par1.value">
+									<EXP><![CDATA[$=$ShapeItem.OFGeradeDefinition.L1]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<LIST_ADD Id="RDK:24236495" ListRef="SE_Item.toSetParameters">
+									<PAR Name="VALUE_TO_ADD">
+										<EXP><![CDATA[$=$Par1]]></EXP>
+									</PAR>
+									<PAR Name="POS_TO_ADD" />
+								</LIST_ADD>
+								<SET Id="RDK:24236497" VarRef="Par2.key">
+									<EXP><![CDATA[$C$Winkel]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<SET Id="RDK:24236499" VarRef="Par2.value">
+									<EXP><![CDATA[$=$winkel]]></EXP>
+									<PAR Name="AdvancedOptions" />
+								</SET>
+								<LIST_ADD Id="RDK:24236501" ListRef="SE_Item.toSetParameters">
+									<PAR Name="VALUE_TO_ADD">
+										<EXP><![CDATA[$=$Par2]]></EXP>
+									</PAR>
+									<PAR Name="POS_TO_ADD" />
+								</LIST_ADD>
 							</CASEGROUP>
 							<CASEGROUP Id="RDK:24026430" CaseType="0">
 								<EXP><![CDATA[$C$OFBogen]]></EXP>
@@ -34951,7 +35231,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 											<EXP><![CDATA[$=$SE_Item.X]]></EXP>
 										</PAR>
 										<PAR Name="OriginY">
-											<EXP><![CDATA[$=$-1 * SE_Item.Y]]></EXP>
+											<EXP><![CDATA[$=$-SE_Item.Y]]></EXP>
 										</PAR>
 										<PAR Name="OriginZ">
 											<EXP><![CDATA[$=$SE_Item.Z]]></EXP>
@@ -34959,7 +35239,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 										<PAR Name="AngleX" />
 										<PAR Name="AngleY" />
 										<PAR Name="AngleZ">
-											<EXP><![CDATA[$=$SE_Item.rotation]]></EXP>
+											<EXP><![CDATA[$=$- SE_Item.rotation]]></EXP>
 										</PAR>
 										<PAR Name="AsmCoordSys" />
 										<PAR Name="RefPartName" />
@@ -52206,6 +52486,9 @@ ShapeList["id="+Param.Input[1].shapeID].name
 			<GROUP Id="RDK:23125038" Name="OFGerade" SubType="Generic">
 				<SET_STRUCT Id="RDK:23125037" VarRef="OFGeradeData_defaults" ClearAll="True">
 					<PAR Name="Beschreibung" />
+					<PAR Name="Sivasnr">
+						<EXP><![CDATA[$C$821106002]]></EXP>
+					</PAR>
 					<PAR Name="L1">
 						<EXP><![CDATA[$C$2000]]></EXP>
 					</PAR>
@@ -52241,6 +52524,7 @@ ShapeList["id="+Param.Input[1].shapeID].name
 					<PAR Name="n_Scan">
 						<EXP><![CDATA[$C$0]]></EXP>
 					</PAR>
+					<PAR Name="isOk" />
 				</SET_STRUCT>
 			</GROUP>
 			<GROUP Id="RDK:23747311" Name="TEF Bogen" SubType="Generic">