From 967d6746e2175148ea820bca9c501d74d0479dad Mon Sep 17 00:00:00 2001
From: Lucio Zambon <lucio.zambon@elettra.eu>
Date: Fri, 8 Nov 2024 01:38:36 +0000
Subject: [PATCH] Update elettra2_lattice.json

---
 elettra2_lattice.json | 1331 ++++++++++++++++++++++++-----------------
 1 file changed, 771 insertions(+), 560 deletions(-)

diff --git a/elettra2_lattice.json b/elettra2_lattice.json
index 57b8d39..64a5a95 100644
--- a/elettra2_lattice.json
+++ b/elettra2_lattice.json
@@ -1,5 +1,7 @@
 {
-	
+	"conf": {
+		"modules": ["simulator"]
+	},
 	"preinjector": {
 		"sections": [
 			{
@@ -7,15 +9,15 @@
 				"components": [
 					{"type": "gun", "position": -300, "name": "Gun", "href": "https://puma-01.elettra.eu/spa/index.html?s=preinj_summary"},
 					{"type": "sip", "position": 0, "name": "SIP40_P1.1", "offset2d": [0, 40]},
-					{"type": "lens", "position": 110, "name": "LENS_P1.1", "labelReverse": [270, 900, -70]},
+					{"type": "lens", "position": 110, "name": "LENS_P1.1", "labelReverse": [270, 900, -70], "class": "zoom6"},
 					{"type": "vlv", "position": 190, "name": "VLV_P1.1"},
 					{"type": "cm", "position": 360, "name": "CM_P1.1"},
 					{"type": "sip", "position": 500, "name": "SIP40_P1.2", "offset2d": [0, 40]},
-					{"type": "lens", "position": 600, "name": "LENS_P1.2", "labelReverse": [270, 900, -50]},
-					{"type": "lens", "position": 750, "name": "LENS_P1.3", "labelReverse": [270, 900, -60]},
-					{"type": "lens", "position": 890, "name": "LENS_P1.4", "labelReverse": [270, 900, -50]},
+					{"type": "lens", "position": 600, "name": "LENS_P1.2", "labelReverse": [270, 900, -50], "class": "zoom6"},
+					{"type": "lens", "position": 750, "name": "LENS_P1.3", "labelReverse": [270, 900, -60], "class": "zoom6"},
+					{"type": "lens", "position": 890, "name": "LENS_P1.4", "labelReverse": [270, 900, -50], "class": "zoom6"},
 					{"type": "sip", "position": 1000, "name": "SIP40_P1.3", "offset2d": [0, 40]},
-					{"type": "lens", "position": 1100, "name": "LENS_P1.5", "labelReverse": [270, 900, -100]},
+					{"type": "lens", "position": 1100, "name": "LENS_P1.5", "labelReverse": [270, 900, -100], "class": "zoom6"},
 					{"type": "cm", "position": 1190, "name": "CM_P1.2"},
 					{"type": "quadrupolebooster", "position": 1366, "length": 50, "name": "Q_P1.1"},
 					{"type": "quadrupolebooster", "position": 1649, "length": 50, "name": "Q_P1.2"},
@@ -123,15 +125,6 @@
 				]
 			}
 		],
-		"servicearea": {
-			"sections": [
-				{
-					"start": {"x": -2910, "z": 9230},
-					"components": [
-					]
-				}	
-			]
-		},
 		"bpm": {
 			"orbitconf": "https://pwma-dev.elettra.eu/panther/updater.php?read&filename=preinjector.100.bpm.src",
 			"orbithor": "https://pwma-dev.elettra.eu/panther/updater.php?read&filename=preinjector.100.bpm",
@@ -789,260 +782,6 @@
 			"datasrc": "https://pwma-dev.elettra.eu/rchan.php?json&valueOnly&src=srv-tango-sre-01.ecs.elettra.trieste.it:20000/sa/radio_protection/blmmaster_bts_a11.01/BlmData"
 		}
 	},
-	"servicearea": {
-		"sections": [
-			{
-				"start": {"x": 10000, "z": 18000},
-				"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":[
-						"SPIN_MOD.01","ECLIPSA-1"
-					]},
-					{"type": "rar2", "position": 1200,  "name": "RAR2_PSA1.1", "labelReverse": [270, 2700, -300], "offset2d": [-220, -60], "embedded":[
-					]},					
-					{"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": 6300, "name": "K2", "labelReverse": [270, 2000, -300],  "offset2d": [200, 60],"embedded":[
-					]},
-					{"type": "camod", "position": 7100, "name": "RMDK_PSA1.2", "labelReverse":[270, 3200, -700], "embedded":[
-					]},
-					{"type": "rar2", "position": 8300, "name": "RAR2_PSA1.2", "labelReverse": [270, 2700, -300], "offset2d": [-320, -70], "embedded":[
-					]},
-					{"type": "rar1", "position": 9500, "name": "RAR1_PSA1.2", "labelReverse": [270, 2700, -300], "offset2d": [40, -10],"embedded":[
-						"SPIN_MOD.02","ECLIPSA-2"
-					]},
-					{"type": "rd", "position": 10100, "name": "RGUN", "labelReverse": [270, 2000, -150], "offset2d": [-180, -40],"embedded":[
-						"ECGUNPSA"
-					]},
-					{"type": "donatello", "position": 10400, "name": "FUG", "labelReverse": [270, 2000, -150], "offset2d": [-480, -100],"embedded":[
-					]}
-					
-				]
-			},
-			{
-				"start": {"x": -12500, "z": 14000}
-			},
-			{
-				"start": {"x": -10, "z": 22500},
-				"components": [
-					{"type": "rv", "position": 0, "name": "RV_PSA1.2", "labelReverse": [270, 2500, -310], "embedded":[
-						"PSSIP_PSA1.5","PSSIP55_PTB1.1","PSSIP55_PTB1.3",
-						"PSSIP_PSA1.7","PSSIP55_PTB1.5",
-						"TPG_PSA1.3","GVPE_PTB1.1","VGPI_PTB1.1","VGPE_PTB1.2",
-						"TPG_PSA1.4","GVPE_PTB1.3","VGPI_PTB1.2"
-					]},					
-					{"type": "rv", "position": 800, "name": "RV_PSA1.1", "labelReverse": [270, 2500, -310],"offset2d": [0, 0], "embedded":[
-						"PSSIP_PSA1.1","PSSIP40_P1.1","PSSIP40_P1.3",
-						"PSSIP_PSA1.2","PSSIP40_P1.2","PSSIP40_P1.4",
-						"PSSIP_PSA1.3","PSSIP300_P1.1","PSSIP300_P1.3",
-						"PSSIP_PSA1.4","PSSIP300_P1.2","PSSIP300_P1.4",
-						"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]}	
-				]
-			},
-			{
-				"start": {"x": 4500, "z": 0}
-			},
-			{
-				"start": {"x": -2300, "z": 22000},
-				"components": [
-					{"type": "rps", "position": 0, "name": "RPSP_PSA1.1", "labelReverse": [270, -200, -210], "embedded":[
-						"PSQ_P1.1","PSQ_P1.2","PSQ_P1.3","PSQ_P1.4","PSQ_P1.5","PSQ_P1.6",
-						"PSFCBNCH_P1.1",
-						"PSLENS_P1.1","PSLENS_P1.2","PSLENS_P1.3","PSLENS_P1.4","PSLENS_P1.5"
-					]},					
-					{"type": "rps", "position": 600, "name": "RPSCP_PSA1.1", "labelReverse": [270, -200, -210], "embedded":[
-						"PSCHAS_P1.1","PSCVAS_P1.1","PSCHAS_P1.2","PSCVAS_P1.2","PSCHAS_P1.3","PSCVAS_P1.3","PSCHAS_P1.4","PSCVAS_P1.4",
-						"PSCH_P1.1","PSCV_P1.1","PSCH_P1.2","PSCV_P1.2","PSCHBNCH_P1.1","PSCVBNCH_P1.1"
-					]},
-					{"type": "rc", "position": 1200, "name": "RC_PSA1.1", "labelReverse": [270, -200, -210], "embedded":[
-						"CMMPSPSA-1","ECPSPSA-1"
-					]}	
-				]
-			},
-			{
-				"start": {"x": 2500, "z": 0}
-			},
-			{
-				"start": {"x": -2900, "z": 16200},
-				"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], "reverse": true, "embedded":[
-						"ECFLSCPS","CMMTIMPSA","ECTIMPSA","ECCMPSA"
-					]},	
-					{"type": "rc", "position": 3200, "name": "RP_PSA1.1", "labelReverse": [90, -1350, 400], "reverse": true, "embedded":[
-						"CMMPSPSA-2","ECPSPSA-2","ECRFPSA"
-					]},	
-					{"type": "rps", "position": 3800, "name": "RPSBQPTB_PSA1.1", "labelReverse": [90, -1350, 400], "reverse": true, "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": 4400, "name": "RPSCPTB_PSA1.1", "labelReverse": [90, -1350, 400], "reverse": true, "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": 5000, "name": "RD_PSA1.2", "labelReverse": [90, -1350, 400], "reverse": true, "embedded":[
-						"ECBPMPSA"
-					]}
-				]
-			},
-			{
-				"start": {"x": -8000, "z":39000}
-			},
-			{
-				"start": {"x": -6000, "z": 1500},
-				"components": [
-					{"type": "rrf", "position": -500, "name": "RRFB_BSA1.1", "labelReverse": [270, 2700, -150], "embedded":[
-						"ECRFBSA1"
-					]},
-					{"type": "rrf", "position": 0, "name": "RRFB_BSA1.2", "labelReverse": [270, 2700, -150], "embedded":[
-					]},
-					{"type": "rrf", "position": 500, "name": "RRFB_BSA1.3", "labelReverse": [270, 2700, -150], "embedded":[
-					]},
-					{"type": "zero", "position": 1100,  "name": "INTB_BSA1.1", "labelReverse": [270, 2700, -150], "embedded":[
-						"SPAC_BSA1.1"
-					]},					
-					{"type": "plc", "position": 1100,  "name": "SPAC_BSA1.1", "offset2d": [400, 200], "offset3d": [280, 200, -120], "labelReverse": [270, -500, -150] 
-					},
-					{"type": "zero", "position": 1700, "name": "RSEPTB_BSA1.1", "labelReverse":[270, 2700, -150], "embedded":[
-						""
-					]},
-					{"type": "zero", "position": 2300, "name": "RKICKB_BSA1.1", "labelReverse": [270, 2700, -150], "embedded":[
-						""
-					]},
-					{"type": "rps", "position": 2900, "name": "RPSCB_BSA.01", "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": 3500, "name": "RCB_BSA1.1", "labelReverse":[270, 2700, -150], "embedded":[
-						"ECINJBSA1","ECPSBSA1"
-					]},
-					{"type": "rv", "position": 4300, "name": "RV_BSA1.1", "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",
-						"PSSIP_BSA1.4","PSSIP55_B27.1","PSSIP55_B1.2","PSSIP55_B6.1","PSSIP55_B11.1",
-						"PSSIP_BSA1.5","PSSIP55_B28.1","PSSIP55_B2.1","PSSIP55_B7.1","PSSIP55_B12.1",
-						"PSSIP_BSA1.6","PSSIP55_B28.2","PSSIP55_B3.1","PSSIP55_B8.1","PSSIP55_B13.1",
-						"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": 5000, "name": "RVB_BSA1.2", "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",
-						"TPG_BSA1.4","VGPEKI_B28.1","VGPIKI_B28.1","VGPEKI_B28.2",
-						"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": 5500, "name": "RDB_BSA1.1", "labelReverse": [270, 2700, -150], "embedded":[
-						"EC TIMING"
-					]}
-				]
-			},
-			{
-				"start": {"x": -12500, "z": 1000}
-			},
-			{
-				"start": {"x": -15000, "z": -10000},
-				"components": [
-					{"type": "rpsb", "position": 0, "name": "CABB_BTS2.1", "labelReverse": [270, 3000, -500], "embedded":[
-						""
-					]},
-					{"type": "rpsb", "position": 2000, "name": "CABB_BTS2.2", "labelReverse": [270, 3000, -500], "embedded":[
-						""
-					]},
-					{"type": "rpsq", "position": 4000, "name": "CAQB_BTS2.1", "labelReverse": [270, 3000, -500], "embedded":[
-						""
-					]}
-				]
-			},
-			{
-				"start": {"x": -2500, "z": -18000}
-			},
-			{
-				"start": {"x": -4000, "z": -13500},
-				"components": [
-					{"type": "rps", "position": 0, "name": "RPSQBTS_BSA2.1", "labelReverse": [270, -200, -210], "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", "labelReverse": [270, -200, -210], "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": 1200, "name": "RDB_BSA2.2", "labelReverse": [270, -200, -210], "embedded":[
-					]},
-					{"type": "rps", "position": 1800, "name": "RPSCB_BSA2.2", "labelReverse": [270, -200, -210], "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": 2400, "name": "RBUMP_BSA2.1", "labelReverse": [270, -200, -210], "embedded":[
-						"PSBUMP_B13.1","PSBUMP_B14.1","PSBUMP_B14.2","PSBUMP_B14.3"
-					]},
-					{"type": "rc", "position": 3000, "name": "RCBBSA2.1", "labelReverse": [270, -200, -210], "embedded":[
-						"ECEXTBSA2","ECPSBSA2.1","ECPSBSA2.2"
-					]}
-				]
-			},
-			{
-				"start": {"x": -16500, "z": -13450}
-			},			
-			{
-				"start": {"x": 1000, "z": -13500},
-				"components": [
-					{"type": "rps", "position": 0, "name": "RPSBBTS_BSA2.2", "labelReverse": [270, -200, -210], "embedded":[
-						"PSB_BTS1.3","PDUBTS_BSA2.3"
-					]},					
-					{"type": "rps", "position": 600, "name": "RPSCBTS_BSA2.2", "labelReverse": [270, -200, -210], "embedded":[
-						"PSB_BTS1.1","PDUBTS_BSA2.1","PSB_BTS1.2","PDUBTS_BSA2.2"
-					]}				
-				]
-			},
-			{
-				"start": {"x": -16500, "z": -13450}
-			},
-			{
-				"start": {"x": 9000, "z": -6000},
-				"components": [
-					{"type": "rd", "position": 0, "name": "RDB_BSA3.1", "labelReverse": [270, -200, -210], "reverse": true, "embedded":[
-						"ECSCRBSA3"
-					]},
-					{"type": "rps", "position": 600, "name": "RPSCB_BSA3.1", "labelReverse": [270, -200, -210], "reverse": 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": 1200, "name": "RCB_BSA3.1", "labelReverse": [270, -200, -210], "reverse": true, "embedded":[
-						"ECPSBSA3"
-					]},
-					{"type": "rv", "position": 2000, "name": "RVB_BSA3.2", "labelReverse": [270, -200, -210], "reverse": 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",
-						"TPG_BSA3.2","VGPE_B14.1","VGPI_B14.1","VGPE_B15.1","VGPI_B17.1",
-						"TPG_BSA3.3","VGPEE_B14.1","VGPIE_B14.1","VGPEE_B14.2",
-						"TPG_BSA3.4","VGPE_B18.1","VGPE_B22.1",
-						"TPG_BSA3.5","VGPE_B26.1","VGPI_B24.1",
-						"TPG_BSA3.6","VGPE_BTS1.1","VGPI_BTS1.1","VGPE_BTS1.2","VGPI_BTS1.2",
-						"TPG_BSA3.7","VGPE_BTS1.3"
-					]},
-					{"type": "rv", "position": 2800, "name": "RVB_BSA3.1", "labelReverse": [270, -200, -210], "reverse": 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",
-						"PSSIP_BSA3.4","PSSIP55_B14.1","PSSIP55_B16.1","PSSIP55_B21.1","PSSIP55_B26.1",
-						"PSSIP_BSA3.5","PSSIP55_B14.2","PSSIP55_B17.1","PSSIP55_B22.1","PSSIP55_B27.1",
-						"PSSIP_BSA3.6","PSSIP55_B14.3","PSSIP55_B18.1","PSSIP55_B23.1",
-						"PSSIP_BSA3.7","PSSIP55_B15.1","PSSIP55_B19.1","PSSIP55_B24.1"
-					]}
-				]
-			},
-			{
-				"start": {"x": 6000, "z": -10000}
-			}
-		]
-	},
 	"sr": {
 		"sections": [
 			{
@@ -2345,45 +2084,295 @@
 	"servicearea": {
 		"sections": [
 			{
-				"start": {"x": 33249, "y": -300, "z": 4557},
-				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB01.05" ,"reverse": true, "devices":["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, "devices":["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"]}
-				]
-			},
-			{
-				"start": {"x": 32347, "y": -300, "z": 13533}
-			},
-			{
-				"start": {"x": 32402, "y": -300, "z": 8682},
+				"start": {"x": 12000, "z": 17500},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB01.15" ,"reverse": true, "devices":["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, "devices":["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, "devices":["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, "devices":["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, "devices":["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, "devices":["PSOCT_S01.03","PSOCT_S01.04","PSTRCEB_S01.03","PSTRCEB_S01.04","PSB_S01.04","PSB_S01.05","PSB_S01.06"]}
+					{"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":[
+						"SPIN_MOD.01","ECLIPSA-1"
+					]},
+					{"type": "rar2", "position": 1200,  "name": "RAR2_PSA1.1", "labelReverse": [270, 2700, -300], "offset2d": [-220, -60], "embedded":[
+					]},					
+					{"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": 6300, "name": "K2", "labelReverse": [270, 2000, -300],  "offset2d": [200, 60],"embedded":[
+					]},
+					{"type": "camod", "position": 7100, "name": "RMDK_PSA1.2", "labelReverse":[270, 3200, -700], "embedded":[
+					]},
+					{"type": "rar2", "position": 8300, "name": "RAR2_PSA1.2", "labelReverse": [270, 2700, -300], "offset2d": [-320, -70], "embedded":[
+					]},
+					{"type": "rar1", "position": 9500, "name": "RAR1_PSA1.2", "labelReverse": [270, 2700, -300], "offset2d": [40, -10],"embedded":[
+						"SPIN_MOD.02","ECLIPSA-2"
+					]},
+					{"type": "rd", "position": 10100, "name": "RGUN", "labelReverse": [270, 2000, -150], "offset2d": [-180, -40],"embedded":[
+						"ECGUNPSA"
+					]},
+					{"type": "donatello", "position": 10400, "name": "FUG", "labelReverse": [270, 2000, -150], "offset2d": [-480, -100],"embedded":[
+					]}
+					
 				]
 			},
 			{
-				"start": {"x": 6541, "y": -300, "z": 77278}
+				"start": {"x": -12500, "z": 15000}
 			},
 			{
-				"start": {"x": 32242, "y": -300, "z": 16730},
+				"start": {"x": 1810, "z": 22500},
 				"components": [
-					{"type": "rid", "position": 0, "name": "RSHID_AA02.05" ,"reverse": true, "devices":[]}
-				]
-			},
-			{
+					{"type": "rv", "position": 0, "name": "RV_PSA1.2", "labelReverse": [270, 2500, -310], "embedded":[
+						"PSSIP_PSA1.5","PSSIP55_PTB1.1","PSSIP55_PTB1.3",
+						"PSSIP_PSA1.7","PSSIP55_PTB1.5",
+						"TPG_PSA1.3","GVPE_PTB1.1","VGPI_PTB1.1","VGPE_PTB1.2",
+						"TPG_PSA1.4","GVPE_PTB1.3","VGPI_PTB1.2"
+					]},					
+					{"type": "rv", "position": 800, "name": "RV_PSA1.1", "labelReverse": [270, 2500, -310],"offset2d": [0, 0], "embedded":[
+						"PSSIP_PSA1.1","PSSIP40_P1.1","PSSIP40_P1.3",
+						"PSSIP_PSA1.2","PSSIP40_P1.2","PSSIP40_P1.4",
+						"PSSIP_PSA1.3","PSSIP300_P1.1","PSSIP300_P1.3",
+						"PSSIP_PSA1.4","PSSIP300_P1.2","PSSIP300_P1.4",
+						"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]}	
+				]
+			},
+			{
+				"start": {"x": 4500, "z": 0}
+			},
+			{
+				"start": {"x": -300, "z": 22200},
+				"components": [
+					{"type": "rps", "position": 0, "name": "RPSP_PSA1.1", "labelReverse": [270, -200, -210], "embedded":[
+						"PSQ_P1.1","PSQ_P1.2","PSQ_P1.3","PSQ_P1.4","PSQ_P1.5","PSQ_P1.6",
+						"PSFCBNCH_P1.1",
+						"PSLENS_P1.1","PSLENS_P1.2","PSLENS_P1.3","PSLENS_P1.4","PSLENS_P1.5"
+					]},					
+					{"type": "rps", "position": 700, "name": "RPSCP_PSA1.1", "labelReverse": [270, -200, -210], "embedded":[
+						"PSCHAS_P1.1","PSCVAS_P1.1","PSCHAS_P1.2","PSCVAS_P1.2","PSCHAS_P1.3","PSCVAS_P1.3","PSCHAS_P1.4","PSCVAS_P1.4",
+						"PSCH_P1.1","PSCV_P1.1","PSCH_P1.2","PSCV_P1.2","PSCHBNCH_P1.1","PSCVBNCH_P1.1"
+					]},
+					{"type": "rc", "position": 1400, "name": "RC_PSA1.1", "labelReverse": [270, -200, -210], "embedded":[
+						"CMMPSPSA-1","ECPSPSA-1"
+					]}	
+				]
+			},
+			{
+				"start": {"x": 2500, "z": 0}
+			},
+			{
+				"start": {"x": -1700, "z": 16500},
+				"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], "reverse": true, "embedded":[
+						"ECFLSCPS","CMMTIMPSA","ECTIMPSA","ECCMPSA"
+					]},	
+					{"type": "rc", "position": 3200, "name": "RP_PSA1.1", "labelReverse": [90, -1350, 400], "reverse": true, "embedded":[
+						"CMMPSPSA-2","ECPSPSA-2","ECRFPSA"
+					]},	
+					{"type": "rps", "position": 3900, "name": "RPSBQPTB_PSA1.1", "offset2d": [20, -80], "labelReverse": [90, -1350, 400], "reverse": true, "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], "reverse": true, "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], "reverse": true, "embedded":[
+						"ECBPMPSA"
+					]}
+				]
+			},
+			{
+				"start": {"x": -3800, "z":39000}
+			},
+			{
+				"start": {"x": -6000, "z": 3650},
+				"components": [
+					{"type": "rrf", "position": -500, "name": "RRFB_BSA1.1", "labelReverse": [270, 2700, -150], "embedded":[
+						"ECRFBSA1"
+					]},
+					{"type": "rrf", "position": 0, "name": "RRFB_BSA1.2", "labelReverse": [270, 2700, -150], "embedded":[
+					]},
+					{"type": "rrf", "position": 500, "name": "RRFB_BSA1.3", "labelReverse": [270, 2700, -150], "embedded":[
+					]},
+					{"type": "zero", "position": 1000,  "name": "INTB_BSA1.1", "labelReverse": [270, 2700, -150], "embedded":[
+						"SPAC_BSA1.1"
+					]},					
+					{"type": "plc", "position": 1000,  "name": "SPAC_BSA1.1", "offset2d": [400, 200], "offset3d": [280, 200, -120], "labelReverse": [270, -500, -150] 
+					},
+					{"type": "zero", "position": 1600, "name": "RSEPTB_BSA1.1", "labelReverse":[270, 2700, -150], "embedded":[
+						""
+					]},
+					{"type": "zero", "position": 2200, "name": "RKICKB_BSA1.1", "labelReverse": [270, 2700, -150], "embedded":[
+						""
+					]},
+					{"type": "rps", "position": 2900, "name": "RPSCB_BSA.01", "offset2d": [100, 10], "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], "embedded":[
+						"ECINJBSA1","ECPSBSA1"
+					]},
+					{"type": "rv", "position": 4400, "name": "RV_BSA1.1", "offset2d": [200, 10], "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",
+						"PSSIP_BSA1.4","PSSIP55_B27.1","PSSIP55_B1.2","PSSIP55_B6.1","PSSIP55_B11.1",
+						"PSSIP_BSA1.5","PSSIP55_B28.1","PSSIP55_B2.1","PSSIP55_B7.1","PSSIP55_B12.1",
+						"PSSIP_BSA1.6","PSSIP55_B28.2","PSSIP55_B3.1","PSSIP55_B8.1","PSSIP55_B13.1",
+						"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], "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",
+						"TPG_BSA1.4","VGPEKI_B28.1","VGPIKI_B28.1","VGPEKI_B28.2",
+						"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", "labelReverse": [270, 2700, -150], "embedded":[
+						"EC TIMING"
+					]}
+				]
+			},
+			{
+				"start": {"x": -12500, "z": 3000}
+			},
+			{
+				"start": {"x": -16000, "z": -15000},
+				"components": [
+					{"type": "rpsb", "position": 0, "name": "CABB_BTS2.1", "labelReverse": [270, 3000, -500], "embedded":[
+						""
+					]},
+					{"type": "rpsb", "position": 2000, "name": "CABB_BTS2.2", "labelReverse": [270, 3000, -500], "embedded":[
+						""
+					]},
+					{"type": "rpsq", "position": 4000, "name": "CAQB_BTS2.1", "labelReverse": [270, 3000, -500], "embedded":[
+						""
+					]}
+				]
+			},
+			{
+				"start": {"x": -2500, "z": -23000}
+			},
+			{
+				"start": {"x": -4000, "z": -15800},
+				"components": [
+					{"type": "rps", "position": 0, "name": "RPSQBTS_BSA2.1", "offset2d": [270, 0], "labelReverse": [270, -200, -210], "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":[
+						"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": "rps", "position": 2000, "name": "RPSCB_BSA2.2", "offset2d": [150, 0], "labelReverse": [270, -200, -210], "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":[
+						"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":[
+						"ECEXTBSA2","ECPSBSA2.1","ECPSBSA2.2"
+					]}
+				]
+			},
+			{
+				"start": {"x": -16500, "z": -16950}
+			},			
+			{
+				"start": {"x": 1000, "z": -15300},
+				"components": [
+					{"type": "rps", "position": 0, "name": "RPSBBTS_BSA2.2", "offset2d": [200, 0], "labelReverse": [270, -200, -210], "embedded":[
+						"PSB_BTS1.3","PDUBTS_BSA2.3"
+					]},					
+					{"type": "rps", "position": 600, "name": "RPSCBTS_BSA2.2", "labelReverse": [270, -200, -210], "embedded":[
+						"PSB_BTS1.1","PDUBTS_BSA2.1","PSB_BTS1.2","PDUBTS_BSA2.2"
+					]}				
+				]
+			},
+			{
+				"start": {"x": -16500, "z": -17200}
+			},
+			{
+				"start": {"x": 13000, "z": -9000},
+				"components": [
+					{"type": "rd", "position": 0, "name": "RDB_BSA3.1", "offset2d": [-120, -160], "labelReverse": [270, -200, -210], "reverse": true, "embedded":[
+						"ECSCRBSA3"
+					]},
+					{"type": "rps", "position": 700, "name": "RPSCB_BSA3.1", "offset2d": [-80, -120], "labelReverse": [270, -200, -210], "reverse": 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], "reverse": true, "embedded":[
+						"ECPSBSA3"
+					]},
+					{"type": "rv", "position": 2200, "name": "RVB_BSA3.2", "labelReverse": [270, -200, -210], "reverse": 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",
+						"TPG_BSA3.2","VGPE_B14.1","VGPI_B14.1","VGPE_B15.1","VGPI_B17.1",
+						"TPG_BSA3.3","VGPEE_B14.1","VGPIE_B14.1","VGPEE_B14.2",
+						"TPG_BSA3.4","VGPE_B18.1","VGPE_B22.1",
+						"TPG_BSA3.5","VGPE_B26.1","VGPI_B24.1",
+						"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], "reverse": 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",
+						"PSSIP_BSA3.4","PSSIP55_B14.1","PSSIP55_B16.1","PSSIP55_B21.1","PSSIP55_B26.1",
+						"PSSIP_BSA3.5","PSSIP55_B14.2","PSSIP55_B17.1","PSSIP55_B22.1","PSSIP55_B27.1",
+						"PSSIP_BSA3.6","PSSIP55_B14.3","PSSIP55_B18.1","PSSIP55_B23.1",
+						"PSSIP_BSA3.7","PSSIP55_B15.1","PSSIP55_B19.1","PSSIP55_B24.1"
+					]}
+				]
+			},
+			{
+				"start": {"x": 9000, "z": -13000}
+			},
+			{
+				"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"]}
+				]
+			},
+			{
+				"start": {"x": 32347, "y": -300, "z": 13533}
+			},
+			{
+				"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"]}
+				]
+			},
+			{
+				"start": {"x": 6541, "y": -300, "z": 77278}
+			},
+			{
+				"start": {"x": 32242, "y": -300, "z": 16730},
+				"components": [
+					{"type": "rid", "position": 0, "name": "RSHID_AA02.05" ,"reverse": true}
+				]
+			},
+			{
 				"start": {"x": 33136, "y": -300, "z": 15112}
 			},			
 			{
 				"start": {"x": 36190, "y": -300, "z": 7199},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RD_AA01.05" ,"reverse": true, "devices":[]},
-					{"type": "rv", "position": 2457, "name": "RV_AA01.05" ,"reverse": true, "devices":[]},
-					{"type": "rv", "position": 1649, "name": "RV_AA01.10" ,"reverse": true, "devices":[]},
-					{"type": "rc", "position": 828, "name": "RCF_AA01.05" ,"reverse": true, "devices":[]}
+					{"type": "rd", "position": 0, "name": "RD_AA01.05" ,"reverse": true},
+					{"type": "rv", "position": 2457, "name": "RV_AA01.05" ,"reverse": true},
+					{"type": "rv", "position": 1649, "name": "RV_AA01.10" ,"reverse": true},
+					{"type": "rc", "position": 828, "name": "RCF_AA01.05" ,"reverse": true}
 				]
 			},
 			{
@@ -2392,7 +2381,7 @@
 			{
 				"start": {"x": 33365, "y": -300, "z": 3512},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB01.05" ,"reverse": true, "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AB01.05" ,"reverse": true}
 				]
 			},
 			{
@@ -2401,7 +2390,7 @@
 			{
 				"start": {"x": 31569, "y": -300, "z": 10939},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB01.10" ,"reverse": true, "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AB01.10" ,"reverse": true}
 				]
 			},
 			{
@@ -2410,9 +2399,9 @@
 			{
 				"start": {"x": 37510, "y": -300, "z": 1548},
 				"components": [
-					{"type": "rid", "position": 0, "name": "RID_AA01.05" ,"reverse": true, "devices":[]},
-					{"type": "rid", "position": 610, "name": "RID_AA01.10" ,"reverse": true, "devices":[]},
-					{"type": "rid", "position": 1220, "name": "RID_AA01.15" ,"reverse": true, "devices":[]}
+					{"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}
 				]
 			},
 			{
@@ -2421,10 +2410,10 @@
 			{
 				"start": {"x": 26434, "y": -300, "z": 20653},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB02.05" ,"reverse": true, "devices":["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, "devices":["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, "devices":["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, "devices":["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, "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"]}
 				]
 			},
 			{
@@ -2433,10 +2422,10 @@
 			{
 				"start": {"x": 22446, "y": -300, "z": 24930},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB02.25" ,"reverse": true, "devices":["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, "devices":["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, "devices":["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, "devices":["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, "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"]}
 				]
 			},
 			{
@@ -2445,12 +2434,12 @@
 			{
 				"start": {"x": 26842, "y": -300, "z": 23730},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RD_AA02.05" ,"reverse": true, "devices":[]},
-					{"type": "rc", "position": 953, "name": "RCF_AA02.05" ,"reverse": true, "devices":[]},					
-					{"type": "rv", "position": 1777, "name": "RV_AA02.05" ,"reverse": true, "devices":[]},
-					{"type": "rv", "position": 2585, "name": "RV_AA02.10" ,"reverse": true, "devices":[]},
-					{"type": "rcry", "position": 3791, "name": "RCRY_AA02.10" ,"reverse": true, "devices":[]},
-					{"type": "rcry", "position": 4394, "name": "RCRY_AA02.05" ,"reverse": true, "devices":[]}
+					{"type": "rd", "position": 0, "name": "RD_AA02.05" ,"reverse": true},
+					{"type": "rc", "position": 953, "name": "RCF_AA02.05" ,"reverse": true},					
+					{"type": "rv", "position": 1777, "name": "RV_AA02.05" ,"reverse": true},
+					{"type": "rv", "position": 2585, "name": "RV_AA02.10" ,"reverse": true},
+					{"type": "rcry", "position": 3791, "name": "RCRY_AA02.10" ,"reverse": true},
+					{"type": "rcry", "position": 4394, "name": "RCRY_AA02.05" ,"reverse": true}
 
 				]
 			},
@@ -2460,7 +2449,7 @@
 			{
 				"start": {"x": 27182, "y": -300, "z": 19749},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB02.05" ,"reverse": true, "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AB02.05" ,"reverse": true}
 				]
 			},
 			{
@@ -2469,7 +2458,7 @@
 			{
 				"start": {"x": 23340, "y": -300, "z": 24169},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB02.10" ,"reverse": true, "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AB02.10" ,"reverse": true}
 				]
 			},
 			{
@@ -2478,7 +2467,7 @@
 			{
 				"start": {"x": 32967, "y": -300, "z": 16798},
 				"components": [
-					{"type": "rshid", "position": 0, "name": "RSHID_AA02.05" ,"reverse": true, "devices":[]}
+					{"type": "rshid", "position": 0, "name": "RSHID_AA02.05" ,"reverse": true}
 				]
 			},
 			{
@@ -2487,9 +2476,9 @@
 			{
 				"start": {"x": 27332, "y": -300, "z": 24969},
 				"components": [
-					{"type": "rid", "position": 0, "name": "RID_AA02.05" ,"reverse": true, "devices":[]},
-					{"type": "rid", "position": 610, "name": "RID_AA02.10" ,"reverse": true, "devices":[]},
-					{"type": "rid", "position": 1220, "name": "RID_AA02.15" ,"reverse": true, "devices":[]}
+					{"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}
 				]
 			},
 			{
@@ -2501,10 +2490,10 @@
 			{
 				"start": {"x": 12566, "y": -300, "z": 31103},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB03.05" ,"reverse": true, "devices":["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, "devices":["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, "devices":["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, "devices":["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, "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"]}
 				]
 			},
 			{
@@ -2513,10 +2502,10 @@
 			{
 				"start": {"x": 6974, "y": -300, "z": 32813},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB03.25" ,"reverse": true, "devices":["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, "devices":["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, "devices":["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, "devices":["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, "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"]}
 				]
 			},
 			{
@@ -2525,10 +2514,10 @@
 			{
 				"start": {"x": 11861, "y": -300, "z": 33942},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RD_AA03.05" ,"reverse": true, "devices":[]},
-					{"type": "rv", "position": 2521, "name": "RV_AA03.05" ,"reverse": true, "devices":[]},
-					{"type": "rv", "position": 1713, "name": "RV_AA03.10" ,"reverse": true, "devices":[]},
-					{"type": "rc", "position": 890, "name": "RCF_AA03.05" ,"reverse": true, "devices":[]}
+					{"type": "rd", "position": 0, "name": "RD_AA03.05" ,"reverse": true},
+					{"type": "rv", "position": 2521, "name": "RV_AA03.05" ,"reverse": true},
+					{"type": "rv", "position": 1713, "name": "RV_AA03.10" ,"reverse": true},
+					{"type": "rc", "position": 890, "name": "RCF_AA03.05" ,"reverse": true}
 				]
 			},
 			{
@@ -2537,7 +2526,7 @@
 			{
 				"start": {"x": 13666, "y": -300, "z": 30695},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB03.05" ,"reverse": true, "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AB03.05" ,"reverse": true}
 				]
 			},
 			{
@@ -2546,7 +2535,7 @@
 			{
 				"start": {"x": 8128, "y": -300, "z": 32601},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB03.10" ,"reverse": true, "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AB03.10" ,"reverse": true}
 				]
 			},
 			{
@@ -2555,9 +2544,9 @@
 			{
 				"start": {"x": 11248, "y": -300, "z": 35270},
 				"components": [
-					{"type": "rid", "position": 0, "name": "RID_AA03.05" ,"reverse": true, "devices":[]},
-					{"type": "rid", "position": 610, "name": "RID_AA03.10" ,"reverse": true, "devices":[]},
-					{"type": "rid", "position": 1220, "name": "RID_AA03.15" ,"reverse": true, "devices":[]}
+					{"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}
 				]
 			},
 			{
@@ -2566,11 +2555,11 @@
 			{
 				"start": {"x": 21436, "y": -300, "z": 28718},
 				"components": [
-					{"type": "rcry", "position": 0, "name": "COMCRY_AA02.05" ,"reverse": true, "devices":[]},
-					{"type": "rcry", "position": 603, "name": "COMCRY_AA02.10" ,"reverse": true, "devices":[]},					
-					{"type": "rcry", "position": 1206, "name": "COMCRY_AA02.15" ,"reverse": true, "devices":[]},
-					{"type": "rcry", "position": 1809, "name": "COMCRY_AA02.20" ,"reverse": true, "devices":[]},
-					{"type": "rcry", "position": 2412, "name": "COMCRY_AA02.25" ,"reverse": true, "devices":[]}
+					{"type": "rcry", "position": 0, "name": "COMCRY_AA02.05" ,"reverse": true},
+					{"type": "rcry", "position": 603, "name": "COMCRY_AA02.10" ,"reverse": true},					
+					{"type": "rcry", "position": 1206, "name": "COMCRY_AA02.15" ,"reverse": true},
+					{"type": "rcry", "position": 1809, "name": "COMCRY_AA02.20" ,"reverse": true},
+					{"type": "rcry", "position": 2412, "name": "COMCRY_AA02.25" ,"reverse": true}
 
 				]
 			},
@@ -2580,8 +2569,8 @@
 			{
 				"start": {"x": 19436, "y": -300, "z": 31718},
 				"components": [
-					{"type": "rrf", "position": 0, "name": "RRF_AA03.05" ,"reverse": true, "devices":[]},
-					{"type": "rrf", "position": 649, "name": "RRF_AA03.10" ,"reverse": true, "devices":[]}
+					{"type": "rrf", "position": 0, "name": "RRF_AA03.05" ,"reverse": true},
+					{"type": "rrf", "position": 649, "name": "RRF_AA03.10" ,"reverse": true}
 				]
 			},
 			{
@@ -2590,9 +2579,9 @@
 			{
 				"start": {"x": -4557, "y": -300, "z": 33450},
 				"components": [
-					{"type": "rc", "position": -820, "name": "RC_AB04.05", "devices":[]},
-					{"type": "rps", "position": 0, "name": "RPS_AB04.05", "devices":["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", "devices":["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"},
+					{"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"]}
 				]
 			},
 			{
@@ -2601,13 +2590,13 @@
 			{
 				"start": {"x": -8682, "y": -300, "z": 32653},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB04.15", "devices":["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", "devices":["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", "devices":[]},
-					{"type": "rps", "position": 3397, "name": "RPS_AB04.25", "devices":["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", "devices":["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", "devices":["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", "devices":["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", "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"]}
 				]
 			},
 			{
@@ -2616,10 +2605,10 @@
 			{
 				"start": {"x": -7899, "y": -300, "z": 34491},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RD_AA04.05", "devices":[]},
-					{"type": "rc", "position": 828, "name": "RCF_AA04.05", "devices":[]},
-					{"type": "rv", "position": 2457, "name": "RV_AA04.05", "devices":[]},
-					{"type": "rv", "position": 1649, "name": "RV_AA04.10", "devices":[]}
+					{"type": "rd", "position": 0, "name": "RD_AA04.05"},
+					{"type": "rc", "position": 828, "name": "RCF_AA04.05"},
+					{"type": "rv", "position": 2457, "name": "RV_AA04.05"},
+					{"type": "rv", "position": 1649, "name": "RV_AA04.10"}
 					
 				]
 			},
@@ -2629,9 +2618,9 @@
 			{
 				"start": {"x": -2784, "y": -300, "z": 36916},
 				"components": [
-					{"type": "rid", "position": 0, "name": "RID_AA04.05", "devices":[]},
-					{"type": "rid", "position": 610, "name": "RID_AA04.10", "devices":[]},
-					{"type": "rid", "position": 1219, "name": "RID_AA04.15", "devices":[]}
+					{"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"}
 				]
 			},
 			{
@@ -2640,8 +2629,8 @@
 			{
 				"start": {"x": 973, "y": -300, "z": 37187},
 				"components": [
-					{"type": "rrf", "position": 0, "name": "RRF_AA04.05", "devices":[]},
-					{"type": "rrf", "position": 650, "name": "RRF_AA04.10", "devices":[]}
+					{"type": "rrf", "position": 0, "name": "RRF_AA04.05"},
+					{"type": "rrf", "position": 650, "name": "RRF_AA04.10"}
 				]
 			},
 			{
@@ -2650,10 +2639,10 @@
 			{
 				"start": {"x": -20653, "y": -300, "z": 26435},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB05.05", "devices":["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", "devices":["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", "devices":["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", "devices":["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", "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"]}
 				]
 			},
 			{
@@ -2662,10 +2651,10 @@
 			{
 				"start": {"x": -24930, "y": -300, "z": 22447},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB05.25", "devices":["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", "devices":["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", "devices":["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", "devices":["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", "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"]}
 				]
 			},
 			{
@@ -2674,7 +2663,7 @@
 			{
 				"start": {"x": -15963, "y": -300, "z": 21373},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RD_AC05.05", "devices":[]}
+					{"type": "rd", "position": 0, "name": "RD_AC05.05"}
 				]
 			},
 			{
@@ -2686,9 +2675,9 @@
 			{
 				"start": {"x": -22315, "y": -300, "z": 29149},
 				"components": [
-					{"type": "rv", "position": 0, "name": "RV_AA05.05", "devices":[]},
-					{"type": "rv", "position": 810, "name": "RV_AA05.10", "devices":[]},
-					{"type": "rc", "position": 1643, "name": "RCF_AA05.05", "devices":[]}
+					{"type": "rv", "position": 0, "name": "RV_AA05.05"},
+					{"type": "rv", "position": 810, "name": "RV_AA05.10"},
+					{"type": "rc", "position": 1643, "name": "RCF_AA05.05"}
 				]
 			},
 			{
@@ -2697,7 +2686,7 @@
 			{
 				"start": {"x": -19749, "y": -300, "z": 27182},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB05.05", "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AB05.05"}
 				]
 			},
 			{
@@ -2706,7 +2695,7 @@
 			{
 				"start": {"x": -24169, "y": -300, "z": 23340},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB05.10", "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AB05.10"}
 				]
 			},
 			{
@@ -2715,10 +2704,10 @@
 			{
 				"start": {"x": -25986, "y": -300, "z": 25986},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AA05.10", "devices":[]},
-					{"type": "rc", "position": 769, "name": "RC_AA05.15", "devices":[]},
-					{"type": "rc", "position": 1539, "name": "RC_AA05.20", "devices":[]},
-					{"type": "rc", "position": 2758, "name": "RC_AA05.25", "devices":[]}
+					{"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"}
 				]
 			},
 			{
@@ -2727,9 +2716,9 @@
 			{
 				"start": {"x": -14964, "y": -300, "z": 23718},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AC05.05", "devices":[]},
-					{"type": "rc", "position": 700, "name": "RC_AC05.10", "devices":[]},
-					{"type": "rc", "position": 1400, "name": "RC_AC05.15", "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AC05.05"},
+					{"type": "rc", "position": 700, "name": "RC_AC05.10"},
+					{"type": "rc", "position": 1400, "name": "RC_AC05.15"}
 				]
 			},
 			{
@@ -2738,7 +2727,7 @@
 			{
 				"start": {"x": -21638, "y": -300, "z": 29673},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AA05.05", "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AA05.05"}
 				]
 			},
 			{
@@ -2747,7 +2736,7 @@
 			{
 				"start": {"x": -16798, "y": -300, "z": 32968},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RSHID_AA05.05", "devices":[]}
+					{"type": "rd", "position": 0, "name": "RSHID_AA05.05"}
 				]
 			},
 			{
@@ -2756,9 +2745,9 @@
 			{
 				"start": {"x": -24084, "y": -300, "z": 27700},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RD_AA05.05", "devices":[]},
-					{"type": "rid", "position": 611, "name": "RID_AA05.05", "devices":[]},
-					{"type": "rid", "position": 1222, "name": "RID_AA05.10", "devices":[]}
+					{"type": "rd", "position": 0 , "name": "RD_AA05.05"},
+					{"type": "rid", "position": 611, "name": "RID_AA05.05"},
+					{"type": "rid", "position": 1222, "name": "RID_AA05.10"}
 				]
 			},
 			{
@@ -2767,12 +2756,12 @@
 			{
 				"start": {"x": -27524, "y": -300, "z": 19273},
 				"components": [
-					{"type": "rrf", "position": 0, "name": "RRF_AB05.05", "devices":[]},
-					{"type": "rrf", "position": 650, "name": "RRF_AB05.10", "devices":[]},
-					{"type": "rps", "position": 1759, "name": "RPS_AB06.05", "devices":["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", "devices":["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", "devices":["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", "devices":["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"},
+					{"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"]}
 				]
 			},
 			{
@@ -2781,10 +2770,10 @@
 			{
 				"start": {"x": -32813, "y": -300, "z": 6975},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB06.25", "devices":["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", "devices":["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", "devices":["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", "devices":["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", "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"]}
 				]
 			},
 			{
@@ -2793,10 +2782,10 @@
 			{
 				"start": {"x": -34942, "y": -300, "z": 11862},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RD_AA06.05", "devices":[]},
-					{"type": "rv", "position": 2456, "name": "RV_AA06.05", "devices":[]},
-					{"type": "rv", "position": 1649, "name": "RV_AA06.10", "devices":[]},
-					{"type": "rc", "position": 827, "name": "RCF_AA06.05", "devices":[]}
+					{"type": "rd", "position": 0, "name": "RD_AA06.05"},
+					{"type": "rv", "position": 2456, "name": "RV_AA06.05"},
+					{"type": "rv", "position": 1649, "name": "RV_AA06.10"},
+					{"type": "rc", "position": 827, "name": "RCF_AA06.05"}
 				]
 			},
 			{
@@ -2805,7 +2794,7 @@
 			{
 				"start": {"x": -32601, "y": -300, "z": 8128},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB06.05", "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AB06.05"}
 				]
 			},
 			{
@@ -2814,7 +2803,7 @@
 			{
 				"start": {"x": -33518, "y": -300, "z": 2343},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB06.10", "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AB06.10"}
 				]
 			},
 			{
@@ -2823,9 +2812,9 @@
 			{
 				"start": {"x": -36370, "y": -300, "z": 11249},
 				"components": [
-					{"type": "rid", "position": 0, "name": "RID_AA06.05", "devices":[]},
-					{"type": "rid", "position": 610, "name": "RID_AA06.10", "devices":[]},
-					{"type": "rid", "position": 1220, "name": "RID_AA06.15", "devices":[]}
+					{"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"}
 				]
 			},
 			{
@@ -2834,8 +2823,8 @@
 			{
 				"start": {"x": -33250, "y": -300, "z": -4556},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB07.05", "devices":["PSOCT_S07.02","PSOCT_S07.01","PSTRCEB_S07.01","PSTRCEB_S07.02","PSB_S07.01","PSB_S07.02","PSB_S07.03"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB07.10", "devices":["PSCFH_S07.01","PSCFV_S07.01","PSCEH_S07.01","PSCEV_S07.01","PSCEH_S07.02","PSCEV_S07.02","PSCEH_S07.03","PSQAB_S07.01","PSQAB_S07.02","PSSF_S07.01","PSSD_S07.01","PSSD_S07.02","PSSF_S07.02"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB07.05", "embedded":["PSOCT_S07.02","PSOCT_S07.01","PSTRCEB_S07.01","PSTRCEB_S07.02","PSB_S07.01","PSB_S07.02","PSB_S07.03"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB07.10", "embedded":["PSCFH_S07.01","PSCFV_S07.01","PSCEH_S07.01","PSCEV_S07.01","PSCEH_S07.02","PSCEV_S07.02","PSCEH_S07.03","PSQAB_S07.01","PSQAB_S07.02","PSSF_S07.01","PSSD_S07.01","PSSD_S07.02","PSSF_S07.02"]}
 				]
 			},
 			{
@@ -2844,13 +2833,13 @@
 			{
 				"start": {"x": -32403, "y": -300, "z": -8681},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB07.15", "devices":["PSCFH_S07.02","PSCFV_S07.02","PSCEH_S07.05","PSCEV_S07.05","PSCEH_S07.06","PSCEH_S07.06","PSCEH_S07.08","PSCEV_S07.08","PSQAB_S07.03","PSQAB_S07.04","PSQF_S07.01","PSSD_S07.03","PSSD_S07.04","PSSF_S07.03"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB07.20", "devices":["PSCFH_S07.03","PSCFV_S07.03","PSQK_S07.01","PSCEV_S07.09","PSCEH_S07.10","PSCEV_S07.10","PSQK_S07.02","PSCEV_S07.11","PSCH_S07.01","PSCV_S07.01","PSQD_S07.01","PSQF_S07.02","PSQD_S07.02","PSSD_S07.05","PSSH_S07.01","PSSH_S07.02"]},
-					{"type": "rc", "position": 2200, "name": "RC_AB07.10", "devices":[]},
-					{"type": "rps", "position": 3397, "name": "RPS_AB07.25", "devices":["PSCFH_S07.04","PSCFV_S07.04","PSCH_S07.02","PSCV_S07.02","PSQK_S07.03","PSCEH_S07.13","PSCEV_S07.13","PSQK_S07.04","PSQD_S07.03","PSQF_S07.03","PSQD_S07.04","PSSH_S07.03","PSSH_S07.04","PSSD_S07.06"]},
-					{"type": "rps", "position": 4217, "name": "RPS_AB07.30", "devices":["PSCFH_S07.05","PSCFV_S07.05","PSCEH_S07.15","PSCEV_S07.15","PSCEH_S07.17","PSCEV_S07.17","PSCEH_S07.18","PSCEV_S07.18","PSQD_S07.04","PSQF_S07.04","PSQAB_S07.05","PSSF_S07.04","PSSD_S07.07","PSSD_S07.08"]},
-					{"type": "rps", "position": 5848, "name": "RPS_AB07.35", "devices":["PSCFH_S07.06","PSCFV_S07.06","PSCEH_S07.20","PSCEV_S07.20","PSCEH_S07.21","PSCEV_S07.21","PSCEH_S07.22","PSCEV_S07.22","PSQAB_S07.06","PSQAB_S07.07","PSSF_S07.05","PSSD_S07.09","PSSD_S07.10","PSSF_S07.06"]},
-					{"type": "rps", "position": 6664, "name": "RPS_AB07.40", "devices":["PSOCT_S07.03","PSOCT_S07.04","PSTRCEB_S07.03","PSTRCEB_S07.04","PSB_S07.04","PSB_S07.05","PSB_S07.06"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB07.15", "embedded":["PSCFH_S07.02","PSCFV_S07.02","PSCEH_S07.05","PSCEV_S07.05","PSCEH_S07.06","PSCEH_S07.06","PSCEH_S07.08","PSCEV_S07.08","PSQAB_S07.03","PSQAB_S07.04","PSQF_S07.01","PSSD_S07.03","PSSD_S07.04","PSSF_S07.03"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB07.20", "embedded":["PSCFH_S07.03","PSCFV_S07.03","PSQK_S07.01","PSCEV_S07.09","PSCEH_S07.10","PSCEV_S07.10","PSQK_S07.02","PSCEV_S07.11","PSCH_S07.01","PSCV_S07.01","PSQD_S07.01","PSQF_S07.02","PSQD_S07.02","PSSD_S07.05","PSSH_S07.01","PSSH_S07.02"]},
+					{"type": "rc", "position": 2200, "name": "RC_AB07.10"},
+					{"type": "rps", "position": 3397, "name": "RPS_AB07.25", "embedded":["PSCFH_S07.04","PSCFV_S07.04","PSCH_S07.02","PSCV_S07.02","PSQK_S07.03","PSCEH_S07.13","PSCEV_S07.13","PSQK_S07.04","PSQD_S07.03","PSQF_S07.03","PSQD_S07.04","PSSH_S07.03","PSSH_S07.04","PSSD_S07.06"]},
+					{"type": "rps", "position": 4217, "name": "RPS_AB07.30", "embedded":["PSCFH_S07.05","PSCFV_S07.05","PSCEH_S07.15","PSCEV_S07.15","PSCEH_S07.17","PSCEV_S07.17","PSCEH_S07.18","PSCEV_S07.18","PSQD_S07.04","PSQF_S07.04","PSQAB_S07.05","PSSF_S07.04","PSSD_S07.07","PSSD_S07.08"]},
+					{"type": "rps", "position": 5848, "name": "RPS_AB07.35", "embedded":["PSCFH_S07.06","PSCFV_S07.06","PSCEH_S07.20","PSCEV_S07.20","PSCEH_S07.21","PSCEV_S07.21","PSCEH_S07.22","PSCEV_S07.22","PSQAB_S07.06","PSQAB_S07.07","PSSF_S07.05","PSSD_S07.09","PSSD_S07.10","PSSF_S07.06"]},
+					{"type": "rps", "position": 6664, "name": "RPS_AB07.40", "embedded":["PSOCT_S07.03","PSOCT_S07.04","PSTRCEB_S07.03","PSTRCEB_S07.04","PSB_S07.04","PSB_S07.05","PSB_S07.06"]}
 				]
 			},
 			{
@@ -2859,10 +2848,10 @@
 			{
 				"start": {"x": -35691, "y": -300, "z": -7198},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RD_AA07.05", "devices":[]},
-					{"type": "rv", "position": 2457, "name": "RV_AA07.05", "devices":[]},
-					{"type": "rv", "position": 1649, "name": "RV_AA07.10", "devices":[]},
-					{"type": "rc", "position": 827, "name": "RCF_AA07.05", "devices":[]}
+					{"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"}
 				]
 			},
 			{
@@ -2871,7 +2860,7 @@
 			{
 				"start": {"x": -33415, "y": -300, "z": -3512},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB07.05", "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AB07.05"}
 				]
 			},
 			{
@@ -2880,7 +2869,7 @@
 			{
 				"start": {"x": -37450, "y": -300, "z": 337},
 				"components": [
-					{"type": "rid", "position": 0, "name": "RSHID_AA07.05", "devices":[]}
+					{"type": "rid", "position": 0,"offset3d": [1100, 0, -500], "name": "RSHID_AA07.05"}
 				]
 			},
 			{
@@ -2889,8 +2878,8 @@
 			{
 				"start": {"x": -37356, "y": -300, "z": -2325},
 				"components": [
-					{"type": "rid", "position": 0, "name": "RID_AA07.05", "devices":[]},
-					{"type": "rid", "position": 603, "name": "RID_AA07.10", "devices":[]}
+					{"type": "rid", "position": 0,"offset3d": [1100, 0, -500], "name": "RID_AA07.05"},
+					{"type": "rid", "position": 603,"offset3d": [1100, 0, -500], "name": "RID_AA07.10"}
 				]
 			},
 			{
@@ -2899,10 +2888,10 @@
 			{
 				"start": {"x": -33966, "y": -300, "z": -15579},
 				"components": [
-					{"type": "rcry", "position": 0, "name": "RCRY_AA08.05", "devices":[]},
-					{"type": "rcry", "position": 610, "name": "RCRY_AA08.10", "devices":[]},
-					{"type": "rcry", "position": 1830, "name": "COMCRY_AA08.10", "devices":[]},
-					{"type": "rcry", "position": 2440, "name": "COMCRY_AA08_AA08.05", "devices":[]}
+					{"type": "rcry", "position": 0, "name": "RCRY_AA08.05"},
+					{"type": "rcry", "position": 610, "name": "RCRY_AA08.10"},
+					{"type": "rcry", "position": 1830, "name": "COMCRY_AA08.10"},
+					{"type": "rcry", "position": 2440, "name": "COMCRY_AA08_AA08.05"}
 				]
 			},
 			{
@@ -2911,10 +2900,10 @@
 			{
 				"start": {"x": -26435, "y": -300, "z": -20652},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB08.05", "devices":["PSOCT_S08.02","PSOCT_S08.01","PSTRCEB_S08.01","PSTRCEB_S08.02","PSB_S08.01","PSB_S08.02","PSB_S08.03"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB08.10", "devices":["PSCFH_S08.01","PSCFV_S08.01","PSCEH_S08.01","PSCEV_S08.01","PSCEH_S08.02","PSCEV_S08.02","PSCEH_S08.03","PSQAB_S08.01","PSQAB_S08.02","PSSF_S08.01","PSSD_S08.01","PSSD_S08.02","PSSF_S08.02"]},
-					{"type": "rps", "position": 1641, "name": "RPS_AB08.15", "devices":["PSCFH_S08.02","PSCFV_S08.02","PSCEH_S08.05","PSCEV_S08.05","PSCEH_S08.06","PSCEH_S08.06","PSCEH_S08.08","PSCEV_S08.08","PSQAB_S08.03","PSQAB_S08.04","PSQF_S08.01","PSSD_S08.03","PSSD_S08.04","PSSF_S08.03"]},
-					{"type": "rps", "position": 2461, "name": "RPS_AB08.20", "devices":["PSCFH_S08.03","PSCFV_S08.03","PSQK_S08.01","PSCEV_S08.09","PSCEH_S08.10","PSCEV_S08.10","PSQK_S08.02","PSCEV_S08.11","PSCH_S08.01","PSCV_S08.01","PSQD_S08.01","PSQF_S08.02","PSQD_S08.02","PSSD_S08.05","PSSH_S08.01","PSSH_S08.02"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB08.05", "embedded":["PSOCT_S08.02","PSOCT_S08.01","PSTRCEB_S08.01","PSTRCEB_S08.02","PSB_S08.01","PSB_S08.02","PSB_S08.03"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB08.10", "embedded":["PSCFH_S08.01","PSCFV_S08.01","PSCEH_S08.01","PSCEV_S08.01","PSCEH_S08.02","PSCEV_S08.02","PSCEH_S08.03","PSQAB_S08.01","PSQAB_S08.02","PSSF_S08.01","PSSD_S08.01","PSSD_S08.02","PSSF_S08.02"]},
+					{"type": "rps", "position": 1641, "name": "RPS_AB08.15", "embedded":["PSCFH_S08.02","PSCFV_S08.02","PSCEH_S08.05","PSCEV_S08.05","PSCEH_S08.06","PSCEH_S08.06","PSCEH_S08.08","PSCEV_S08.08","PSQAB_S08.03","PSQAB_S08.04","PSQF_S08.01","PSSD_S08.03","PSSD_S08.04","PSSF_S08.03"]},
+					{"type": "rps", "position": 2461, "name": "RPS_AB08.20", "embedded":["PSCFH_S08.03","PSCFV_S08.03","PSQK_S08.01","PSCEV_S08.09","PSCEH_S08.10","PSCEV_S08.10","PSQK_S08.02","PSCEV_S08.11","PSCH_S08.01","PSCV_S08.01","PSQD_S08.01","PSQF_S08.02","PSQD_S08.02","PSSD_S08.05","PSSH_S08.01","PSSH_S08.02"]}
 				]
 			},
 			{
@@ -2923,10 +2912,10 @@
 			{
 				"start": {"x": -22447, "y": -300, "z": -24929},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB08.25", "devices":["PSCFH_S08.04","PSCFV_S08.04","PSCH_S08.02","PSCV_S08.02","PSQK_S08.03","PSCEH_S08.13","PSCEV_S08.13","PSQK_S08.04","PSQD_S08.03","PSQF_S08.03","PSQD_S08.04","PSSH_S08.03","PSSH_S08.04","PSSD_S08.06"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB08.30", "devices":["PSCFH_S08.05","PSCFV_S08.05","PSCEH_S08.15","PSCEV_S08.15","PSCEH_S08.17","PSCEV_S08.17","PSCEH_S08.18","PSCEV_S08.18","PSQD_S08.04","PSQF_S08.04","PSQAB_S08.05","PSSF_S08.04","PSSD_S08.07","PSSD_S08.08"]},
-					{"type": "rps", "position": 1641, "name": "RPS_AB08.35", "devices":["PSCFH_S08.06","PSCFV_S08.06","PSCEH_S08.20","PSCEV_S08.20","PSCEH_S08.21","PSCEV_S08.21","PSCEH_S08.22","PSCEV_S08.22","PSQAB_S08.06","PSQAB_S08.07","PSSF_S08.05","PSSD_S08.09","PSSD_S08.10","PSSF_S08.06"]},
-					{"type": "rps", "position": 2461, "name": "RPS_AB08.40", "devices":["PSOCT_S08.03","PSOCT_S08.04","PSTRCEB_S08.03","PSTRCEB_S08.04","PSB_S08.04","PSB_S08.05","PSB_S08.06"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB08.25", "embedded":["PSCFH_S08.04","PSCFV_S08.04","PSCH_S08.02","PSCV_S08.02","PSQK_S08.03","PSCEH_S08.13","PSCEV_S08.13","PSQK_S08.04","PSQD_S08.03","PSQF_S08.03","PSQD_S08.04","PSSH_S08.03","PSSH_S08.04","PSSD_S08.06"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB08.30", "embedded":["PSCFH_S08.05","PSCFV_S08.05","PSCEH_S08.15","PSCEV_S08.15","PSCEH_S08.17","PSCEV_S08.17","PSCEH_S08.18","PSCEV_S08.18","PSQD_S08.04","PSQF_S08.04","PSQAB_S08.05","PSSF_S08.04","PSSD_S08.07","PSSD_S08.08"]},
+					{"type": "rps", "position": 1641, "name": "RPS_AB08.35", "embedded":["PSCFH_S08.06","PSCFV_S08.06","PSCEH_S08.20","PSCEV_S08.20","PSCEH_S08.21","PSCEV_S08.21","PSCEH_S08.22","PSCEV_S08.22","PSQAB_S08.06","PSQAB_S08.07","PSSF_S08.05","PSSD_S08.09","PSSD_S08.10","PSSF_S08.06"]},
+					{"type": "rps", "position": 2461, "name": "RPS_AB08.40", "embedded":["PSOCT_S08.03","PSOCT_S08.04","PSTRCEB_S08.03","PSTRCEB_S08.04","PSB_S08.04","PSB_S08.05","PSB_S08.06"]}
 				]
 			},
 			{
@@ -2935,8 +2924,8 @@
 			{
 				"start": {"x": -28164, "y": -300, "z": -23841},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RD_AA08.05", "devices":[]},
-					{"type": "rd", "position": 645, "name": "RD_AA08.10", "devices":[]}
+					{"type": "rd", "position": 0, "name": "RD_AA08.05"},
+					{"type": "rd", "position": 645, "name": "RD_AA08.10"}
 				]
 			},
 			{
@@ -2945,9 +2934,9 @@
 			{
 				"start": {"x": -29534, "y": -300, "z": -21802},
 				"components": [
-					{"type": "rv", "position": 0, "name": "RV_AA08.05", "devices":[]},
-					{"type": "rv", "position": 810, "name": "RV_AA08.10", "devices":[]},
-					{"type": "rc", "position": 1643, "name": "RCF_AA08.05", "devices":[]}
+					{"type": "rv", "position": 0, "name": "RV_AA08.05"},
+					{"type": "rv", "position": 810, "name": "RV_AA08.10"},
+					{"type": "rc", "position": 1643, "name": "RCF_AA08.05"}
 				]
 			},
 			{
@@ -2956,7 +2945,7 @@
 			{
 				"start": {"x": -27182, "y": -300, "z": -19749},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB08.05", "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AB08.05"}
 				]
 			},
 			{
@@ -2965,7 +2954,7 @@
 			{
 				"start": {"x": -23340, "y": -300, "z": -24169},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB08.10", "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AB08.10"}
 				]
 			},
 			{
@@ -2974,9 +2963,9 @@
 			{
 				"start": {"x": -27333, "y": -300, "z": -24968},
 				"components": [
-					{"type": "rid", "position": 0, "name": "RID_AA08.05", "devices":[]},
-					{"type": "rid", "position": 610, "name": "RID_AA08.10", "devices":[]},
-					{"type": "rid", "position": 1220, "name": "RID_AA08.15", "devices":[]}
+					{"type": "rid", "position": 0, "name": "RID_AA08.05"},
+					{"type": "rid", "position": 610, "name": "RID_AA08.10"},
+					{"type": "rid", "position": 1220, "name": "RID_AA08.15"}
 				]
 			},
 			{
@@ -2985,11 +2974,11 @@
 			{
 				"start": {"x": -12567, "y": -300, "z": -31102},
 				"components": [
-					{"type": "rc", "position": -820, "name": "RC_AB09.05", "devices":[]},
-					{"type": "rps", "position": 0, "name": "RPS_AB09.05", "devices":["PSOCT_S09.02","PSOCT_S09.01","PSTRCEB_S09.01","PSTRCEB_S09.02","PSB_S09.01","PSB_S09.02","PSB_S09.03"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB09.10", "devices":["PSCFH_S09.01","PSCFV_S09.01","PSCEH_S09.01","PSCEV_S09.01","PSCEH_S09.02","PSCEV_S09.02","PSCEH_S09.03","PSQAB_S09.01","PSQAB_S09.02","PSSF_S09.01","PSSD_S09.01","PSSD_S09.02","PSSF_S09.02"]},
-					{"type": "rps", "position": 1641, "name": "RPS_AB09.15", "devices":["PSCFH_S09.02","PSCFV_S09.02","PSCEH_S09.05","PSCEV_S09.05","PSCEH_S09.06","PSCEH_S09.06","PSCEH_S09.08","PSCEV_S09.08","PSQAB_S09.03","PSQAB_S09.04","PSQF_S09.01","PSSD_S09.03","PSSD_S09.04","PSSF_S09.03"]},
-					{"type": "rps", "position": 2461, "name": "RPS_AB09.20", "devices":["PSCFH_S09.03","PSCFV_S09.03","PSQK_S09.01","PSCEV_S09.09","PSCEH_S09.10","PSCEV_S09.10","PSQK_S09.02","PSCEV_S09.11","PSCH_S09.01","PSCV_S09.01","PSQD_S09.01","PSQF_S09.02","PSQD_S09.02","PSSD_S09.05","PSSH_S09.01","PSSH_S09.02"]}
+					{"type": "rc", "position": -820, "name": "RC_AB09.05"},
+					{"type": "rps", "position": 0, "name": "RPS_AB09.05", "embedded":["PSOCT_S09.02","PSOCT_S09.01","PSTRCEB_S09.01","PSTRCEB_S09.02","PSB_S09.01","PSB_S09.02","PSB_S09.03"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB09.10", "embedded":["PSCFH_S09.01","PSCFV_S09.01","PSCEH_S09.01","PSCEV_S09.01","PSCEH_S09.02","PSCEV_S09.02","PSCEH_S09.03","PSQAB_S09.01","PSQAB_S09.02","PSSF_S09.01","PSSD_S09.01","PSSD_S09.02","PSSF_S09.02"]},
+					{"type": "rps", "position": 1641, "name": "RPS_AB09.15", "embedded":["PSCFH_S09.02","PSCFV_S09.02","PSCEH_S09.05","PSCEV_S09.05","PSCEH_S09.06","PSCEH_S09.06","PSCEH_S09.08","PSCEV_S09.08","PSQAB_S09.03","PSQAB_S09.04","PSQF_S09.01","PSSD_S09.03","PSSD_S09.04","PSSF_S09.03"]},
+					{"type": "rps", "position": 2461, "name": "RPS_AB09.20", "embedded":["PSCFH_S09.03","PSCFV_S09.03","PSQK_S09.01","PSCEV_S09.09","PSCEH_S09.10","PSCEV_S09.10","PSQK_S09.02","PSCEV_S09.11","PSCH_S09.01","PSCV_S09.01","PSQD_S09.01","PSQF_S09.02","PSQD_S09.02","PSSD_S09.05","PSSH_S09.01","PSSH_S09.02"]}
 				]
 			},
 			{
@@ -2998,10 +2987,10 @@
 			{
 				"start": {"x": -6975, "y": -300, "z": -32812},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB09.25", "devices":["PSCFH_S09.04","PSCFV_S09.04","PSCH_S09.02","PSCV_S09.02","PSQK_S09.03","PSCEH_S09.13","PSCEV_S09.13","PSQK_S09.04","PSQD_S09.03","PSQF_S09.03","PSQD_S09.04","PSSH_S09.03","PSSH_S09.04","PSSD_S09.06"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB09.30", "devices":["PSCFH_S09.05","PSCFV_S09.05","PSCEH_S09.15","PSCEV_S09.15","PSCEH_S09.17","PSCEV_S09.17","PSCEH_S09.18","PSCEV_S09.18","PSQD_S09.04","PSQF_S09.04","PSQAB_S09.05","PSSF_S09.04","PSSD_S09.07","PSSD_S09.08"]},
-					{"type": "rps", "position": 1641, "name": "RPS_AB09.35", "devices":["PSCFH_S09.06","PSCFV_S09.06","PSCEH_S09.20","PSCEV_S09.20","PSCEH_S09.21","PSCEV_S09.21","PSCEH_S09.22","PSCEV_S09.22","PSQAB_S09.06","PSQAB_S09.07","PSSF_S09.05","PSSD_S09.09","PSSD_S09.10","PSSF_S09.06"]},
-					{"type": "rps", "position": 2461, "name": "RPS_AB09.40", "devices":["PSOCT_S09.03","PSOCT_S09.04","PSTRCEB_S09.03","PSTRCEB_S09.04","PSB_S09.04","PSB_S09.05","PSB_S09.06"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB09.25", "embedded":["PSCFH_S09.04","PSCFV_S09.04","PSCH_S09.02","PSCV_S09.02","PSQK_S09.03","PSCEH_S09.13","PSCEV_S09.13","PSQK_S09.04","PSQD_S09.03","PSQF_S09.03","PSQD_S09.04","PSSH_S09.03","PSSH_S09.04","PSSD_S09.06"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB09.30", "embedded":["PSCFH_S09.05","PSCFV_S09.05","PSCEH_S09.15","PSCEV_S09.15","PSCEH_S09.17","PSCEV_S09.17","PSCEH_S09.18","PSCEV_S09.18","PSQD_S09.04","PSQF_S09.04","PSQAB_S09.05","PSSF_S09.04","PSSD_S09.07","PSSD_S09.08"]},
+					{"type": "rps", "position": 1641, "name": "RPS_AB09.35", "embedded":["PSCFH_S09.06","PSCFV_S09.06","PSCEH_S09.20","PSCEV_S09.20","PSCEH_S09.21","PSCEV_S09.21","PSCEH_S09.22","PSCEV_S09.22","PSQAB_S09.06","PSQAB_S09.07","PSSF_S09.05","PSSD_S09.09","PSSD_S09.10","PSSF_S09.06"]},
+					{"type": "rps", "position": 2461, "name": "RPS_AB09.40", "embedded":["PSOCT_S09.03","PSOCT_S09.04","PSTRCEB_S09.03","PSTRCEB_S09.04","PSB_S09.04","PSB_S09.05","PSB_S09.06"]}
 				]
 			},
 			{
@@ -3010,11 +2999,11 @@
 			{
 				"start": {"x": -11862, "y": -300, "z": -33941},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RD_AA09.05", "devices":[]},
-					{"type": "rc", "position": 827, "name": "RCF_AA09.05", "devices":[]},
-					{"type": "rv", "position": 1649, "name": "RV_AA09.10", "devices":[]},
-					{"type": "rv", "position": 2456, "name": "RV_AA09.05", "devices":[]},
-					{"type": "rc", "position": 3283, "name": "RC_AA09.05", "devices":[]}
+					{"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"}
 				]
 			},
 			{
@@ -3023,7 +3012,7 @@
 			{
 				"start": {"x": -8128, "y": -300, "z": -32601},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB09.10", "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AB09.10"}
 				]
 			},
 			{
@@ -3032,9 +3021,9 @@
 			{
 				"start": {"x": -11249, "y": -300, "z": -35469},
 				"components": [
-					{"type": "rid", "position": 0, "name": "RID_AA09.05", "devices":[]},
-					{"type": "rid", "position": 610, "name": "RID_AA09.10", "devices":[]},
-					{"type": "rid", "position": 1220, "name": "RID_AA09.15", "devices":[]}
+					{"type": "rid", "position": 0,"offset3d": [1800, 0, 500], "name": "RID_AA09.05"},
+					{"type": "rid", "position": 610,"offset3d": [1800, 0, 500], "name": "RID_AA09.10"},
+					{"type": "rid", "position": 1220,"offset3d": [1800, 0, 500], "name": "RID_AA09.15"}
 				]
 			},
 			{
@@ -3043,8 +3032,8 @@
 			{
 				"start": {"x": -19436, "y": -300, "z": -31718},
 				"components": [
-					{"type": "rrf", "position": 0, "name": "RRF_AA09.05", "devices":[]},
-					{"type": "rrf", "position": 649, "name": "RRF_AA09.10", "devices":[]}
+					{"type": "rrf", "position": 0, "name": "RRF_AA09.05"},
+					{"type": "rrf", "position": 649, "name": "RRF_AA09.10"}
 				]
 			},
 			{
@@ -3053,8 +3042,8 @@
 			{
 				"start": {"x": 4556, "y": -300, "z": -33249},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB10.05" ,"reverse": true, "devices":["PSOCT_S10.02","PSOCT_S10.01","PSTRCEB_S10.01","PSTRCEB_S10.02","PSB_S10.01","PSB_S10.02","PSB_S10.03"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB10.10" ,"reverse": true, "devices":["PSCFH_S10.01","PSCFV_S10.01","PSCEH_S10.01","PSCEV_S10.01","PSCEH_S10.02","PSCEV_S10.02","PSCEH_S10.03","PSQAB_S10.01","PSQAB_S10.02","PSSF_S10.01","PSSD_S10.01","PSSD_S10.02","PSSF_S10.02"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB10.05" ,"reverse": true, "embedded":["PSOCT_S10.02","PSOCT_S10.01","PSTRCEB_S10.01","PSTRCEB_S10.02","PSB_S10.01","PSB_S10.02","PSB_S10.03"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB10.10" ,"reverse": true, "embedded":["PSCFH_S10.01","PSCFV_S10.01","PSCEH_S10.01","PSCEV_S10.01","PSCEH_S10.02","PSCEV_S10.02","PSCEH_S10.03","PSQAB_S10.01","PSQAB_S10.02","PSSF_S10.01","PSSD_S10.01","PSSD_S10.02","PSSF_S10.02"]}
 				]
 			},
 			{
@@ -3063,13 +3052,13 @@
 			{
 				"start": {"x": 8681, "y": -300, "z": -32402},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB10.15" ,"reverse": true, "devices":["PSCFH_S10.02","PSCFV_S10.02","PSCEH_S10.05","PSCEV_S10.05","PSCEH_S10.06","PSCEH_S10.06","PSCEH_S10.08","PSCEV_S10.08","PSQAB_S10.03","PSQAB_S10.04","PSQF_S10.01","PSSD_S10.03","PSSD_S10.04","PSSF_S10.03"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB10.20" ,"reverse": true, "devices":["PSCFH_S10.03","PSCFV_S10.03","PSQK_S10.01","PSCEV_S10.09","PSCEH_S10.10","PSCEV_S10.10","PSQK_S10.02","PSCEV_S10.11","PSCH_S10.01","PSCV_S10.01","PSQD_S10.01","PSQF_S10.02","PSQD_S10.02","PSSD_S10.05","PSSH_S10.01","PSSH_S10.02"]},
-					{"type": "rc", "position": 2400, "name": "RC_AB10.10" ,"reverse": true, "devices":[]},
-					{"type": "rps", "position": 3397, "name": "RPS_AB10.25" ,"reverse": true, "devices":["PSCFH_S10.04","PSCFV_S10.04","PSCH_S10.02","PSCV_S10.02","PSQK_S10.03","PSCEH_S10.13","PSCEV_S10.13","PSQK_S10.04","PSQD_S10.03","PSQF_S10.03","PSQD_S10.04","PSSH_S10.03","PSSH_S10.04","PSSD_S10.06"]},
-					{"type": "rps", "position": 4217, "name": "RPS_AB10.30" ,"reverse": true, "devices":["PSCFH_S10.05","PSCFV_S10.05","PSCEH_S10.15","PSCEV_S10.15","PSCEH_S10.17","PSCEV_S10.17","PSCEH_S10.18","PSCEV_S10.18","PSQD_S10.04","PSQF_S10.04","PSQAB_S10.05","PSSF_S10.04","PSSD_S10.07","PSSD_S10.08"]},
-					{"type": "rps", "position": 5648, "name": "RPS_AB10.35" ,"reverse": true, "devices":["PSCFH_S10.06","PSCFV_S10.06","PSCEH_S10.20","PSCEV_S10.20","PSCEH_S10.21","PSCEV_S10.21","PSCEH_S10.22","PSCEV_S10.22","PSQAB_S10.06","PSQAB_S10.07","PSSF_S10.05","PSSD_S10.09","PSSD_S10.10","PSSF_S10.06"]},
-					{"type": "rps", "position": 6464, "name": "RPS_AB10.40" ,"reverse": true, "devices":["PSOCT_S10.03","PSOCT_S10.04","PSTRCEB_S10.03","PSTRCEB_S10.04","PSB_S10.04","PSB_S10.05","PSB_S10.06"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB10.15" ,"reverse": true, "embedded":["PSCFH_S10.02","PSCFV_S10.02","PSCEH_S10.05","PSCEV_S10.05","PSCEH_S10.06","PSCEH_S10.06","PSCEH_S10.08","PSCEV_S10.08","PSQAB_S10.03","PSQAB_S10.04","PSQF_S10.01","PSSD_S10.03","PSSD_S10.04","PSSF_S10.03"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB10.20" ,"reverse": true, "embedded":["PSCFH_S10.03","PSCFV_S10.03","PSQK_S10.01","PSCEV_S10.09","PSCEH_S10.10","PSCEV_S10.10","PSQK_S10.02","PSCEV_S10.11","PSCH_S10.01","PSCV_S10.01","PSQD_S10.01","PSQF_S10.02","PSQD_S10.02","PSSD_S10.05","PSSH_S10.01","PSSH_S10.02"]},
+					{"type": "rc", "position": 2400, "name": "RC_AB10.10" ,"reverse": true},
+					{"type": "rps", "position": 3397, "name": "RPS_AB10.25" ,"reverse": true, "embedded":["PSCFH_S10.04","PSCFV_S10.04","PSCH_S10.02","PSCV_S10.02","PSQK_S10.03","PSCEH_S10.13","PSCEV_S10.13","PSQK_S10.04","PSQD_S10.03","PSQF_S10.03","PSQD_S10.04","PSSH_S10.03","PSSH_S10.04","PSSD_S10.06"]},
+					{"type": "rps", "position": 4217, "name": "RPS_AB10.30" ,"reverse": true, "embedded":["PSCFH_S10.05","PSCFV_S10.05","PSCEH_S10.15","PSCEV_S10.15","PSCEH_S10.17","PSCEV_S10.17","PSCEH_S10.18","PSCEV_S10.18","PSQD_S10.04","PSQF_S10.04","PSQAB_S10.05","PSSF_S10.04","PSSD_S10.07","PSSD_S10.08"]},
+					{"type": "rps", "position": 5648, "name": "RPS_AB10.35" ,"reverse": true, "embedded":["PSCFH_S10.06","PSCFV_S10.06","PSCEH_S10.20","PSCEV_S10.20","PSCEH_S10.21","PSCEV_S10.21","PSCEH_S10.22","PSCEV_S10.22","PSQAB_S10.06","PSQAB_S10.07","PSSF_S10.05","PSSD_S10.09","PSSD_S10.10","PSSF_S10.06"]},
+					{"type": "rps", "position": 6464, "name": "RPS_AB10.40" ,"reverse": true, "embedded":["PSOCT_S10.03","PSOCT_S10.04","PSTRCEB_S10.03","PSTRCEB_S10.04","PSB_S10.04","PSB_S10.05","PSB_S10.06"]}
 				]
 			},
 			{
@@ -3078,10 +3067,10 @@
 			{
 				"start": {"x": 7198, "y": -300, "z": -35490},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RD_AA10.05" ,"reverse": true, "devices":[]},
-					{"type": "rv", "position": 2520, "name": "RV_AA10.05" ,"reverse": true, "devices":[]},
-					{"type": "rv", "position": 1714, "name": "RV_AA10.10" ,"reverse": true, "devices":[]},
-					{"type": "rc", "position": 890, "name": "RCF_AA10.05" ,"reverse": true, "devices":[]}
+					{"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}
 				]
 			},
 			{
@@ -3090,7 +3079,7 @@
 			{
 				"start": {"x": 3512, "y": -300, "z": -33415},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB10.05" ,"reverse": true, "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AB10.05" ,"reverse": true}
 				]
 			},
 			{
@@ -3102,8 +3091,8 @@
 			{
 				"start": {"x": 2260, "y": -300, "z": -37261},
 				"components": [
-					{"type": "rid", "position": 0, "name": "RID_AA10.05" ,"reverse": true, "devices":[]},
-					{"type": "rid", "position": 610, "name": "RID_AA10.10" ,"reverse": true, "devices":[]}
+					{"type": "rid", "position": 0,"offset3d": [800, 0, 1400], "name": "RID_AA10.05" ,"reverse": true},
+					{"type": "rid", "position": 610,"offset3d": [800, 0, 1400], "name": "RID_AA10.10" ,"reverse": true}
 				]
 			},
 			{
@@ -3112,8 +3101,8 @@
 			{
 				"start": {"x": -973, "y": -300, "z": -37187},
 				"components": [
-					{"type": "rrf", "position": 0, "name": "RRF_AA10.05" ,"reverse": true, "devices":[]},
-					{"type": "rrf", "position": 650, "name": "RRF_AA10.10" ,"reverse": true, "devices":[]}
+					{"type": "rrf", "position": 0, "name": "RRF_AA10.05" ,"reverse": true},
+					{"type": "rrf", "position": 650, "name": "RRF_AA10.10" ,"reverse": true}
 				]
 			},
 			{
@@ -3122,10 +3111,10 @@
 			{
 				"start": {"x": 15748, "y": -300, "z": -29719},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB11.05" ,"reverse": true, "devices":["PSOCT_S11.02","PSOCT_S11.01","PSTRCEB_S11.01","PSTRCEB_S11.02","PSB_S11.01","PSB_S11.02","PSB_S11.03"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB11.10" ,"reverse": true, "devices":["PSCFH_S11.01","PSCFV_S11.01","PSCEH_S11.01","PSCEV_S11.01","PSCEH_S11.02","PSCEV_S11.02","PSCEH_S11.03","PSQAB_S11.01","PSQAB_S11.02","PSSF_S11.01","PSSD_S11.01","PSSD_S11.02","PSSF_S11.02"]},
-					{"type": "rps", "position": 1642, "name": "RPS_AB11.15" ,"reverse": true, "devices":["PSCFH_S11.02","PSCFV_S11.02","PSCEH_S11.05","PSCEV_S11.05","PSCEH_S11.06","PSCEH_S11.06","PSCEH_S11.08","PSCEV_S11.08","PSQAB_S11.03","PSQAB_S11.04","PSQF_S11.01","PSSD_S11.03","PSSD_S11.04","PSSF_S11.03"]},
-					{"type": "rps", "position": 2461, "name": "RPS_AB11.20" ,"reverse": true, "devices":["PSCFH_S11.03","PSCFV_S11.03","PSQK_S11.01","PSCEV_S11.09","PSCEH_S11.10","PSCEV_S11.10","PSQK_S11.02","PSCEV_S11.11","PSCH_S11.01","PSCV_S11.01","PSQD_S11.01","PSQF_S11.02","PSQD_S11.02","PSSD_S11.05","PSSH_S11.01","PSSH_S11.02"]}					
+					{"type": "rps", "position": 0, "name": "RPS_AB11.05" ,"reverse": true, "embedded":["PSOCT_S11.02","PSOCT_S11.01","PSTRCEB_S11.01","PSTRCEB_S11.02","PSB_S11.01","PSB_S11.02","PSB_S11.03"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB11.10" ,"reverse": true, "embedded":["PSCFH_S11.01","PSCFV_S11.01","PSCEH_S11.01","PSCEV_S11.01","PSCEH_S11.02","PSCEV_S11.02","PSCEH_S11.03","PSQAB_S11.01","PSQAB_S11.02","PSSF_S11.01","PSSD_S11.01","PSSD_S11.02","PSSF_S11.02"]},
+					{"type": "rps", "position": 1642, "name": "RPS_AB11.15" ,"reverse": true, "embedded":["PSCFH_S11.02","PSCFV_S11.02","PSCEH_S11.05","PSCEV_S11.05","PSCEH_S11.06","PSCEH_S11.06","PSCEH_S11.08","PSCEV_S11.08","PSQAB_S11.03","PSQAB_S11.04","PSQF_S11.01","PSSD_S11.03","PSSD_S11.04","PSSF_S11.03"]},
+					{"type": "rps", "position": 2461, "name": "RPS_AB11.20" ,"reverse": true, "embedded":["PSCFH_S11.03","PSCFV_S11.03","PSQK_S11.01","PSCEV_S11.09","PSCEH_S11.10","PSCEV_S11.10","PSQK_S11.02","PSCEV_S11.11","PSCH_S11.01","PSCV_S11.01","PSQD_S11.01","PSQF_S11.02","PSQD_S11.02","PSSD_S11.05","PSSH_S11.01","PSSH_S11.02"]}					
 				]
 			},
 			{
@@ -3134,10 +3123,10 @@
 			{
 				"start": {"x": 22355, "y": -300, "z": -20342},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB11.25" ,"reverse": true, "devices":["PSCFH_S11.04","PSCFV_S11.04","PSCH_S11.02","PSCV_S11.02","PSQK_S11.03","PSCEH_S11.13","PSCEV_S11.13","PSQK_S11.04","PSQD_S11.03","PSQF_S11.03","PSQD_S11.04","PSSH_S11.03","PSSH_S11.04","PSSD_S11.06"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB11.30" ,"reverse": true, "devices":["PSCFH_S11.05","PSCFV_S11.05","PSCEH_S11.15","PSCEV_S11.15","PSCEH_S11.17","PSCEV_S11.17","PSCEH_S11.18","PSCEV_S11.18","PSQD_S11.04","PSQF_S11.04","PSQAB_S11.05","PSSF_S11.04","PSSD_S11.07","PSSD_S11.08"]},
-					{"type": "rps", "position": 1640, "name": "RPS_AB11.35" ,"reverse": true, "devices":["PSCFH_S11.06","PSCFV_S11.06","PSCEH_S11.20","PSCEV_S11.20","PSCEH_S11.21","PSCEV_S11.21","PSCEH_S11.22","PSCEV_S11.22","PSQAB_S11.06","PSQAB_S11.07","PSSF_S11.05","PSSD_S11.09","PSSD_S11.10","PSSF_S11.06"]},
-					{"type": "rps", "position": 2460, "name": "RPS_AB11.40" ,"reverse": true, "devices":["PSOCT_S11.03","PSOCT_S11.04","PSTRCEB_S11.03","PSTRCEB_S11.04","PSB_S11.04","PSB_S11.05","PSB_S11.06"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB11.25" ,"reverse": true, "embedded":["PSCFH_S11.04","PSCFV_S11.04","PSCH_S11.02","PSCV_S11.02","PSQK_S11.03","PSCEH_S11.13","PSCEV_S11.13","PSQK_S11.04","PSQD_S11.03","PSQF_S11.03","PSQD_S11.04","PSSH_S11.03","PSSH_S11.04","PSSD_S11.06"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB11.30" ,"reverse": true, "embedded":["PSCFH_S11.05","PSCFV_S11.05","PSCEH_S11.15","PSCEV_S11.15","PSCEH_S11.17","PSCEV_S11.17","PSCEH_S11.18","PSCEV_S11.18","PSQD_S11.04","PSQF_S11.04","PSQAB_S11.05","PSSF_S11.04","PSSD_S11.07","PSSD_S11.08"]},
+					{"type": "rps", "position": 1640, "name": "RPS_AB11.35" ,"reverse": true, "embedded":["PSCFH_S11.06","PSCFV_S11.06","PSCEH_S11.20","PSCEV_S11.20","PSCEH_S11.21","PSCEV_S11.21","PSCEH_S11.22","PSCEV_S11.22","PSQAB_S11.06","PSQAB_S11.07","PSSF_S11.05","PSSD_S11.09","PSSD_S11.10","PSSF_S11.06"]},
+					{"type": "rps", "position": 2460, "name": "RPS_AB11.40" ,"reverse": true, "embedded":["PSOCT_S11.03","PSOCT_S11.04","PSTRCEB_S11.03","PSTRCEB_S11.04","PSB_S11.04","PSB_S11.05","PSB_S11.06"]}
 				]
 			},
 			{
@@ -3146,10 +3135,10 @@
 						{
 				"start": {"x": 27155, "y": -300, "z": -20042},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RBTSPS_AB11.05" ,"reverse": true, "devices":[]},
-					{"type": "rps", "position": 820, "name": "RBTSPS_AB11.10" ,"reverse": true, "devices":[]},
-					{"type": "rps", "position": 1640, "name": "RBTSPS_AB11.15" ,"reverse": true, "devices":[]},
-					{"type": "rps", "position": 2460, "name": "RBTSPS_AB11.20" ,"reverse": true, "devices":[]}
+					{"type": "rps", "position": 0, "name": "RBTSPS_AB11.05" ,"reverse": true},
+					{"type": "rps", "position": 820, "name": "RBTSPS_AB11.10" ,"reverse": true},
+					{"type": "rps", "position": 1640, "name": "RBTSPS_AB11.15" ,"reverse": true},
+					{"type": "rps", "position": 2460, "name": "RBTSPS_AB11.20" ,"reverse": true}
 				]
 			},
 			{
@@ -3158,7 +3147,7 @@
 			{
 				"start": {"x": 19197, "y": -300, "z": -31512},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RD_AA11.05" ,"reverse": true, "devices":[]}
+					{"type": "rd", "position": 0, "name": "RD_AA11.05" ,"reverse": true}
 				]
 			},
 			{
@@ -3167,7 +3156,7 @@
 			{
 				"start": {"x": 21203, "y": -300, "z": -21576},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RBTSD_AB11.05" ,"reverse": true, "devices":[]}
+					{"type": "rd", "position": 0, "name": "RBTSD_AB11.05" ,"reverse": true}
 				]
 			},
 			{
@@ -3176,9 +3165,9 @@
 			{
 				"start": {"x": 16285, "y": -300, "z": -33098},
 				"components": [
-					{"type": "rv", "position": 0, "name": "RV_AA11.05" ,"reverse": true, "devices":[]},
-					{"type": "rv", "position": 809, "name": "RV_AA11.10" ,"reverse": true, "devices":[]},
-					{"type": "rc", "position": 1642, "name": "RCF_AA11.05" ,"reverse": true, "devices":[]}
+					{"type": "rv", "position": 0, "name": "RV_AA11.05" ,"reverse": true},
+					{"type": "rv", "position": 809, "name": "RV_AA11.10" ,"reverse": true},
+					{"type": "rc", "position": 1642, "name": "RCF_AA11.05" ,"reverse": true}
 				]
 			},
 			{
@@ -3187,7 +3176,7 @@
 			{
 				"start": {"x": 28805, "y": -300, "z": -17103},
 				"components": [
-					{"type": "rv", "position": 0, "name": "RBTSV_AB11.05" ,"reverse": true, "devices":[]}
+					{"type": "rv", "position": 0, "name": "RBTSV_AB11.05" ,"reverse": true}
 				]
 			},
 			{
@@ -3196,7 +3185,7 @@
 			{
 				"start": {"x": 21728, "y": -300, "z": -22110},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RBTSC_AB11.05" ,"reverse": true, "devices":[]}
+					{"type": "rc", "position": 0, "name": "RBTSC_AB11.05" ,"reverse": true}
 				]
 			},
 			{
@@ -3205,8 +3194,8 @@
 			{
 				"start": {"x": 13022, "y": -300, "z": -27303},
 				"components": [
-					{"type": "rid", "position": 0, "name": "RID_AB11.05" ,"reverse": true, "devices":[]},
-					{"type": "rid", "position": 793, "name": "RID_AB11.10" ,"reverse": true, "devices":[]}
+					{"type": "rid", "position": 0, "name": "RID_AB11.05" ,"reverse": true},
+					{"type": "rid", "position": 793, "name": "RID_AB11.10" ,"reverse": true}
 				]
 			},
 			{
@@ -3215,8 +3204,8 @@
 			{
 				"start": {"x": 14436, "y": -300, "z": -33733},
 				"components": [
-					{"type": "rc", "position": -603, "name": "RC_AA10.05" ,"reverse": true, "devices":[]},
-					{"type": "rd", "position": 0, "name": "RSHID_AA11.05" ,"reverse": true, "devices":[]}
+					{"type": "rc", "position": -603, "name": "RC_AA10.05" ,"reverse": true},
+					{"type": "rd", "position": 0, "name": "RSHID_AA11.05" ,"reverse": true}
 				]
 			},
 			{
@@ -3225,7 +3214,7 @@
 			{
 				"start": {"x": 19826, "y": -300, "z": -31121},
 				"components": [
-					{"type": "rcry", "position": 0, "name": "RCRY_AA11.05" ,"reverse": true, "devices":[]}
+					{"type": "rcry", "position": 0, "name": "RCRY_AA11.05" ,"reverse": true}
 				]
 			},
 			{
@@ -3234,10 +3223,10 @@
 			{
 				"start": {"x": 31102, "y": -300, "z": -12566},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB12.05" ,"reverse": true, "devices":["PSOCT_S12.02","PSOCT_S12.01","PSTRCEB_S12.01","PSTRCEB_S12.02","PSB_S12.01","PSB_S12.02","PSB_S12.03"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB12.10" ,"reverse": true, "devices":["PSCFH_S12.01","PSCFV_S12.01","PSCEH_S12.01","PSCEV_S12.01","PSCEH_S12.02","PSCEV_S12.02","PSCEH_S12.03","PSQAB_S12.01","PSQAB_S12.02","PSSF_S12.01","PSSD_S12.01","PSSD_S12.02","PSSF_S12.02"]},
-					{"type": "rps", "position": 1641, "name": "RPS_AB12.15" ,"reverse": true, "devices":["PSCFH_S12.02","PSCFV_S12.02","PSCEH_S12.05","PSCEV_S12.05","PSCEH_S12.06","PSCEH_S12.06","PSCEH_S12.08","PSCEV_S12.08","PSQAB_S12.03","PSQAB_S12.04","PSQF_S12.01","PSSD_S12.03","PSSD_S12.04","PSSF_S12.03"]},
-					{"type": "rps", "position": 2461, "name": "RPS_AB12.20" ,"reverse": true, "devices":["PSCFH_S12.03","PSCFV_S12.03","PSQK_S12.01","PSCEV_S12.09","PSCEH_S12.10","PSCEV_S12.10","PSQK_S12.02","PSCEV_S12.11","PSCH_S12.01","PSCV_S12.01","PSQD_S12.01","PSQF_S12.02","PSQD_S12.02","PSSD_S12.05","PSSH_S12.01","PSSH_S12.02"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB12.05" ,"reverse": true, "embedded":["PSOCT_S12.02","PSOCT_S12.01","PSTRCEB_S12.01","PSTRCEB_S12.02","PSB_S12.01","PSB_S12.02","PSB_S12.03"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB12.10" ,"reverse": true, "embedded":["PSCFH_S12.01","PSCFV_S12.01","PSCEH_S12.01","PSCEV_S12.01","PSCEH_S12.02","PSCEV_S12.02","PSCEH_S12.03","PSQAB_S12.01","PSQAB_S12.02","PSSF_S12.01","PSSD_S12.01","PSSD_S12.02","PSSF_S12.02"]},
+					{"type": "rps", "position": 1641, "name": "RPS_AB12.15" ,"reverse": true, "embedded":["PSCFH_S12.02","PSCFV_S12.02","PSCEH_S12.05","PSCEV_S12.05","PSCEH_S12.06","PSCEH_S12.06","PSCEH_S12.08","PSCEV_S12.08","PSQAB_S12.03","PSQAB_S12.04","PSQF_S12.01","PSSD_S12.03","PSSD_S12.04","PSSF_S12.03"]},
+					{"type": "rps", "position": 2461, "name": "RPS_AB12.20" ,"reverse": true, "embedded":["PSCFH_S12.03","PSCFV_S12.03","PSQK_S12.01","PSCEV_S12.09","PSCEH_S12.10","PSCEV_S12.10","PSQK_S12.02","PSCEV_S12.11","PSCH_S12.01","PSCV_S12.01","PSQD_S12.01","PSQF_S12.02","PSQD_S12.02","PSSD_S12.05","PSSH_S12.01","PSSH_S12.02"]}
 				]
 			},
 			{
@@ -3246,10 +3235,10 @@
 			{
 				"start": {"x": 32812, "y": -300, "z": -6974},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB12.25" ,"reverse": true, "devices":["PSCFH_S12.04","PSCFV_S12.04","PSCH_S12.02","PSCV_S12.02","PSQK_S12.03","PSCEH_S12.13","PSCEV_S12.13","PSQK_S12.04","PSQD_S12.03","PSQF_S12.03","PSQD_S12.04","PSSH_S12.03","PSSH_S12.04","PSSD_S12.06"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB12.30" ,"reverse": true, "devices":["PSCFH_S12.05","PSCFV_S12.05","PSCEH_S12.15","PSCEV_S12.15","PSCEH_S12.17","PSCEV_S12.17","PSCEH_S12.18","PSCEV_S12.18","PSQD_S12.04","PSQF_S12.04","PSQAB_S12.05","PSSF_S12.04","PSSD_S12.07","PSSD_S12.08"]},
-					{"type": "rps", "position": 1641, "name": "RPS_AB12.35" ,"reverse": true, "devices":["PSCFH_S12.06","PSCFV_S12.06","PSCEH_S12.20","PSCEV_S12.20","PSCEH_S12.21","PSCEV_S12.21","PSCEH_S12.22","PSCEV_S12.22","PSQAB_S12.06","PSQAB_S12.07","PSSF_S12.05","PSSD_S12.09","PSSD_S12.10","PSSF_S12.06"]},
-					{"type": "rps", "position": 2461, "name": "RPS_AB12.40" ,"reverse": true, "devices":["PSOCT_S12.03","PSOCT_S12.04","PSTRCEB_S12.03","PSTRCEB_S12.04","PSB_S12.04","PSB_S12.05","PSB_S12.06"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB12.25" ,"reverse": true, "embedded":["PSCFH_S12.04","PSCFV_S12.04","PSCH_S12.02","PSCV_S12.02","PSQK_S12.03","PSCEH_S12.13","PSCEV_S12.13","PSQK_S12.04","PSQD_S12.03","PSQF_S12.03","PSQD_S12.04","PSSH_S12.03","PSSH_S12.04","PSSD_S12.06"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB12.30" ,"reverse": true, "embedded":["PSCFH_S12.05","PSCFV_S12.05","PSCEH_S12.15","PSCEV_S12.15","PSCEH_S12.17","PSCEV_S12.17","PSCEH_S12.18","PSCEV_S12.18","PSQD_S12.04","PSQF_S12.04","PSQAB_S12.05","PSSF_S12.04","PSSD_S12.07","PSSD_S12.08"]},
+					{"type": "rps", "position": 1641, "name": "RPS_AB12.35" ,"reverse": true, "embedded":["PSCFH_S12.06","PSCFV_S12.06","PSCEH_S12.20","PSCEV_S12.20","PSCEH_S12.21","PSCEV_S12.21","PSCEH_S12.22","PSCEV_S12.22","PSQAB_S12.06","PSQAB_S12.07","PSSF_S12.05","PSSD_S12.09","PSSD_S12.10","PSSF_S12.06"]},
+					{"type": "rps", "position": 2461, "name": "RPS_AB12.40" ,"reverse": true, "embedded":["PSOCT_S12.03","PSOCT_S12.04","PSTRCEB_S12.03","PSTRCEB_S12.04","PSB_S12.04","PSB_S12.05","PSB_S12.06"]}
 				]
 			},
 			{
@@ -3258,9 +3247,9 @@
 			{
 				"start": {"x": 36086, "y": -300, "z": -6730},
 				"components": [
-					{"type": "rv", "position": 0, "name": "RV_AA12.05" ,"reverse": true, "devices":[]},
-					{"type": "rv", "position": 811, "name": "RV_AA12.10" ,"reverse": true, "devices":[]},
-					{"type": "rc", "position": 1643, "name": "RCF_AA12.05" ,"reverse": true, "devices":[]}
+					{"type": "rv", "position": 0, "name": "RV_AA12.05" ,"reverse": true},
+					{"type": "rv", "position": 811, "name": "RV_AA12.10" ,"reverse": true},
+					{"type": "rc", "position": 1643, "name": "RCF_AA12.05" ,"reverse": true}
 				]
 			},
 			{
@@ -3269,7 +3258,7 @@
 			{
 				"start": {"x": 30695, "y": -300, "z": -13666},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB12.05" ,"reverse": true, "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AB12.05" ,"reverse": true}
 				]
 			},
 			{
@@ -3278,33 +3267,33 @@
 			{
 				"start": {"x": 32601, "y": -300, "z": -8128},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB12.10" ,"reverse": true, "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AB12.10" ,"reverse": true}
 				]
 			},
 			{
 				"start": {"x": 32603, "y": -300, "z": -8118}
 			},
 			{
-				"start": {"x": 32042, "y": -300, "z": -20592},
+				"start": {"x": 30342, "y": -300, "z": -19592},
 				"components": [
-					{"type": "rcry", "position": 0, "name": "COMRCRY_AA12.05" ,"reverse": true, "devices":[]},
-					{"type": "rcry", "position": 604, "name": "COMRCRY_AA12.10" ,"reverse": true, "devices":[]},
-					{"type": "rcry", "position": 1812, "name": "RCRY_AA12.05" ,"reverse": true, "devices":[]},
-					{"type": "rcry", "position": 2416, "name": "RCRY_AA12.10" ,"reverse": true, "devices":[]},
-					{"type": "rd", "position": 3020, "name": "RD_AA12.05" ,"reverse": true, "devices":[]},
-					{"type": "rd", "position": 3624, "name": "RD_AA12.10" ,"reverse": true, "devices":[]},
-					{"type": "rrp", "position": 4228, "name": "RRP_AA12.05" ,"reverse": true, "devices":[]}
+					{"type": "rcry", "position": 0, "name": "COMRCRY_AA12.05" ,"reverse": true},
+					{"type": "rcry", "position": 604, "name": "COMRCRY_AA12.10" ,"reverse": true},
+					{"type": "rcry", "position": 1812, "name": "RCRY_AA12.05" ,"reverse": true},
+					{"type": "rcry", "position": 2416, "name": "RCRY_AA12.10" ,"reverse": true},
+					{"type": "rd", "position": 3020, "name": "RD_AA12.05" ,"reverse": true},
+					{"type": "rd", "position": 3624, "name": "RD_AA12.10" ,"reverse": true},
+					{"type": "rrp", "position": 4228, "name": "RRP_AA12.05" ,"reverse": true}
 				]
 			},
 			{
-				"start": {"x": 33642, "y": -300, "z": -17592}
+				"start": {"x": 32542, "y": -300, "z": -17592}
 			},
 			{
 				"start": {"x": 36644, "y": -300, "z": -4337},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RD_AA12.15" ,"reverse": true, "devices":[]},
-					{"type": "rd", "position": 645, "name": "RD_AA12.20" ,"reverse": true, "devices":[]},
-					{"type": "rd", "position": 1288, "name": "RD_AA12.25" ,"reverse": true, "devices":[]}
+					{"type": "rd", "position": 0, "name": "RD_AA12.15" ,"reverse": true},
+					{"type": "rd", "position": 645, "name": "RD_AA12.20" ,"reverse": true},
+					{"type": "rd", "position": 1288, "name": "RD_AA12.25" ,"reverse": true}
 				]
 			},
 			{
@@ -3313,17 +3302,17 @@
 			{
 				"start": {"x": 33765, "y": -300, "z": -14577},
 				"components": [
-					{"type": "rinj", "position": 0, "name": "RINJ_AA12.05" ,"reverse": true, "devices":[]},
-					{"type": "rinj", "position": 610, "name": "RINJ_AA12.10" ,"reverse": true, "devices":[]},
-					{"type": "rinj", "position": 1220, "name": "RINJ_AA12.15" ,"reverse": true, "devices":[]},
-					{"type": "rinj", "position": 1830, "name": "RINJ_AA12.20" ,"reverse": true, "devices":[]},
-					{"type": "rinj", "position": 2439, "name": "RINJ_AA12.25" ,"reverse": true, "devices":[]},
-					{"type": "rinj", "position": 3048, "name": "RINJ_AA12.30" ,"reverse": true, "devices":[]},
-					{"type": "rinj", "position": 3658, "name": "RINJ_AA12.35" ,"reverse": true, "devices":[]},
-					{"type": "rinj", "position": 4268, "name": "RINJ_AA12.40" ,"reverse": true, "devices":[]},
-					{"type": "rinj", "position": 4878, "name": "RINJ_AA12.45" ,"reverse": true, "devices":[]},
-					{"type": "rinj", "position": 5488, "name": "RINJ_AA12.50" ,"reverse": true, "devices":[]},
-					{"type": "rinj", "position": 6098, "name": "RINJ_AA12.55" ,"reverse": true, "devices":[]}
+					{"type": "rinj", "position": 0, "name": "RINJ_AA12.05" ,"reverse": true},
+					{"type": "rinj", "position": 610, "name": "RINJ_AA12.10" ,"reverse": true},
+					{"type": "rinj", "position": 1220, "name": "RINJ_AA12.15" ,"reverse": true},
+					{"type": "rinj", "position": 1830, "name": "RINJ_AA12.20" ,"reverse": true},
+					{"type": "rinj", "position": 2439, "name": "RINJ_AA12.25" ,"reverse": true},
+					{"type": "rinj", "position": 3048, "name": "RINJ_AA12.30" ,"reverse": true},
+					{"type": "rinj", "position": 3658, "name": "RINJ_AA12.35" ,"reverse": true},
+					{"type": "rinj", "position": 4268, "name": "RINJ_AA12.40" ,"reverse": true},
+					{"type": "rinj", "position": 4878, "name": "RINJ_AA12.45" ,"reverse": true},
+					{"type": "rinj", "position": 5488, "name": "RINJ_AA12.50" ,"reverse": true},
+					{"type": "rinj", "position": 6098, "name": "RINJ_AA12.55" ,"reverse": true}
 				]
 			},
 			{
@@ -3506,15 +3495,7 @@
 				"chamber": {"type": "wall"}
 			},
 			{
-				"start": {"x": 23980, "z": -25020}
-			},
-			{
-				"start": {"x": 22720, "z": -23760},
-				"chamber": {"type": "wall"}
-			},
-			{
-				"start": {"x": 18580, "z": -22480},
-				"chamber": {"type": "wall"}
+				"start": {"x": 18100, "z": -22850}
 			},
 			{
 				"start": {"x": 20160, "z": -21240},
@@ -3713,23 +3694,253 @@
 				"start": {"x": 10540, "z": -27220}
 			},
 			{
-				"start": {"x": 11780, "z": -26820},
+				"start": {"x": 14400, "z": -25450},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 24160, "z": -25360}
+			},
+			{
+				"start": {"x": 23200, "z": -24140},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 10680, "z": -20980},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 11080, "z": -19320},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 13540, "z": -17820},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 16020, "z": -15440},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 17920, "z": -12540},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 19180, "z": -9260},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 19580, "z": -5840},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 19300, "z": -2320},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 18180, "z": 1020},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 16400, "z": 3980},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 14000, "z": 6520},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 11100, "z": 8420},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 7200, "z": 9840},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 7240, "z": 10020},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 21280, "z": 11320},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 21060, "z": 14000},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 18880, "z": 16780},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 18400, "z": 17000},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 14540, "z": 16600},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 14420, "z": 17720},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 14240, "z": 19700}
+			},
+			{
+				"start": {"x": 13980, "z": 22240},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 9500, "z": 24540},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -3780, "z": 23260},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -2860, "z": 12660},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 1500, "z": 14080},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 18240, "z": 15580},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -2860, "z": 12660}
+			},
+			{
+				"start": {"x": -15460, "z": 7520},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -18400, "z": 5700},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -20920, "z": 3240},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -22880, "z": 320},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -24060, "z": -2920},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -24480, "z": -6400},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -24180, "z": -9820},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -23100, "z": -13180},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -21300, "z": -16160},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -18980, "z": -18580},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -16020, "z": -20580},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -11060, "z": -22440},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -4560, "z": -23340},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 9840, "z": -24080},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 19880, "z": -27100},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 22060, "z": -27140},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 24915, "z": -26620},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 7700, "z": 3200}
+			},
+			{
+				"start": {"x": -14260, "z": 1160},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -15840, "z": 1100}
+			},
+			{
+				"start": {"x": -16200, "z": 1040},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -15320, "z": -8280},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -15240, "z": -9360}
+			},
+			{
+				"start": {"x": -16420, "z": -9480},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -16320, "z": -10240},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -13780, "z": -10080},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -13440, "z": -12920},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -9960, "z": -15260},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 6540, "z": -13740},
 				"chamber": {"type": "wall"}
 			},
 			{
-				"start": {"x": 13540, "z": -25860},
+				"start": {"x": 15300, "z": -5340},
 				"chamber": {"type": "wall"}
 			},
 			{
-				"start": {"x": 19780, "z": -27460},
+				"start": {"x": 14840, "z": -820},
 				"chamber": {"type": "wall"}
 			},
 			{
-				"start": {"x": 22060, "z": -27460},
+				"start": {"x": 10680, "z": 3540},
 				"chamber": {"type": "wall"}
 			},
 			{
-				"start": {"x": 24740, "z": -26920},
+				"start": {"x": 10400, "z": 3540},
 				"chamber": {"type": "wall"}
 			}
 		]
-- 
GitLab