From 48af183b8659e7e8d0d60b33c11a1f5d7182e9ec Mon Sep 17 00:00:00 2001
From: Lucio Zambon <lucio.zambon@elettra.eu>
Date: Thu, 23 Jan 2025 15:34:38 +0000
Subject: [PATCH] Update elettra2_lattice.json

---
 elettra2_lattice.json | 306 +++++++++++++++++++++---------------------
 1 file changed, 154 insertions(+), 152 deletions(-)

diff --git a/elettra2_lattice.json b/elettra2_lattice.json
index 390ddf8..9cb0456 100644
--- a/elettra2_lattice.json
+++ b/elettra2_lattice.json
@@ -2,8 +2,10 @@
 	"conf": {
 		"modules": ["simulator","door"],
 		"wallColor": "white",
-		"shortcut2d": {
-			"Roof": "machine=roof"
+		"shortcut": {
+			"2d": {
+				"Roof": "machine=roof"
+			}
 		}
 	},
 	"preinjector": {
@@ -725,7 +727,7 @@
 			},
 			{
 				"start": {"x": 33020, "z": -21875},
-				"bending": {"type": "dipolebooster", "rotateY": "PI", "length": 1200, "name": "B_BTS2.2", "labelReverse": [90, -500, 0]},
+				"bending": {"type": "dipolebooster", "rotateY": "PI", "length": 1200, "name": "B_BTS2.2", "labelReverse": [92, -500, 0]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "blm", "position": 737, "name": "BLM_B_BTS2.2_R"},
@@ -735,7 +737,7 @@
 			},
 			{
 				"start": {"x": 35040, "z": -20380},
-				"bending": {"type": "bending_2400", "rotateY": "PI", "length": 2000, "name": "B_BTS2.3", "labelReverse": [90, -500, 0]},
+				"bending": {"type": "bending_2400", "rotateY": "PI", "length": 2000, "name": "B_BTS2.3", "labelReverse": [90, -500, 500]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "blm", "position": 1217, "name": "BLM_B_BTS2.3_R"},
@@ -2092,7 +2094,7 @@
 				"components": [
 					{"type": "donatello", "position": -300, "name": "FUG", "labelReverse": [270, 2000, -150], "offset2d": [-299, -70], "embedded":[
 					]},
-					{"type": "rar1", "position": 800, "name": "RAR1_PSA1.1", "labelReverse": [270, 2700, -300], "offset2d": [180, 10], "embedded":[
+					{"type": "rar1", "position": 800, "name": "RAR1_PSA1.1", "labelReverse": [270, 2700, -300], "offset2d": [185, -20], "embedded":[
 						"SPIN_MOD.01","ECLIPSA-1"
 					]},
 					{"type": "rar2", "position": 1200,  "name": "RAR2_PSA1.1", "labelReverse": [270, 2700, -300], "offset2d": [-220, -60], "embedded":[
@@ -2100,19 +2102,19 @@
 					{"type": "camod", "position": 2400, "name": "RMDK_PSA1.1", "labelReverse":[270, 3200, -700], "offset2d": [160, 10],"embedded":[
 						""
 					]},
-					{"type": "klystron", "position": 4200, "name": "K1", "labelReverse": [270, 2000, -300], "offset2d": [460, 60], "embedded":[
+					{"type": "klystron", "position": 4200, "name": "K1", "labelReverse": [270, 2000, -300], "offset2d": [460, 40], "embedded":[
 						""
 					]},
-					{"type": "klystron", "position": 6300, "name": "K2", "labelReverse": [270, 2000, -300],  "offset2d": [200, 60],"embedded":[
+					{"type": "klystron", "position": 6300, "name": "K2", "labelReverse": [270, 2000, -300],  "offset2d": [200, 20],"embedded":[
 					]},
-					{"type": "camod", "position": 7100, "name": "RMDK_PSA1.2", "labelReverse":[270, 3200, -700], "embedded":[
+					{"type": "camod", "position": 7100, "name": "RMDK_PSA1.2", "offset2d": [0, -20], "labelReverse":[270, 3200, -700], "embedded":[
 					]},
-					{"type": "rar2", "position": 8300, "name": "RAR2_PSA1.2", "labelReverse": [270, 2700, -300], "offset2d": [-320, -70], "embedded":[
+					{"type": "rar2", "position": 8300, "name": "RAR2_PSA1.2", "offset2d": [-300, -80], "labelReverse": [270, 2700, -300], "embedded":[
 					]},
-					{"type": "rar1", "position": 9500, "name": "RAR1_PSA1.2", "labelReverse": [270, 2700, -300], "offset2d": [40, -10],"embedded":[
+					{"type": "rar1", "position": 9500, "name": "RAR1_PSA1.2", "offset2d": [70, -40], "labelReverse": [270, 2700, -300],"embedded":[
 						"SPIN_MOD.02","ECLIPSA-2"
 					]},
-					{"type": "rd", "position": 10100, "name": "RGUN", "labelReverse": [270, 2000, -150], "reverse": true, "offset2d": [-180, -40],"embedded":[
+					{"type": "rd", "position": 10100, "name": "RGUN", "labelReverse": [270, 2000, -150], "reverse": true, "reverse2d": true, "offset2d": [-260, -70],"embedded":[
 						"ECGUNPSA"
 					]},
 					{"type": "donatello", "position": 10400, "name": "FUG", "labelReverse": [270, 2000, -150], "offset2d": [-480, -100],"embedded":[
@@ -2140,7 +2142,7 @@
 						"TPG_PSA1.1","GVPE_P1.1","VGPI_P1.1","VGPE_P1.2","VGPI_P1.2",
 						"TPG_PSA1.2","GVPE_P1.3","VGPI_P1.3","VGPE_P1.4"
 					]},
-					{"type": "rc", "position": 1400, "name": "RC_PSA1.2", "labelReverse": [270, 2500, -310], "offset2d": [50, -200], "reverse": true} 	
+					{"type": "rc", "position": 1400, "name": "RC_PSA1.2", "labelReverse": [270, 2500, -310], "offset2d": [19, -200], "reverse": true} 	
 				]
 			},
 			{
@@ -2171,19 +2173,19 @@
 				"components": [
 					{"type": "rackTriplo", "position": -2000, "name": "Rack Triplo", "labelReverse": [90, -1350, 510], "reverse": true, "embedded":[
 					]},					
-					{"type": "rd", "position": 2600, "name": "RD_PSA1.1", "labelReverse": [90, -1350, 400],  "embedded":[
+					{"type": "rd", "position": 2600, "name": "RD_PSA1.1", "reverse2d": true, "offset2d": [30, -170], "labelReverse": [90, -1350, 400],  "embedded":[
 						"ECFLSCPS","CMMTIMPSA","ECTIMPSA","ECCMPSA"
 					]},	
-					{"type": "rc", "position": 3200, "name": "RP_PSA1.1", "labelReverse": [90, -1350, 400],  "embedded":[
+					{"type": "rc", "position": 3200, "name": "RP_PSA1.1", "reverse2d": true, "offset2d": [30, -180], "labelReverse": [90, -1350, 400],  "embedded":[
 						"CMMPSPSA-2","ECPSPSA-2","ECRFPSA"
 					]},	
-					{"type": "rps", "position": 3900, "name": "RPSBQPTB_PSA1.1", "offset2d": [20, -80], "labelReverse": [90, -1350, 400],  "embedded":[
+					{"type": "rps", "position": 3900, "name": "RPSBQPTB_PSA1.1", "reverse2d": true, "offset2d": [20, -80], "labelReverse": [90, -1350, 400],  "embedded":[
 						"PSB-PTB1.1","PSQ-PTB1.1","PSQ-PTB1.2","PSQ-PTB1.3","PSQ-PTB1.4","PSQ-PTB1.5","PSQ-PTB1.6","PSQ-PTB1.7","PSQ-PTB1.8"
 					]},	
-					{"type": "rps", "position": 4700, "name": "RPSCPTB_PSA1.1", "offset2d": [20, -80], "labelReverse": [90, -1350, 400],  "embedded":[
+					{"type": "rps", "position": 4700, "name": "RPSCPTB_PSA1.1", "reverse2d": true, "offset2d": [20, -80], "labelReverse": [90, -1350, 400],  "embedded":[
 						"PSCH_PTB1.1","PSCV_PTB1.1","PSCH_PTB1.2","PSCV_PTB1.2","PSCH_PTB1.3","PSCV_PTB1.3","PSCH_PTB1.4","PSCV_PTB1.4"
 					]},
-					{"type": "rd", "position": 5400, "name": "RD_PSA1.2", "labelReverse": [90, -1350, 400], "embedded":[
+					{"type": "rd", "position": 5400, "name": "RD_PSA1.2", "reverse2d": true, "labelReverse": [90, -1350, 400], "embedded":[
 						"ECBPMPSA"
 					]}
 				]
@@ -2194,31 +2196,31 @@
 			{
 				"start": {"x": -4000, "z": 3750},
 				"components": [
-					{"type": "rrf", "position": -500, "name": "RRFB_BSA1.1", "labelReverse": [270, 2700, -150], "reverse": true, "embedded":[
+					{"type": "rrf", "position": -500, "name": "RRFB_BSA1.1", "offset2d": [310, 30], "labelReverse": [270, 2700, -150], "reverse": true, "reverse2d": true, "embedded":[
 						"ECRFBSA1"
 					]},
-					{"type": "rrf", "position": 0, "name": "RRFB_BSA1.2", "labelReverse": [270, 2700, -150], "reverse": true,"embedded":[
+					{"type": "rrf", "position": 0, "name": "RRFB_BSA1.2", "offset2d": [210, 20], "labelReverse": [270, 2700, -150], "reverse": true, "reverse2d": true,"embedded":[
 					]},
-					{"type": "rrf", "position": 500, "name": "RRFB_BSA1.3", "labelReverse": [270, 2700, -150], "reverse": true,"embedded":[
+					{"type": "rrf", "position": 500, "name": "RRFB_BSA1.3", "offset2d": [110, 10], "labelReverse": [270, 2700, -150], "reverse": true, "reverse2d": true,"embedded":[
 					]},
-					{"type": "zero", "position": 1000,  "name": "INTB_BSA1.1", "labelReverse": [270, 2700, -150], "reverse": true,"embedded":[
+					{"type": "zero", "position": 1000,  "name": "INTB_BSA1.1", "labelReverse": [270, 2700, -150], "reverse": true, "reverse2d": true,"embedded":[
 						"SPAC_BSA1.1"
 					]},					
-					{"type": "plc", "position": 1000,  "name": "SPAC_BSA1.1", "offset2d": [400, 200], "offset3d": [280, 200, -120], "reverse": true, "labelReverse": [270, -500, -150] 
+					{"type": "plc", "position": 1000,  "name": "SPAC_BSA1.1", "offset2d": [0, 1100], "offset3d": [280, 200, -120], "reverse": true, "reverse2d": true, "labelReverse": [270, -500, -150] 
 					},
-					{"type": "zero", "position": 1600, "name": "RSEPTB_BSA1.1", "labelReverse":[270, 2700, -150], "reverse": true, "embedded":[
+					{"type": "zero", "position": 1600, "name": "RSEPTB_BSA1.1", "labelReverse":[270, 2700, -150], "reverse": true, "reverse2d": true, "embedded":[
 						""
 					]},
-					{"type": "zero", "position": 2200, "name": "RKICKB_BSA1.1", "labelReverse": [270, 2700, -150], "reverse": true, "embedded":[
+					{"type": "zero", "position": 2200, "name": "RKICKB_BSA1.1", "labelReverse": [270, 2700, -150], "reverse": true, "reverse2d": true, "embedded":[
 						""
 					]},
-					{"type": "rps", "position": 2900, "name": "RPSCB_BSA.01", "offset2d": [100, 10], "reverse": true, "labelReverse": [270, 2700, -150], "embedded":[
+					{"type": "rps", "position": 2900, "name": "RPSCB_BSA.01", "offset2d": [10, 0], "reverse": true, "reverse2d": true, "labelReverse": [270, 2700, -150], "embedded":[
 						"PSCV_B22.1","PSCH_B23.1","PSCV_B24.1","PSCH_B25.1","PSCV_B26.1","PSCV_B2.1","PSCH_B3.1","PSCV_B4.1","PSCV_B28.1"
 					]},
-					{"type": "rc", "position": 3600, "name": "RCB_BSA1.1", "labelReverse":[270, 2700, -150], "reverse": true, "embedded":[
+					{"type": "rc", "position": 3600, "name": "RCB_BSA1.1", "offset2d": [110, 10], "labelReverse":[270, 2700, -150], "reverse": true, "reverse2d": true, "embedded":[
 						"ECINJBSA1","ECPSBSA1"
 					]},
-					{"type": "rv", "position": 4400, "name": "RV_BSA1.1", "offset2d": [200, 10], "reverse": true, "labelReverse": [270, 2700, -150], "embedded":[
+					{"type": "rv", "position": 4400, "name": "RV_BSA1.1", "offset2d": [100, 10], "reverse": true, "reverse2d": true, "labelReverse": [270, 2700, -150], "embedded":[
 						"PSSIP_BSA1.1","PSSIP300RF_B27.1","PSSIP300RF_B27.2",
 						"PSSIP_BSA1.2","PSSIP500I_B28.1",
 						"PSSIP_BSA1.3","PSSIP500KI_B28.1",
@@ -2228,7 +2230,7 @@
 						"PSSIP_BSA1.7","PSSIP55_B28.3","PSSIP55_B4.1","PSSIP55_B9.1",
 						"PSSIP_BSA1.8","PSSIP55_B1.1","PSSIP55_B5.1","PSSIP55_B10.1"
 					]},
-					{"type": "rv", "position": 5100, "name": "RVB_BSA1.2", "offset2d": [180, 10], "reverse": true, "labelReverse": [270, 2700, -150], "embedded":[
+					{"type": "rv", "position": 5100, "name": "RVB_BSA1.2", "offset2d": [10, 0], "reverse": true, "reverse2d": true, "labelReverse": [270, 2700, -150], "embedded":[
 						"TPG_BSA1.1","VGPERF_B27.1","VGPIRF_B27.1","VGPERF_B27.2",
 						"TPG_BSA1.2","VGPE_B27.1","VGPI_B27.1","VGPE_B28.1","VGPI_B28.1",
 						"TPG_BSA1.3","VGPEI_B28.1","VGPII_B28.1","VGPEI_B28.2",
@@ -2236,7 +2238,7 @@
 						"TPG_BSA1.5","VGPE_B2.1","VGPI_B3.1","VGPE_B6.1",
 						"TPG_BSA1.6","VGPE_B8.1","VGPI_B10.1","VGPE_B12.1"
 					]},
-					{"type": "rd", "position": 5700, "name": "RDB_BSA1.1", "reverse": true, "labelReverse": [270, 2700, -150], "embedded":[
+					{"type": "rd", "position": 5700, "name": "RDB_BSA1.1", "reverse": true, "reverse2d": true, "labelReverse": [270, 2700, -150], "embedded":[
 						"EC TIMING"
 					]}
 				]
@@ -2264,21 +2266,21 @@
 			{
 				"start": {"x": -4000, "z": -15800},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPSQBTS_BSA2.1", "offset2d": [270, 0], "labelReverse": [270, -200, -210], "embedded":[
+					{"type": "rps", "position": 0, "name": "RPSQBTS_BSA2.1", "offset2d": [400, 30], "labelReverse": [270, -200, -210], "reverse2d": true, "embedded":[
 						"PSQ_BTS1.1","PSQ_BTS1.2","PSQ_BTS1.3","PSQ_BTS1.4","PSQ_BTS1.5","PSQ_BTS1.6"
 					]},					
-					{"type": "rps", "position": 600, "name": "RPSCBTS_BSA2.1", "offset2d": [100, 0], "labelReverse": [270, -200, -210], "embedded":[
+					{"type": "rps", "position": 600, "name": "RPSCBTS_BSA2.1", "offset2d": [180, 10], "labelReverse": [270, -200, -210], "reverse2d": true, "embedded":[
 						"PSCH_BTS1.1","PSCV_BTS1.1","PSCH_BTS1.2","PSCV_BTS1.2","PSCH_BTS1.3","PSCV_BTS1.3","PSCH_BTS1.4","PSCV_BTS1.4"
 					]},					
-					{"type": "rd", "position": 1300, "name": "RDB_BSA2.2", "labelReverse": [270, -200, -210], "embedded":[
+					{"type": "rd", "position": 1300, "name": "RDB_BSA2.2", "offset2d": [280, 10], "labelReverse": [270, -200, -210], "reverse2d": true, "embedded":[
 					]},
-					{"type": "rps", "position": 2000, "name": "RPSCB_BSA2.2", "offset2d": [150, 0], "labelReverse": [270, -200, -210], "embedded":[
+					{"type": "rps", "position": 2000, "name": "RPSCB_BSA2.2", "offset2d": [170, 0], "labelReverse": [270, -200, -210], "reverse2d": true, "embedded":[
 						"PSCH_B5.1","PSCV_B6.1","PSCH_B7.1","PSCV_B8.1","PSCH_B9.1","PSCV_B10.1","PSCH_B11.1","PSCV_B12.1"
 					]},
-					{"type": "rps", "position": 2600, "name": "RBUMP_BSA2.1", "labelReverse": [270, -200, -210], "embedded":[
+					{"type": "rps", "position": 2600, "name": "RBUMP_BSA2.1", "offset2d": [-20, -10], "labelReverse": [270, -200, -210], "reverse2d": true, "embedded":[
 						"PSBUMP_B13.1","PSBUMP_B14.1","PSBUMP_B14.2","PSBUMP_B14.3"
 					]},
-					{"type": "rc", "position": 3300, "name": "RCBBSA2.1", "offset2d": [-100, 0], "labelReverse": [270, -200, -210], "embedded":[
+					{"type": "rc", "position": 3300, "name": "RCBBSA2.1", "offset2d": [-100, 0], "labelReverse": [270, -200, -210], "reverse2d": true, "embedded":[
 						"ECEXTBSA2","ECPSBSA2.1","ECPSBSA2.2"
 					]}
 				]
@@ -2289,10 +2291,10 @@
 			{
 				"start": {"x": 1000, "z": -15300},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPSBBTS_BSA2.2", "offset2d": [200, 0], "labelReverse": [270, -200, -210], "embedded":[
+					{"type": "rps", "position": 0, "name": "RPSBBTS_BSA2.2", "offset2d": [220, 25], "labelReverse": [270, -200, -210], "reverse2d": true, "embedded":[
 						"PSB_BTS1.3","PDUBTS_BSA2.3"
 					]},					
-					{"type": "rps", "position": 600, "name": "RPSCBTS_BSA2.2", "labelReverse": [270, -200, -210], "embedded":[
+					{"type": "rps", "position": 600, "name": "RPSCBTS_BSA2.2", "labelReverse": [270, -200, -210], "reverse2d": true, "embedded":[
 						"PSB_BTS1.1","PDUBTS_BSA2.1","PSB_BTS1.2","PDUBTS_BSA2.2"
 					]}				
 				]
@@ -2303,16 +2305,16 @@
 			{
 				"start": {"x": 13000, "z": -9000},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RDB_BSA3.1", "offset2d": [-120, -160], "labelReverse": [270, -200, -210], "embedded":[
+					{"type": "rd", "position": 0, "name": "RDB_BSA3.1", "offset2d": [120, 30], "labelReverse": [270, -200, -210], "reverse2d": true, "embedded":[
 						"ECSCRBSA3"
 					]},
-					{"type": "rps", "position": 700, "name": "RPSCB_BSA3.1", "offset2d": [-80, -120], "labelReverse": [270, -200, -210], "embedded":[
+					{"type": "rps", "position": 700, "name": "RPSCB_BSA3.1", "offset2d": [30, -50], "labelReverse": [270, -200, -210], "reverse2d": true, "embedded":[
 						"PSCV_B16.1","PSCH_B17.1","PSCV_B18.1","PSCH_B19.1","PSCV_B20.1","PSCH_B21.1","PSSF_B1","PSSD_B1"
 					]},
-					{"type": "rc", "position": 1400, "name": "RCB_BSA3.1", "offset2d": [-120, -160], "labelReverse": [270, -200, -210], "embedded":[
+					{"type": "rc", "position": 1400, "name": "RCB_BSA3.1", "offset2d": [100, 20], "labelReverse": [270, -200, -210], "reverse2d": true, "embedded":[
 						"ECPSBSA3"
 					]},
-					{"type": "rv", "position": 2200, "name": "RVB_BSA3.2", "labelReverse": [270, -200, -210],  "embedded":[
+					{"type": "rv", "position": 2200, "name": "RVB_BSA3.2", "offset2d": [110, 25], "labelReverse": [270, -200, -210], "reverse2d": true,  "embedded":[
 						"PSSIP_BSA3.8","PSSIP55_BTS1.1","PSSIP55_BTS1.3","PSSIP55_BTS1.5","PSSIP55_BTS1.7",
 						"PSSIP_BSA3.9","PSSIP55_BTS1.2","PSSIP55_BTS1.4","PSSIP55_BTS1.6",
 						"TPG_BSA3.1","VGPEKE_B13.1","VGPIKE_B13.1","VGPEKE_B13.2",
@@ -2323,7 +2325,7 @@
 						"TPG_BSA3.6","VGPE_BTS1.1","VGPI_BTS1.1","VGPE_BTS1.2","VGPI_BTS1.2",
 						"TPG_BSA3.7","VGPE_BTS1.3"
 					]},
-					{"type": "rv", "position": 3000, "name": "RVB_BSA3.1", "labelReverse": [270, -200, -210],  "embedded":[
+					{"type": "rv", "position": 3000, "name": "RVB_BSA3.1", "offset2d": [110, 25], "labelReverse": [270, -200, -210], "reverse2d": true,  "embedded":[
 						"PSSIP_BSA3.1","PSSIP500KE_B13.1","PSSIP500KE_B14.1",
 						"PSSIP_BSA3.2","PSSIP500E_B14.2",
 						"PSSIP_BSA3.3","PSSIP55_B13.1","PSSIP55_B15.1","PSSIP55_B20.1","PSSIP55_B25.1",
@@ -2340,8 +2342,8 @@
 			{
 				"start": {"x": 33249, "y": -300, "z": 4557},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB01.05", "reverse": true, "embedded":["PSOCT_S01.02","PSOCT_S01.01","PSTRCEB_S01.01","PSTRCEB_S01.02","PSB_S01.01","PSB_S01.02","PSB_S01.03"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB01.10", "reverse": true, "embedded":["PSCFH_S01.01","PSCFV_S01.01","PSCEH_S01.01","PSCEV_S01.01","PSCEH_S01.02","PSCEV_S01.02","PSCEH_S01.03","PSQAB_S01.01","PSQAB_S01.02","PSSF_S01.01","PSSD_S01.01","PSSD_S01.02","PSSF_S01.02"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB01.05", "reverse": true, "reverse2d": true, "embedded":["PSOCT_S01.02","PSOCT_S01.01","PSTRCEB_S01.01","PSTRCEB_S01.02","PSB_S01.01","PSB_S01.02","PSB_S01.03"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB01.10", "reverse": true, "reverse2d": true, "embedded":["PSCFH_S01.01","PSCFV_S01.01","PSCEH_S01.01","PSCEV_S01.01","PSCEH_S01.02","PSCEV_S01.02","PSCEH_S01.03","PSQAB_S01.01","PSQAB_S01.02","PSSF_S01.01","PSSD_S01.01","PSSD_S01.02","PSSF_S01.02"]}
 				]
 			},
 			{
@@ -2350,12 +2352,12 @@
 			{
 				"start": {"x": 32402, "y": -300, "z": 8682},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB01.15", "reverse": true, "embedded":["PSCFH_S01.02","PSCFV_S01.02","PSCEH_S01.05","PSCEV_S01.05","PSCEH_S01.06","PSCEH_S01.06","PSCEH_S01.08","PSCEV_S01.08","PSQAB_S01.03","PSQAB_S01.04","PSQF_S01.01","PSSD_S01.03","PSSD_S01.04","PSSF_S01.03"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB01.20", "reverse": true, "embedded":["PSCFH_S01.03","PSCFV_S01.03","PSQK_S01.01","PSCEV_S01.09","PSCEH_S01.10","PSCEV_S01.10","PSQK_S01.02","PSCEV_S01.11","PSCH_S01.01","PSCV_S01.01","PSQD_S01.01","PSQF_S01.02","PSQD_S01.02","PSSD_S01.05","PSSH_S01.01","PSSH_S01.02"]},
-					{"type": "rps", "position": 3397, "name": "RPS_AB01.25", "reverse": true, "embedded":["PSCFH_S01.04","PSCFV_S01.04","PSCH_S01.02","PSCV_S01.02","PSQK_S01.03","PSCEH_S01.13","PSCEV_S01.13","PSQK_S01.04","PSQD_S01.03","PSQF_S01.03","PSQD_S01.04","PSSH_S01.03","PSSH_S01.04","PSSD_S01.06"]},
-					{"type": "rps", "position": 4217, "name": "RPS_AB01.30", "reverse": true, "embedded":["PSCFH_S01.05","PSCFV_S01.05","PSCEH_S01.15","PSCEV_S01.15","PSCEH_S01.17","PSCEV_S01.17","PSCEH_S01.18","PSCEV_S01.18","PSQD_S01.04","PSQF_S01.04","PSQAB_S01.05","PSSF_S01.04","PSSD_S01.07","PSSD_S01.08"]},
-					{"type": "rps", "position": 5848, "name": "RPS_AB01.35", "reverse": true, "embedded":["PSCFH_S01.06","PSCFV_S01.06","PSCEH_S01.20","PSCEV_S01.20","PSCEH_S01.21","PSCEV_S01.21","PSCEH_S01.22","PSCEV_S01.22","PSQAB_S01.06","PSQAB_S01.07","PSSF_S01.05","PSSD_S01.09","PSSD_S01.10","PSSF_S01.06"]},
-					{"type": "rps", "position": 6664, "name": "RPS_AB01.40", "reverse": true, "embedded":["PSOCT_S01.03","PSOCT_S01.04","PSTRCEB_S01.03","PSTRCEB_S01.04","PSB_S01.04","PSB_S01.05","PSB_S01.06"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB01.15", "reverse": true, "reverse2d": true, "embedded":["PSCFH_S01.02","PSCFV_S01.02","PSCEH_S01.05","PSCEV_S01.05","PSCEH_S01.06","PSCEH_S01.06","PSCEH_S01.08","PSCEV_S01.08","PSQAB_S01.03","PSQAB_S01.04","PSQF_S01.01","PSSD_S01.03","PSSD_S01.04","PSSF_S01.03"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB01.20", "reverse": true, "reverse2d": true, "embedded":["PSCFH_S01.03","PSCFV_S01.03","PSQK_S01.01","PSCEV_S01.09","PSCEH_S01.10","PSCEV_S01.10","PSQK_S01.02","PSCEV_S01.11","PSCH_S01.01","PSCV_S01.01","PSQD_S01.01","PSQF_S01.02","PSQD_S01.02","PSSD_S01.05","PSSH_S01.01","PSSH_S01.02"]},
+					{"type": "rps", "position": 3397, "name": "RPS_AB01.25", "reverse": true, "reverse2d": true, "embedded":["PSCFH_S01.04","PSCFV_S01.04","PSCH_S01.02","PSCV_S01.02","PSQK_S01.03","PSCEH_S01.13","PSCEV_S01.13","PSQK_S01.04","PSQD_S01.03","PSQF_S01.03","PSQD_S01.04","PSSH_S01.03","PSSH_S01.04","PSSD_S01.06"]},
+					{"type": "rps", "position": 4217, "name": "RPS_AB01.30", "reverse": true, "reverse2d": true, "embedded":["PSCFH_S01.05","PSCFV_S01.05","PSCEH_S01.15","PSCEV_S01.15","PSCEH_S01.17","PSCEV_S01.17","PSCEH_S01.18","PSCEV_S01.18","PSQD_S01.04","PSQF_S01.04","PSQAB_S01.05","PSSF_S01.04","PSSD_S01.07","PSSD_S01.08"]},
+					{"type": "rps", "position": 5848, "name": "RPS_AB01.35", "reverse": true, "reverse2d": true, "embedded":["PSCFH_S01.06","PSCFV_S01.06","PSCEH_S01.20","PSCEV_S01.20","PSCEH_S01.21","PSCEV_S01.21","PSCEH_S01.22","PSCEV_S01.22","PSQAB_S01.06","PSQAB_S01.07","PSSF_S01.05","PSSD_S01.09","PSSD_S01.10","PSSF_S01.06"]},
+					{"type": "rps", "position": 6664, "name": "RPS_AB01.40", "reverse": true, "reverse2d": true, "embedded":["PSOCT_S01.03","PSOCT_S01.04","PSTRCEB_S01.03","PSTRCEB_S01.04","PSB_S01.04","PSB_S01.05","PSB_S01.06"]}
 				]
 			},
 			{
@@ -2385,7 +2387,7 @@
 			{
 				"start": {"x": 33365, "y": -300, "z": 3512},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB01.05", "reverse": true}
+					{"type": "rc", "position": 0, "name": "RC_AB01.05", "reverse": true, "reverse2d": true}
 				]
 			},
 			{
@@ -2394,7 +2396,7 @@
 			{
 				"start": {"x": 31569, "y": -300, "z": 10939},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB01.10", "reverse": true}
+					{"type": "rc", "position": 0, "name": "RC_AB01.10", "reverse": true, "reverse2d": true}
 				]
 			},
 			{
@@ -2403,9 +2405,9 @@
 			{
 				"start": {"x": 37510, "y": -300, "z": 1548},
 				"components": [
-					{"type": "rid", "position": 0, "name": "RID_AA01.05", "offset3d": [-1200, 0, 0] ,"reverse": true},
-					{"type": "rid", "position": 610, "name": "RID_AA01.10", "offset3d": [-1200, 0, 0] ,"reverse": true},
-					{"type": "rid", "position": 1220, "name": "RID_AA01.15", "offset3d": [-1200, 0, 0] ,"reverse": true}
+					{"type": "rid", "position": 0, "name": "RID_AA01.05", "offset3d": [-1200, 0, 0] ,"reverse": true, "reverse2d": true},
+					{"type": "rid", "position": 610, "name": "RID_AA01.10", "offset3d": [-1200, 0, 0] ,"reverse": true, "reverse2d": true},
+					{"type": "rid", "position": 1220, "name": "RID_AA01.15", "offset3d": [-1200, 0, 0] ,"reverse": true, "reverse2d": true}
 				]
 			},
 			{
@@ -2414,10 +2416,10 @@
 			{
 				"start": {"x": 26434, "y": -300, "z": 20653},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB02.05", "reverse": true, "embedded":["PSOCT_S02.02","PSOCT_S02.01","PSTRCEB_S02.01","PSTRCEB_S02.02","PSB_S02.01","PSB_S02.02","PSB_S02.03"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB02.10", "reverse": true, "embedded":["PSCFH_S02.01","PSCFV_S02.01","PSCEH_S02.01","PSCEV_S02.01","PSCEH_S02.02","PSCEV_S02.02","PSCEH_S02.03","PSQAB_S02.01","PSQAB_S02.02","PSSF_S02.01","PSSD_S02.01","PSSD_S02.02","PSSF_S02.02"]},
-					{"type": "rps", "position": 1641, "name": "RPS_AB02.15", "reverse": true, "embedded":["PSCFH_S02.02","PSCFV_S02.02","PSCEH_S02.05","PSCEV_S02.05","PSCEH_S02.06","PSCEH_S02.06","PSCEH_S02.08","PSCEV_S02.08","PSQAB_S02.03","PSQAB_S02.04","PSQF_S02.01","PSSD_S02.03","PSSD_S02.04","PSSF_S02.03"]},
-					{"type": "rps", "position": 2461, "name": "RPS_AB02.20", "reverse": true, "embedded":["PSCFH_S02.03","PSCFV_S02.03","PSQK_S02.01","PSCEV_S02.09","PSCEH_S02.10","PSCEV_S02.10","PSQK_S02.02","PSCEV_S02.11","PSCH_S02.01","PSCV_S02.01","PSQD_S02.01","PSQF_S02.02","PSQD_S02.02","PSSD_S02.05","PSSH_S02.01","PSSH_S02.02"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB02.05", "reverse": true, "reverse2d": true, "embedded":["PSOCT_S02.02","PSOCT_S02.01","PSTRCEB_S02.01","PSTRCEB_S02.02","PSB_S02.01","PSB_S02.02","PSB_S02.03"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB02.10", "reverse": true, "reverse2d": true, "embedded":["PSCFH_S02.01","PSCFV_S02.01","PSCEH_S02.01","PSCEV_S02.01","PSCEH_S02.02","PSCEV_S02.02","PSCEH_S02.03","PSQAB_S02.01","PSQAB_S02.02","PSSF_S02.01","PSSD_S02.01","PSSD_S02.02","PSSF_S02.02"]},
+					{"type": "rps", "position": 1641, "name": "RPS_AB02.15", "reverse": true, "reverse2d": true, "embedded":["PSCFH_S02.02","PSCFV_S02.02","PSCEH_S02.05","PSCEV_S02.05","PSCEH_S02.06","PSCEH_S02.06","PSCEH_S02.08","PSCEV_S02.08","PSQAB_S02.03","PSQAB_S02.04","PSQF_S02.01","PSSD_S02.03","PSSD_S02.04","PSSF_S02.03"]},
+					{"type": "rps", "position": 2461, "name": "RPS_AB02.20", "reverse": true, "reverse2d": true, "embedded":["PSCFH_S02.03","PSCFV_S02.03","PSQK_S02.01","PSCEV_S02.09","PSCEH_S02.10","PSCEV_S02.10","PSQK_S02.02","PSCEV_S02.11","PSCH_S02.01","PSCV_S02.01","PSQD_S02.01","PSQF_S02.02","PSQD_S02.02","PSSD_S02.05","PSSH_S02.01","PSSH_S02.02"]}
 				]
 			},
 			{
@@ -2426,10 +2428,10 @@
 			{
 				"start": {"x": 22446, "y": -300, "z": 24930},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB02.25", "reverse": true, "embedded":["PSCFH_S02.04","PSCFV_S02.04","PSCH_S02.02","PSCV_S02.02","PSQK_S02.03","PSCEH_S02.13","PSCEV_S02.13","PSQK_S02.04","PSQD_S02.03","PSQF_S02.03","PSQD_S02.04","PSSH_S02.03","PSSH_S02.04","PSSD_S02.06"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB02.30", "reverse": true, "embedded":["PSCFH_S02.05","PSCFV_S02.05","PSCEH_S02.15","PSCEV_S02.15","PSCEH_S02.17","PSCEV_S02.17","PSCEH_S02.18","PSCEV_S02.18","PSQD_S02.04","PSQF_S02.04","PSQAB_S02.05","PSSF_S02.04","PSSD_S02.07","PSSD_S02.08"]},
-					{"type": "rps", "position": 1641, "name": "RPS_AB02.35", "reverse": true, "embedded":["PSCFH_S02.06","PSCFV_S02.06","PSCEH_S02.20","PSCEV_S02.20","PSCEH_S02.21","PSCEV_S02.21","PSCEH_S02.22","PSCEV_S02.22","PSQAB_S02.06","PSQAB_S02.07","PSSF_S02.05","PSSD_S02.09","PSSD_S02.10","PSSF_S02.06"]},
-					{"type": "rps", "position": 2461, "name": "RPS_AB02.40", "reverse": true, "embedded":["PSOCT_S02.03","PSOCT_S02.04","PSTRCEB_S02.03","PSTRCEB_S02.04","PSB_S02.04","PSB_S02.05","PSB_S02.06"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB02.25", "reverse": true, "reverse2d": true, "embedded":["PSCFH_S02.04","PSCFV_S02.04","PSCH_S02.02","PSCV_S02.02","PSQK_S02.03","PSCEH_S02.13","PSCEV_S02.13","PSQK_S02.04","PSQD_S02.03","PSQF_S02.03","PSQD_S02.04","PSSH_S02.03","PSSH_S02.04","PSSD_S02.06"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB02.30", "reverse": true, "reverse2d": true, "embedded":["PSCFH_S02.05","PSCFV_S02.05","PSCEH_S02.15","PSCEV_S02.15","PSCEH_S02.17","PSCEV_S02.17","PSCEH_S02.18","PSCEV_S02.18","PSQD_S02.04","PSQF_S02.04","PSQAB_S02.05","PSSF_S02.04","PSSD_S02.07","PSSD_S02.08"]},
+					{"type": "rps", "position": 1641, "name": "RPS_AB02.35", "reverse": true, "reverse2d": true, "embedded":["PSCFH_S02.06","PSCFV_S02.06","PSCEH_S02.20","PSCEV_S02.20","PSCEH_S02.21","PSCEV_S02.21","PSCEH_S02.22","PSCEV_S02.22","PSQAB_S02.06","PSQAB_S02.07","PSSF_S02.05","PSSD_S02.09","PSSD_S02.10","PSSF_S02.06"]},
+					{"type": "rps", "position": 2461, "name": "RPS_AB02.40", "reverse": true, "reverse2d": true, "embedded":["PSOCT_S02.03","PSOCT_S02.04","PSTRCEB_S02.03","PSTRCEB_S02.04","PSB_S02.04","PSB_S02.05","PSB_S02.06"]}
 				]
 			},
 			{
@@ -2453,7 +2455,7 @@
 			{
 				"start": {"x": 27182, "y": -300, "z": 19749},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB02.05", "reverse": true}
+					{"type": "rc", "position": 0, "name": "RC_AB02.05", "reverse": true, "reverse2d": true}
 				]
 			},
 			{
@@ -2462,7 +2464,7 @@
 			{
 				"start": {"x": 23340, "y": -300, "z": 24169},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB02.10", "reverse": true}
+					{"type": "rc", "position": 0, "name": "RC_AB02.10", "reverse": true, "reverse2d": true}
 				]
 			},
 			{
@@ -2471,7 +2473,7 @@
 			{
 				"start": {"x": 32967, "y": -300, "z": 16798},
 				"components": [
-					{"type": "rshid", "position": 0, "name": "RSHID_AA02.05", "reverse": true}
+					{"type": "rshid", "position": 0, "name": "RSHID_AA02.05", "reverse": true, "reverse2d": true}
 				]
 			},
 			{
@@ -2480,9 +2482,9 @@
 			{
 				"start": {"x": 27332, "y": -300, "z": 24969},
 				"components": [
-					{"type": "rid", "position": 0, "name": "RID_AA02.05", "offset3d": [-1600, 0, 0] ,"reverse": true},
-					{"type": "rid", "position": 610, "name": "RID_AA02.10", "offset3d": [-1600, 0, 0] ,"reverse": true},
-					{"type": "rid", "position": 1220, "name": "RID_AA02.15", "offset3d": [-1600, 0, 0] ,"reverse": true}
+					{"type": "rid", "position": 0, "name": "RID_AA02.05", "offset3d": [-1600, 0, 0] ,"reverse": true, "reverse2d": true},
+					{"type": "rid", "position": 610, "name": "RID_AA02.10", "offset3d": [-1600, 0, 0] ,"reverse": true, "reverse2d": true},
+					{"type": "rid", "position": 1220, "name": "RID_AA02.15", "offset3d": [-1600, 0, 0] ,"reverse": true, "reverse2d": true}
 				]
 			},
 			{
@@ -2494,10 +2496,10 @@
 			{
 				"start": {"x": 12566, "y": -300, "z": 31103},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB03.05", "reverse": true, "embedded":["PSOCT_S03.02","PSOCT_S03.01","PSTRCEB_S03.01","PSTRCEB_S03.02","PSB_S03.01","PSB_S03.02","PSB_S03.03"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB03.10", "reverse": true, "embedded":["PSCFH_S03.01","PSCFV_S03.01","PSCEH_S03.01","PSCEV_S03.01","PSCEH_S03.02","PSCEV_S03.02","PSCEH_S03.03","PSQAB_S03.01","PSQAB_S03.02","PSSF_S03.01","PSSD_S03.01","PSSD_S03.02","PSSF_S03.02"]},
-					{"type": "rps", "position": 1641, "name": "RPS_AB03.15", "reverse": true, "embedded":["PSCFH_S03.02","PSCFV_S03.02","PSCEH_S03.05","PSCEV_S03.05","PSCEH_S03.06","PSCEH_S03.06","PSCEH_S03.08","PSCEV_S03.08","PSQAB_S03.03","PSQAB_S03.04","PSQF_S03.01","PSSD_S03.03","PSSD_S03.04","PSSF_S03.03"]},
-					{"type": "rps", "position": 2461, "name": "RPS_AB03.20", "reverse": true, "embedded":["PSCFH_S03.03","PSCFV_S03.03","PSQK_S03.01","PSCEV_S03.09","PSCEH_S03.10","PSCEV_S03.10","PSQK_S03.02","PSCEV_S03.11","PSCH_S03.01","PSCV_S03.01","PSQD_S03.01","PSQF_S03.02","PSQD_S03.02","PSSD_S03.05","PSSH_S03.01","PSSH_S03.02"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB03.05", "reverse": true, "reverse2d": true, "embedded":["PSOCT_S03.02","PSOCT_S03.01","PSTRCEB_S03.01","PSTRCEB_S03.02","PSB_S03.01","PSB_S03.02","PSB_S03.03"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB03.10", "reverse": true, "reverse2d": true, "embedded":["PSCFH_S03.01","PSCFV_S03.01","PSCEH_S03.01","PSCEV_S03.01","PSCEH_S03.02","PSCEV_S03.02","PSCEH_S03.03","PSQAB_S03.01","PSQAB_S03.02","PSSF_S03.01","PSSD_S03.01","PSSD_S03.02","PSSF_S03.02"]},
+					{"type": "rps", "position": 1641, "name": "RPS_AB03.15", "reverse": true, "reverse2d": true, "embedded":["PSCFH_S03.02","PSCFV_S03.02","PSCEH_S03.05","PSCEV_S03.05","PSCEH_S03.06","PSCEH_S03.06","PSCEH_S03.08","PSCEV_S03.08","PSQAB_S03.03","PSQAB_S03.04","PSQF_S03.01","PSSD_S03.03","PSSD_S03.04","PSSF_S03.03"]},
+					{"type": "rps", "position": 2461, "name": "RPS_AB03.20", "reverse": true, "reverse2d": true, "embedded":["PSCFH_S03.03","PSCFV_S03.03","PSQK_S03.01","PSCEV_S03.09","PSCEH_S03.10","PSCEV_S03.10","PSQK_S03.02","PSCEV_S03.11","PSCH_S03.01","PSCV_S03.01","PSQD_S03.01","PSQF_S03.02","PSQD_S03.02","PSSD_S03.05","PSSH_S03.01","PSSH_S03.02"]}
 				]
 			},
 			{
@@ -2506,10 +2508,10 @@
 			{
 				"start": {"x": 6974, "y": -300, "z": 32813},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB03.25", "reverse": true, "embedded":["PSCFH_S03.04","PSCFV_S03.04","PSCH_S03.02","PSCV_S03.02","PSQK_S03.03","PSCEH_S03.13","PSCEV_S03.13","PSQK_S03.04","PSQD_S03.03","PSQF_S03.03","PSQD_S03.04","PSSH_S03.03","PSSH_S03.04","PSSD_S03.06"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB03.30", "reverse": true, "embedded":["PSCFH_S03.05","PSCFV_S03.05","PSCEH_S03.15","PSCEV_S03.15","PSCEH_S03.17","PSCEV_S03.17","PSCEH_S03.18","PSCEV_S03.18","PSQD_S03.04","PSQF_S03.04","PSQAB_S03.05","PSSF_S03.04","PSSD_S03.07","PSSD_S03.08"]},
-					{"type": "rps", "position": 1641, "name": "RPS_AB03.35", "reverse": true, "embedded":["PSCFH_S03.06","PSCFV_S03.06","PSCEH_S03.20","PSCEV_S03.20","PSCEH_S03.21","PSCEV_S03.21","PSCEH_S03.22","PSCEV_S03.22","PSQAB_S03.06","PSQAB_S03.07","PSSF_S03.05","PSSD_S03.09","PSSD_S03.10","PSSF_S03.06"]},
-					{"type": "rps", "position": 2461, "name": "RPS_AB03.40", "reverse": true, "embedded":["PSOCT_S03.03","PSOCT_S03.04","PSTRCEB_S03.03","PSTRCEB_S03.04","PSB_S03.04","PSB_S03.05","PSB_S03.06"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB03.25", "reverse": true, "reverse2d": true, "embedded":["PSCFH_S03.04","PSCFV_S03.04","PSCH_S03.02","PSCV_S03.02","PSQK_S03.03","PSCEH_S03.13","PSCEV_S03.13","PSQK_S03.04","PSQD_S03.03","PSQF_S03.03","PSQD_S03.04","PSSH_S03.03","PSSH_S03.04","PSSD_S03.06"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB03.30", "reverse": true, "reverse2d": true, "embedded":["PSCFH_S03.05","PSCFV_S03.05","PSCEH_S03.15","PSCEV_S03.15","PSCEH_S03.17","PSCEV_S03.17","PSCEH_S03.18","PSCEV_S03.18","PSQD_S03.04","PSQF_S03.04","PSQAB_S03.05","PSSF_S03.04","PSSD_S03.07","PSSD_S03.08"]},
+					{"type": "rps", "position": 1641, "name": "RPS_AB03.35", "reverse": true, "reverse2d": true, "embedded":["PSCFH_S03.06","PSCFV_S03.06","PSCEH_S03.20","PSCEV_S03.20","PSCEH_S03.21","PSCEV_S03.21","PSCEH_S03.22","PSCEV_S03.22","PSQAB_S03.06","PSQAB_S03.07","PSSF_S03.05","PSSD_S03.09","PSSD_S03.10","PSSF_S03.06"]},
+					{"type": "rps", "position": 2461, "name": "RPS_AB03.40", "reverse": true, "reverse2d": true, "embedded":["PSOCT_S03.03","PSOCT_S03.04","PSTRCEB_S03.03","PSTRCEB_S03.04","PSB_S03.04","PSB_S03.05","PSB_S03.06"]}
 				]
 			},
 			{
@@ -2530,7 +2532,7 @@
 			{
 				"start": {"x": 13666, "y": -300, "z": 30695},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB03.05", "reverse": true}
+					{"type": "rc", "position": 0, "name": "RC_AB03.05", "reverse": true, "reverse2d": true}
 				]
 			},
 			{
@@ -2539,7 +2541,7 @@
 			{
 				"start": {"x": 8128, "y": -300, "z": 32601},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB03.10", "reverse": true}
+					{"type": "rc", "position": 0, "name": "RC_AB03.10", "reverse": true, "reverse2d": true}
 				]
 			},
 			{
@@ -2548,9 +2550,9 @@
 			{
 				"start": {"x": 11248, "y": -300, "z": 35270},
 				"components": [
-					{"type": "rid", "position": 0, "name": "RID_AA03.05", "offset3d": [-2400, 0, 0] ,"reverse": true},
-					{"type": "rid", "position": 610, "name": "RID_AA03.10", "offset3d": [-2400, 0, 0] ,"reverse": true},
-					{"type": "rid", "position": 1220, "name": "RID_AA03.15" , "offset3d": [-2400, 0, 0],"reverse": true}
+					{"type": "rid", "position": 0, "name": "RID_AA03.05", "offset3d": [-2400, 0, 0] ,"reverse": true, "reverse2d": true},
+					{"type": "rid", "position": 610, "name": "RID_AA03.10", "offset3d": [-2400, 0, 0] ,"reverse": true, "reverse2d": true},
+					{"type": "rid", "position": 1220, "name": "RID_AA03.15" , "offset3d": [-2400, 0, 0],"reverse": true, "reverse2d": true}
 				]
 			},
 			{
@@ -2573,8 +2575,8 @@
 			{
 				"start": {"x": 19436, "y": -300, "z": 31718},
 				"components": [
-					{"type": "rrf", "position": 0, "name": "RRF_AA03.05", "reverse": true},
-					{"type": "rrf", "position": 649, "name": "RRF_AA03.10", "reverse": true}
+					{"type": "rrf", "position": 0, "name": "RRF_AA03.05", "reverse": true, "reverse2d": true},
+					{"type": "rrf", "position": 649, "name": "RRF_AA03.10", "reverse": true, "reverse2d": true}
 				]
 			},
 			{
@@ -2583,9 +2585,9 @@
 			{
 				"start": {"x": -4557, "y": -300, "z": 33450},
 				"components": [
-					{"type": "rc", "position": -820, "name": "RC_AB04.05"},
-					{"type": "rps", "position": 0, "name": "RPS_AB04.05", "embedded":["PSOCT_S04.02","PSOCT_S04.01","PSTRCEB_S04.01","PSTRCEB_S04.02","PSB_S04.01","PSB_S04.02","PSB_S04.03"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB04.10", "embedded":["PSCFH_S04.01","PSCFV_S04.01","PSCEH_S04.01","PSCEV_S04.01","PSCEH_S04.02","PSCEV_S04.02","PSCEH_S04.03","PSQAB_S04.01","PSQAB_S04.02","PSSF_S04.01","PSSD_S04.01","PSSD_S04.02","PSSF_S04.02"]}
+					{"type": "rc", "position": -820, "name": "RC_AB04.05", "reverse2d": true},
+					{"type": "rps", "position": 0, "name": "RPS_AB04.05", "reverse2d": true, "embedded":["PSOCT_S04.02","PSOCT_S04.01","PSTRCEB_S04.01","PSTRCEB_S04.02","PSB_S04.01","PSB_S04.02","PSB_S04.03"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB04.10", "reverse2d": true, "embedded":["PSCFH_S04.01","PSCFV_S04.01","PSCEH_S04.01","PSCEV_S04.01","PSCEH_S04.02","PSCEV_S04.02","PSCEH_S04.03","PSQAB_S04.01","PSQAB_S04.02","PSSF_S04.01","PSSD_S04.01","PSSD_S04.02","PSSF_S04.02"]}
 				]
 			},
 			{
@@ -2594,13 +2596,13 @@
 			{
 				"start": {"x": -8682, "y": -300, "z": 32653},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB04.15", "embedded":["PSCFH_S04.02","PSCFV_S04.02","PSCEH_S04.05","PSCEV_S04.05","PSCEH_S04.06","PSCEH_S04.06","PSCEH_S04.08","PSCEV_S04.08","PSQAB_S04.03","PSQAB_S04.04","PSQF_S04.01","PSSD_S04.03","PSSD_S04.04","PSSF_S04.03"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB04.20", "embedded":["PSCFH_S04.03","PSCFV_S04.03","PSQK_S04.01","PSCEV_S04.09","PSCEH_S04.10","PSCEV_S04.10","PSQK_S04.02","PSCEV_S04.11","PSCH_S04.01","PSCV_S04.01","PSQD_S04.01","PSQF_S04.02","PSQD_S04.02","PSSD_S04.05","PSSH_S04.01","PSSH_S04.02"]},
-					{"type": "rc", "position": 2100, "name": "RC_AB04.10"},
-					{"type": "rps", "position": 3397, "name": "RPS_AB04.25", "embedded":["PSCFH_S04.04","PSCFV_S04.04","PSCH_S04.02","PSCV_S04.02","PSQK_S04.03","PSCEH_S04.13","PSCEV_S04.13","PSQK_S04.04","PSQD_S04.03","PSQF_S04.03","PSQD_S04.04","PSSH_S04.03","PSSH_S04.04","PSSD_S04.06"]},
-					{"type": "rps", "position": 4217, "name": "RPS_AB04.30", "embedded":["PSCFH_S04.05","PSCFV_S04.05","PSCEH_S04.15","PSCEV_S04.15","PSCEH_S04.17","PSCEV_S04.17","PSCEH_S04.18","PSCEV_S04.18","PSQD_S04.04","PSQF_S04.04","PSQAB_S04.05","PSSF_S04.04","PSSD_S04.07","PSSD_S04.08"]},
-					{"type": "rps", "position": 5848, "name": "RPS_AB04.35", "embedded":["PSCFH_S04.06","PSCFV_S04.06","PSCEH_S04.20","PSCEV_S04.20","PSCEH_S04.21","PSCEV_S04.21","PSCEH_S04.22","PSCEV_S04.22","PSQAB_S04.06","PSQAB_S04.07","PSSF_S04.05","PSSD_S04.09","PSSD_S04.10","PSSF_S04.06"]},
-					{"type": "rps", "position": 6664, "name": "RPS_AB04.40", "embedded":["PSOCT_S04.03","PSOCT_S04.04","PSTRCEB_S04.03","PSTRCEB_S04.04","PSB_S04.04","PSB_S04.05","PSB_S04.06"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB04.15", "reverse2d": true, "embedded":["PSCFH_S04.02","PSCFV_S04.02","PSCEH_S04.05","PSCEV_S04.05","PSCEH_S04.06","PSCEH_S04.06","PSCEH_S04.08","PSCEV_S04.08","PSQAB_S04.03","PSQAB_S04.04","PSQF_S04.01","PSSD_S04.03","PSSD_S04.04","PSSF_S04.03"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB04.20", "reverse2d": true, "embedded":["PSCFH_S04.03","PSCFV_S04.03","PSQK_S04.01","PSCEV_S04.09","PSCEH_S04.10","PSCEV_S04.10","PSQK_S04.02","PSCEV_S04.11","PSCH_S04.01","PSCV_S04.01","PSQD_S04.01","PSQF_S04.02","PSQD_S04.02","PSSD_S04.05","PSSH_S04.01","PSSH_S04.02"]},
+					{"type": "rc", "position": 2100, "name": "RC_AB04.10", "reverse2d": true},
+					{"type": "rps", "position": 3397, "name": "RPS_AB04.25", "reverse2d": true, "embedded":["PSCFH_S04.04","PSCFV_S04.04","PSCH_S04.02","PSCV_S04.02","PSQK_S04.03","PSCEH_S04.13","PSCEV_S04.13","PSQK_S04.04","PSQD_S04.03","PSQF_S04.03","PSQD_S04.04","PSSH_S04.03","PSSH_S04.04","PSSD_S04.06"]},
+					{"type": "rps", "position": 4217, "name": "RPS_AB04.30", "reverse2d": true, "embedded":["PSCFH_S04.05","PSCFV_S04.05","PSCEH_S04.15","PSCEV_S04.15","PSCEH_S04.17","PSCEV_S04.17","PSCEH_S04.18","PSCEV_S04.18","PSQD_S04.04","PSQF_S04.04","PSQAB_S04.05","PSSF_S04.04","PSSD_S04.07","PSSD_S04.08"]},
+					{"type": "rps", "position": 5848, "name": "RPS_AB04.35", "reverse2d": true, "embedded":["PSCFH_S04.06","PSCFV_S04.06","PSCEH_S04.20","PSCEV_S04.20","PSCEH_S04.21","PSCEV_S04.21","PSCEH_S04.22","PSCEV_S04.22","PSQAB_S04.06","PSQAB_S04.07","PSSF_S04.05","PSSD_S04.09","PSSD_S04.10","PSSF_S04.06"]},
+					{"type": "rps", "position": 6664, "name": "RPS_AB04.40", "reverse2d": true, "embedded":["PSOCT_S04.03","PSOCT_S04.04","PSTRCEB_S04.03","PSTRCEB_S04.04","PSB_S04.04","PSB_S04.05","PSB_S04.06"]}
 				]
 			},
 			{
@@ -2622,9 +2624,9 @@
 			{
 				"start": {"x": -2784, "y": -300, "z": 36916},
 				"components": [
-					{"type": "rid", "position": 0, "offset3d": [800, 0, -1200], "name": "RID_AA04.05"},
-					{"type": "rid", "position": 610, "offset3d": [800, 0, -1200], "name": "RID_AA04.10"},
-					{"type": "rid", "position": 1219, "offset3d": [800, 0, -1200], "name": "RID_AA04.15"}
+					{"type": "rid", "position": 0, "offset3d": [800, 0, -1200], "name": "RID_AA04.05", "reverse2d": true},
+					{"type": "rid", "position": 610, "offset3d": [800, 0, -1200], "name": "RID_AA04.10", "reverse2d": true},
+					{"type": "rid", "position": 1219, "offset3d": [800, 0, -1200], "name": "RID_AA04.15", "reverse2d": true}
 				]
 			},
 			{
@@ -2633,8 +2635,8 @@
 			{
 				"start": {"x": 973, "y": -300, "z": 37187},
 				"components": [
-					{"type": "rrf", "position": 0, "name": "RRF_AA04.05", "reverse": true},
-					{"type": "rrf", "position": 650, "name": "RRF_AA04.10", "reverse": true}
+					{"type": "rrf", "position": 0, "name": "RRF_AA04.05", "reverse": true, "reverse2d": true},
+					{"type": "rrf", "position": 650, "name": "RRF_AA04.10", "reverse": true, "reverse2d": true}
 				]
 			},
 			{
@@ -2643,10 +2645,10 @@
 			{
 				"start": {"x": -20653, "y": -300, "z": 26435},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB05.05", "embedded":["PSOCT_S05.02","PSOCT_S05.01","PSTRCEB_S05.01","PSTRCEB_S05.02","PSB_S05.01","PSB_S05.02","PSB_S05.03"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB05.10", "embedded":["PSCFH_S05.01","PSCFV_S05.01","PSCEH_S05.01","PSCEV_S05.01","PSCEH_S05.02","PSCEV_S05.02","PSCEH_S05.03","PSQAB_S05.01","PSQAB_S05.02","PSSF_S05.01","PSSD_S05.01","PSSD_S05.02","PSSF_S05.02"]},
-					{"type": "rps", "position": 1641, "name": "RPS_AB05.15", "embedded":["PSCFH_S05.02","PSCFV_S05.02","PSCEH_S05.05","PSCEV_S05.05","PSCEH_S05.06","PSCEH_S05.06","PSCEH_S05.08","PSCEV_S05.08","PSQAB_S05.03","PSQAB_S05.04","PSQF_S05.01","PSSD_S05.03","PSSD_S05.04","PSSF_S05.03"]},
-					{"type": "rps", "position": 2461, "name": "RPS_AB05.20", "embedded":["PSCFH_S05.03","PSCFV_S05.03","PSQK_S05.01","PSCEV_S05.09","PSCEH_S05.10","PSCEV_S05.10","PSQK_S05.02","PSCEV_S05.11","PSCH_S05.01","PSCV_S05.01","PSQD_S05.01","PSQF_S05.02","PSQD_S05.02","PSSD_S05.05","PSSH_S05.01","PSSH_S05.02"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB05.05", "reverse2d": true, "embedded":["PSOCT_S05.02","PSOCT_S05.01","PSTRCEB_S05.01","PSTRCEB_S05.02","PSB_S05.01","PSB_S05.02","PSB_S05.03"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB05.10", "reverse2d": true, "embedded":["PSCFH_S05.01","PSCFV_S05.01","PSCEH_S05.01","PSCEV_S05.01","PSCEH_S05.02","PSCEV_S05.02","PSCEH_S05.03","PSQAB_S05.01","PSQAB_S05.02","PSSF_S05.01","PSSD_S05.01","PSSD_S05.02","PSSF_S05.02"]},
+					{"type": "rps", "position": 1641, "name": "RPS_AB05.15", "reverse2d": true, "embedded":["PSCFH_S05.02","PSCFV_S05.02","PSCEH_S05.05","PSCEV_S05.05","PSCEH_S05.06","PSCEH_S05.06","PSCEH_S05.08","PSCEV_S05.08","PSQAB_S05.03","PSQAB_S05.04","PSQF_S05.01","PSSD_S05.03","PSSD_S05.04","PSSF_S05.03"]},
+					{"type": "rps", "position": 2461, "name": "RPS_AB05.20", "reverse2d": true, "embedded":["PSCFH_S05.03","PSCFV_S05.03","PSQK_S05.01","PSCEV_S05.09","PSCEH_S05.10","PSCEV_S05.10","PSQK_S05.02","PSCEV_S05.11","PSCH_S05.01","PSCV_S05.01","PSQD_S05.01","PSQF_S05.02","PSQD_S05.02","PSSD_S05.05","PSSH_S05.01","PSSH_S05.02"]}
 				]
 			},
 			{
@@ -2655,10 +2657,10 @@
 			{
 				"start": {"x": -24930, "y": -300, "z": 22447},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB05.25", "embedded":["PSCFH_S05.04","PSCFV_S05.04","PSCH_S05.02","PSCV_S05.02","PSQK_S05.03","PSCEH_S05.13","PSCEV_S05.13","PSQK_S05.04","PSQD_S05.03","PSQF_S05.03","PSQD_S05.04","PSSH_S05.03","PSSH_S05.04","PSSD_S05.06"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB05.30", "embedded":["PSCFH_S05.05","PSCFV_S05.05","PSCEH_S05.15","PSCEV_S05.15","PSCEH_S05.17","PSCEV_S05.17","PSCEH_S05.18","PSCEV_S05.18","PSQD_S05.04","PSQF_S05.04","PSQAB_S05.05","PSSF_S05.04","PSSD_S05.07","PSSD_S05.08"]},
-					{"type": "rps", "position": 1641, "name": "RPS_AB05.35", "embedded":["PSCFH_S05.06","PSCFV_S05.06","PSCEH_S05.20","PSCEV_S05.20","PSCEH_S05.21","PSCEV_S05.21","PSCEH_S05.22","PSCEV_S05.22","PSQAB_S05.06","PSQAB_S05.07","PSSF_S05.05","PSSD_S05.09","PSSD_S05.10","PSSF_S05.06"]},
-					{"type": "rps", "position": 2461, "name": "RPS_AB05.40", "embedded":["PSOCT_S05.03","PSOCT_S05.04","PSTRCEB_S05.03","PSTRCEB_S05.04","PSB_S05.04","PSB_S05.05","PSB_S05.06"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB05.25", "reverse2d": true, "embedded":["PSCFH_S05.04","PSCFV_S05.04","PSCH_S05.02","PSCV_S05.02","PSQK_S05.03","PSCEH_S05.13","PSCEV_S05.13","PSQK_S05.04","PSQD_S05.03","PSQF_S05.03","PSQD_S05.04","PSSH_S05.03","PSSH_S05.04","PSSD_S05.06"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB05.30", "reverse2d": true, "embedded":["PSCFH_S05.05","PSCFV_S05.05","PSCEH_S05.15","PSCEV_S05.15","PSCEH_S05.17","PSCEV_S05.17","PSCEH_S05.18","PSCEV_S05.18","PSQD_S05.04","PSQF_S05.04","PSQAB_S05.05","PSSF_S05.04","PSSD_S05.07","PSSD_S05.08"]},
+					{"type": "rps", "position": 1641, "name": "RPS_AB05.35", "reverse2d": true, "embedded":["PSCFH_S05.06","PSCFV_S05.06","PSCEH_S05.20","PSCEV_S05.20","PSCEH_S05.21","PSCEV_S05.21","PSCEH_S05.22","PSCEV_S05.22","PSQAB_S05.06","PSQAB_S05.07","PSSF_S05.05","PSSD_S05.09","PSSD_S05.10","PSSF_S05.06"]},
+					{"type": "rps", "position": 2461, "name": "RPS_AB05.40", "reverse2d": true, "embedded":["PSOCT_S05.03","PSOCT_S05.04","PSTRCEB_S05.03","PSTRCEB_S05.04","PSB_S05.04","PSB_S05.05","PSB_S05.06"]}
 				]
 			},
 			{
@@ -2679,9 +2681,9 @@
 			{
 				"start": {"x": -22315, "y": -300, "z": 29149},
 				"components": [
-					{"type": "rv", "position": 0, "name": "RV_AA05.05"},
-					{"type": "rv", "position": 810, "name": "RV_AA05.10"},
-					{"type": "rc", "position": 1643, "name": "RCF_AA05.05"}
+					{"type": "rv", "position": 0, "name": "RV_AA05.05", "reverse2d": true},
+					{"type": "rv", "position": 810, "name": "RV_AA05.10", "reverse2d": true},
+					{"type": "rc", "position": 1643, "name": "RCF_AA05.05", "reverse2d": true}
 				]
 			},
 			{
@@ -2690,7 +2692,7 @@
 			{
 				"start": {"x": -19749, "y": -300, "z": 27182},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB05.05"}
+					{"type": "rc", "position": 0, "name": "RC_AB05.05", "reverse2d": true}
 				]
 			},
 			{
@@ -2699,7 +2701,7 @@
 			{
 				"start": {"x": -24169, "y": -300, "z": 23340},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB05.10"}
+					{"type": "rc", "position": 0, "name": "RC_AB05.10", "reverse2d": true}
 				]
 			},
 			{
@@ -2708,10 +2710,10 @@
 			{
 				"start": {"x": -25986, "y": -300, "z": 25986},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AA05.10"},
-					{"type": "rc", "position": 769, "name": "RC_AA05.15"},
-					{"type": "rc", "position": 1539, "name": "RC_AA05.20"},
-					{"type": "rc", "position": 2758, "name": "RC_AA05.25"}
+					{"type": "rc", "position": 0, "name": "RC_AA05.10", "reverse2d": true},
+					{"type": "rc", "position": 769, "name": "RC_AA05.15", "reverse2d": true},
+					{"type": "rc", "position": 1539, "name": "RC_AA05.20", "reverse2d": true},
+					{"type": "rc", "position": 2758, "name": "RC_AA05.25", "reverse2d": true}
 				]
 			},
 			{
@@ -2722,7 +2724,7 @@
 				"components": [
 					{"type": "rc", "position": 0,"offset2d": [0, 500], "reverse": true, "name": "RC_AC05.05"},
 					{"type": "rc", "position": 700,"offset2d": [0, 500], "reverse": true, "name": "RC_AC05.10"},
-					{"type": "rc", "position": 1400,"offset2d": [0, 500], "reverse": true, "name": "RC_AC05.15"}
+					{"type": "rc", "position": 1400,"offset2d": [0, 500], "reverse": true,  "name": "RC_AC05.15"}
 				]
 			},
 			{
@@ -2731,7 +2733,7 @@
 			{
 				"start": {"x": -21638, "y": -300, "z": 29673},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AA05.05"}
+					{"type": "rc", "position": 0, "name": "RC_AA05.05", "reverse2d": true}
 				]
 			},
 			{
@@ -2740,7 +2742,7 @@
 			{
 				"start": {"x": -16798, "y": -300, "z": 32968},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RSHID_AA05.05"}
+					{"type": "rd", "position": 0, "name": "RSHID_AA05.05", "reverse2d": true}
 				]
 			},
 			{
@@ -2749,9 +2751,9 @@
 			{
 				"start": {"x": -24084, "y": -300, "z": 27700},
 				"components": [
-					{"type": "rd", "position": 0 , "name": "RD_AA05.05"},
-					{"type": "rid", "position": 611, "name": "RID_AA05.05"},
-					{"type": "rid", "position": 1222, "name": "RID_AA05.10"}
+					{"type": "rd", "position": 0 , "name": "RD_AA05.05", "reverse2d": true},
+					{"type": "rid", "position": 611, "name": "RID_AA05.05", "reverse2d": true},
+					{"type": "rid", "position": 1222, "name": "RID_AA05.10", "reverse2d": true}
 				]
 			},
 			{
@@ -2760,12 +2762,12 @@
 			{
 				"start": {"x": -27524, "y": -300, "z": 19273},
 				"components": [
-					{"type": "rrf", "position": 0, "name": "RRF_AB05.05"},
-					{"type": "rrf", "position": 650, "name": "RRF_AB05.10"},
-					{"type": "rps", "position": 1759, "name": "RPS_AB06.05", "embedded":["PSOCT_S06.02","PSOCT_S06.01","PSTRCEB_S06.01","PSTRCEB_S06.02","PSB_S06.01","PSB_S06.02","PSB_S06.03"]},
-					{"type": "rps", "position": 2578, "name": "RPS_AB06.10", "embedded":["PSCFH_S06.01","PSCFV_S06.01","PSCEH_S06.01","PSCEV_S06.01","PSCEH_S06.02","PSCEV_S06.02","PSCEH_S06.03","PSQAB_S06.01","PSQAB_S06.02","PSSF_S06.01","PSSD_S06.01","PSSD_S06.02","PSSF_S06.02"]},
-					{"type": "rps", "position": 3399, "name": "RPS_AB06.15", "embedded":["PSCFH_S06.02","PSCFV_S06.02","PSCEH_S06.05","PSCEV_S06.05","PSCEH_S06.06","PSCEH_S06.06","PSCEH_S06.08","PSCEV_S06.08","PSQAB_S06.03","PSQAB_S06.04","PSQF_S06.01","PSSD_S06.03","PSSD_S06.04","PSSF_S06.03"]},
-					{"type": "rps", "position": 4220, "name": "RPS_AB06.20", "embedded":["PSCFH_S06.03","PSCFV_S06.03","PSQK_S06.01","PSCEV_S06.09","PSCEH_S06.10","PSCEV_S06.10","PSQK_S06.02","PSCEV_S06.11","PSCH_S06.01","PSCV_S06.01","PSQD_S06.01","PSQF_S06.02","PSQD_S06.02","PSSD_S06.05","PSSH_S06.01","PSSH_S06.02"]}
+					{"type": "rrf", "position": 0, "name": "RRF_AB05.05", "reverse2d": true},
+					{"type": "rrf", "position": 650, "name": "RRF_AB05.10", "reverse2d": true},
+					{"type": "rps", "position": 1759, "name": "RPS_AB06.05", "reverse2d": true, "embedded":["PSOCT_S06.02","PSOCT_S06.01","PSTRCEB_S06.01","PSTRCEB_S06.02","PSB_S06.01","PSB_S06.02","PSB_S06.03"]},
+					{"type": "rps", "position": 2578, "name": "RPS_AB06.10", "reverse2d": true, "embedded":["PSCFH_S06.01","PSCFV_S06.01","PSCEH_S06.01","PSCEV_S06.01","PSCEH_S06.02","PSCEV_S06.02","PSCEH_S06.03","PSQAB_S06.01","PSQAB_S06.02","PSSF_S06.01","PSSD_S06.01","PSSD_S06.02","PSSF_S06.02"]},
+					{"type": "rps", "position": 3399, "name": "RPS_AB06.15", "reverse2d": true, "embedded":["PSCFH_S06.02","PSCFV_S06.02","PSCEH_S06.05","PSCEV_S06.05","PSCEH_S06.06","PSCEH_S06.06","PSCEH_S06.08","PSCEV_S06.08","PSQAB_S06.03","PSQAB_S06.04","PSQF_S06.01","PSSD_S06.03","PSSD_S06.04","PSSF_S06.03"]},
+					{"type": "rps", "position": 4220, "name": "RPS_AB06.20", "reverse2d": true, "embedded":["PSCFH_S06.03","PSCFV_S06.03","PSQK_S06.01","PSCEV_S06.09","PSCEH_S06.10","PSCEV_S06.10","PSQK_S06.02","PSCEV_S06.11","PSCH_S06.01","PSCV_S06.01","PSQD_S06.01","PSQF_S06.02","PSQD_S06.02","PSSD_S06.05","PSSH_S06.01","PSSH_S06.02"]}
 				]
 			},
 			{
@@ -2774,10 +2776,10 @@
 			{
 				"start": {"x": -32813, "y": -300, "z": 6975},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB06.25", "embedded":["PSCFH_S06.04","PSCFV_S06.04","PSCH_S06.02","PSCV_S06.02","PSQK_S06.03","PSCEH_S06.13","PSCEV_S06.13","PSQK_S06.04","PSQD_S06.03","PSQF_S06.03","PSQD_S06.04","PSSH_S06.03","PSSH_S06.04","PSSD_S06.06"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB06.30", "embedded":["PSCFH_S06.05","PSCFV_S06.05","PSCEH_S06.15","PSCEV_S06.15","PSCEH_S06.17","PSCEV_S06.17","PSCEH_S06.18","PSCEV_S06.18","PSQD_S06.04","PSQF_S06.04","PSQAB_S06.05","PSSF_S06.04","PSSD_S06.07","PSSD_S06.08"]},
-					{"type": "rps", "position": 1641, "name": "RPS_AB06.35", "embedded":["PSCFH_S06.06","PSCFV_S06.06","PSCEH_S06.20","PSCEV_S06.20","PSCEH_S06.21","PSCEV_S06.21","PSCEH_S06.22","PSCEV_S06.22","PSQAB_S06.06","PSQAB_S06.07","PSSF_S06.05","PSSD_S06.09","PSSD_S06.10","PSSF_S06.06"]},
-					{"type": "rps", "position": 2461, "name": "RPS_AB06.40", "embedded":["PSOCT_S06.03","PSOCT_S06.04","PSTRCEB_S06.03","PSTRCEB_S06.04","PSB_S06.04","PSB_S06.05","PSB_S06.06"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB06.25", "reverse2d": true, "embedded":["PSCFH_S06.04","PSCFV_S06.04","PSCH_S06.02","PSCV_S06.02","PSQK_S06.03","PSCEH_S06.13","PSCEV_S06.13","PSQK_S06.04","PSQD_S06.03","PSQF_S06.03","PSQD_S06.04","PSSH_S06.03","PSSH_S06.04","PSSD_S06.06"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB06.30", "reverse2d": true, "embedded":["PSCFH_S06.05","PSCFV_S06.05","PSCEH_S06.15","PSCEV_S06.15","PSCEH_S06.17","PSCEV_S06.17","PSCEH_S06.18","PSCEV_S06.18","PSQD_S06.04","PSQF_S06.04","PSQAB_S06.05","PSSF_S06.04","PSSD_S06.07","PSSD_S06.08"]},
+					{"type": "rps", "position": 1641, "name": "RPS_AB06.35", "reverse2d": true, "embedded":["PSCFH_S06.06","PSCFV_S06.06","PSCEH_S06.20","PSCEV_S06.20","PSCEH_S06.21","PSCEV_S06.21","PSCEH_S06.22","PSCEV_S06.22","PSQAB_S06.06","PSQAB_S06.07","PSSF_S06.05","PSSD_S06.09","PSSD_S06.10","PSSF_S06.06"]},
+					{"type": "rps", "position": 2461, "name": "RPS_AB06.40", "reverse2d": true, "embedded":["PSOCT_S06.03","PSOCT_S06.04","PSTRCEB_S06.03","PSTRCEB_S06.04","PSB_S06.04","PSB_S06.05","PSB_S06.06"]}
 				]
 			},
 			{
@@ -2798,7 +2800,7 @@
 			{
 				"start": {"x": -32601, "y": -300, "z": 8128},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB06.05"}
+					{"type": "rc", "position": 0, "name": "RC_AB06.05", "reverse2d": true}
 				]
 			},
 			{
@@ -2807,7 +2809,7 @@
 			{
 				"start": {"x": -33518, "y": -300, "z": 2343},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB06.10"}
+					{"type": "rc", "position": 0, "name": "RC_AB06.10", "reverse2d": true}
 				]
 			},
 			{
@@ -2816,9 +2818,9 @@
 			{
 				"start": {"x": -36370, "y": -300, "z": 11249},
 				"components": [
-					{"type": "rid", "position": 0,"offset3d": [1100, 0, -500], "name": "RID_AA06.05"},
-					{"type": "rid", "position": 610,"offset3d": [1100, 0, -500], "name": "RID_AA06.10"},
-					{"type": "rid", "position": 1220,"offset3d": [1100, 0, -500], "name": "RID_AA06.15"}
+					{"type": "rid", "position": 0,"offset3d": [1100, 0, -500], "name": "RID_AA06.05", "reverse2d": true},
+					{"type": "rid", "position": 610,"offset3d": [1100, 0, -500], "name": "RID_AA06.10", "reverse2d": true},
+					{"type": "rid", "position": 1220,"offset3d": [1100, 0, -500], "name": "RID_AA06.15", "reverse2d": true}
 				]
 			},
 			{
@@ -2852,10 +2854,10 @@
 			{
 				"start": {"x": -35691, "y": -300, "z": -7198},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RD_AA07.05"},
-					{"type": "rv", "position": 2457, "name": "RV_AA07.05"},
-					{"type": "rv", "position": 1649, "name": "RV_AA07.10"},
-					{"type": "rc", "position": 827, "name": "RCF_AA07.05"}
+					{"type": "rd", "position": 0, "name": "RD_AA07.05", "reverse2d": true},
+					{"type": "rv", "position": 2457, "name": "RV_AA07.05", "reverse2d": true},
+					{"type": "rv", "position": 1649, "name": "RV_AA07.10", "reverse2d": true},
+					{"type": "rc", "position": 827, "name": "RCF_AA07.05", "reverse2d": true}
 				]
 			},
 			{
@@ -3003,11 +3005,11 @@
 			{
 				"start": {"x": -11862, "y": -300, "z": -33941},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RD_AA09.05"},
-					{"type": "rc", "position": 827, "name": "RCF_AA09.05"},
-					{"type": "rv", "position": 1649, "name": "RV_AA09.10"},
-					{"type": "rv", "position": 2456, "name": "RV_AA09.05"},
-					{"type": "rc", "position": 3283, "name": "RC_AA09.05"}
+					{"type": "rd", "position": 0, "name": "RD_AA09.05", "reverse2d": true},
+					{"type": "rc", "position": 827, "name": "RCF_AA09.05", "reverse2d": true},
+					{"type": "rv", "position": 1649, "name": "RV_AA09.10", "reverse2d": true},
+					{"type": "rv", "position": 2456, "name": "RV_AA09.05", "reverse2d": true},
+					{"type": "rc", "position": 3283, "name": "RC_AA09.05", "reverse2d": true}
 				]
 			},
 			{
@@ -3071,10 +3073,10 @@
 			{
 				"start": {"x": 7198, "y": -300, "z": -35490},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RD_AA10.05", "reverse": true},
-					{"type": "rv", "position": 2520, "name": "RV_AA10.05", "reverse": true},
-					{"type": "rv", "position": 1714, "name": "RV_AA10.10", "reverse": true},
-					{"type": "rc", "position": 890, "name": "RCF_AA10.05", "reverse": true}
+					{"type": "rd", "position": 0, "name": "RD_AA10.05", "reverse": true, "reverse2d": true},
+					{"type": "rc", "position": 890, "name": "RCF_AA10.05", "reverse": true, "reverse2d": true},
+					{"type": "rv", "position": 1714, "name": "RV_AA10.10", "reverse": true, "reverse2d": true},
+					{"type": "rv", "position": 2520, "name": "RV_AA10.05", "reverse": true, "reverse2d": true}
 				]
 			},
 			{
@@ -4121,13 +4123,13 @@
 				"start": {"x": 8800, "y": -300, "z": 7520}
 			},
 			{
-				"start": {"x": -12100, "y": -300, "z": 18330},
+				"start": {"x": -13800, "y": -300, "z": 16930},
 				"components": [
 					{"type": "doorpss", "position": 0, "name": "DR_A5.1"}
 				]
 			},
 			{
-				"start": {"x": -20800, "y": -300, "z": 28690} 
+				"start": {"x": -20800, "y": -300, "z": 25690} 
 			},
 			{
 				"start": {"x": -12780, "y": -300, "z": -700},
-- 
GitLab