From cd986ca452290172eb6649ef145be4aec75e9289 Mon Sep 17 00:00:00 2001
From: Lucio Zambon <lucio.zambon@elettra.eu>
Date: Wed, 30 Oct 2024 00:29:04 +0000
Subject: [PATCH] Update elettra2_lattice.json

---
 elettra2_lattice.json | 1088 +++++++++++++++++++++++++++--------------
 1 file changed, 734 insertions(+), 354 deletions(-)

diff --git a/elettra2_lattice.json b/elettra2_lattice.json
index 38756d3..57b8d39 100644
--- a/elettra2_lattice.json
+++ b/elettra2_lattice.json
@@ -2347,8 +2347,8 @@
 			{
 				"start": {"x": 33249, "y": -300, "z": 4557},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB01.05" ,"reverse": true, "embedded":["PSOCT_S01.02","PSOCT_S01.01","PSTRCEB_S01.01","PSTRCEB_S01.02","PSB_S01.01","PSB_S01.02","PSB_S01.03"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB01.10" ,"reverse": true, "embedded":["PSCFH_S01.01","PSCFV_S01.01","PSCEH_S01.01","PSCEV_S01.01","PSCEH_S01.02","PSCEV_S01.02","PSCEH_S01.03","PSQAB_S01.01","PSQAB_S01.02","PSSF_S01.01","PSSD_S01.01","PSSD_S01.02","PSSF_S01.02"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB01.05" ,"reverse": true, "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"]}
 				]
 			},
 			{
@@ -2357,65 +2357,74 @@
 			{
 				"start": {"x": 32402, "y": -300, "z": 8682},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB01.15" ,"reverse": true, "embedded":["PSCFH_S01.02","PSCFV_S01.02","PSCEH_S01.05","PSCEV_S01.05","PSCEH_S01.06","PSCEH_S01.06","PSCEH_S01.08","PSCEV_S01.08","PSQAB_S01.03","PSQAB_S01.04","PSQF_S01.01","PSSD_S01.03","PSSD_S01.04","PSSF_S01.03"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB01.20" ,"reverse": true, "embedded":["PSCFH_S01.03","PSCFV_S01.03","PSQK_S01.01","PSCEV_S01.09","PSCEH_S01.10","PSCEV_S01.10","PSQK_S01.02","PSCEV_S01.11","PSCH_S01.01","PSCV_S01.01","PSQD_S01.01","PSQF_S01.02","PSQD_S01.02","PSSD_S01.05","PSSH_S01.01","PSSH_S01.02"]},
-					{"type": "rps", "position": 3397, "name": "RPS_AB01.25" ,"reverse": true, "embedded":["PSCFH_S01.04","PSCFV_S01.04","PSCH_S01.02","PSCV_S01.02","PSQK_S01.03","PSCEH_S01.13","PSCEV_S01.13","PSQK_S01.04","PSQD_S01.03","PSQF_S01.03","PSQD_S01.04","PSSH_S01.03","PSSH_S01.04","PSSD_S01.06"]},
-					{"type": "rps", "position": 4217, "name": "RPS_AB01.30" ,"reverse": true, "embedded":["PSCFH_S01.05","PSCFV_S01.05","PSCEH_S01.15","PSCEV_S01.15","PSCEH_S01.17","PSCEV_S01.17","PSCEH_S01.18","PSCEV_S01.18","PSQD_S01.04","PSQF_S01.04","PSQAB_S01.05","PSSF_S01.04","PSSD_S01.07","PSSD_S01.08"]},
-					{"type": "rps", "position": 5848, "name": "RPS_AB01.35" ,"reverse": true, "embedded":["PSCFH_S01.06","PSCFV_S01.06","PSCEH_S01.20","PSCEV_S01.20","PSCEH_S01.21","PSCEV_S01.21","PSCEH_S01.22","PSCEV_S01.22","PSQAB_S01.06","PSQAB_S01.07","PSSF_S01.05","PSSD_S01.09","PSSD_S01.10","PSSF_S01.06"]},
-					{"type": "rps", "position": 6664, "name": "RPS_AB01.40" ,"reverse": true, "embedded":["PSOCT_S01.03","PSOCT_S01.04","PSTRCEB_S01.03","PSTRCEB_S01.04","PSB_S01.04","PSB_S01.05","PSB_S01.06"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB01.15" ,"reverse": true, "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"]}
 				]
 			},
 			{
 				"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, "devices":[]}
+				]
+			},
+			{
+				"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},
-					{"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}
+					{"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":[]}
 				]
 			},
 			{
-				"start": {"x": 35662, "y": -300, "z": -1898}
+				"start": {"x": 36262, "y": -300, "z": -1898}
 			},
 			{
-				"start": {"x": 33415, "y": -300, "z": 3512},
+				"start": {"x": 33365, "y": -300, "z": 3512},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB01.05" ,"reverse": true}
+					{"type": "rc", "position": 0, "name": "RC_AB01.05" ,"reverse": true, "devices":[]}
 				]
 			},
 			{
-				"start": {"x": 33414, "y": -300, "z": 3522}
+				"start": {"x": 33364, "y": -300, "z": 3522}
 			},
 			{
-				"start": {"x": 31769, "y": -300, "z": 10939},
+				"start": {"x": 31569, "y": -300, "z": 10939},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB01.10" ,"reverse": true}
+					{"type": "rc", "position": 0, "name": "RC_AB01.10" ,"reverse": true, "devices":[]}
 				]
 			},
 			{
-				"start": {"x": 31766, "y": -300, "z": 10948}
+				"start": {"x": 31566, "y": -300, "z": 10947}
 			},
 			{
-				"start": {"x": 36910, "y": -300, "z": 2848},
+				"start": {"x": 37510, "y": -300, "z": 1548},
 				"components": [
-					{"type": "rid", "position": 0, "name": "RID_AA01.05" ,"reverse": true},
-					{"type": "rid", "position": 610, "name": "RID_AA01.10" ,"reverse": true},
-					{"type": "rid", "position": 1220, "name": "RID_AA01.15" ,"reverse": true}
+					{"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":[]}
 				]
 			},
 			{
-				"start": {"x": 35436, "y": -300, "z": 16191}
+				"start": {"x": 37436, "y": -300, "z": 16191}
 			},
 			{
 				"start": {"x": 26434, "y": -300, "z": 20653},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB02.05" ,"reverse": true, "embedded":["PSOCT_S02.02","PSOCT_S02.01","PSTRCEB_S02.01","PSTRCEB_S02.02","PSB_S02.01","PSB_S02.02","PSB_S02.03"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB02.10" ,"reverse": true, "embedded":["PSCFH_S02.01","PSCFV_S02.01","PSCEH_S02.01","PSCEV_S02.01","PSCEH_S02.02","PSCEV_S02.02","PSCEH_S02.03","PSQAB_S02.01","PSQAB_S02.02","PSSF_S02.01","PSSD_S02.01","PSSD_S02.02","PSSF_S02.02"]},
-					{"type": "rps", "position": 1641, "name": "RPS_AB02.15" ,"reverse": true, "embedded":["PSCFH_S02.02","PSCFV_S02.02","PSCEH_S02.05","PSCEV_S02.05","PSCEH_S02.06","PSCEH_S02.06","PSCEH_S02.08","PSCEV_S02.08","PSQAB_S02.03","PSQAB_S02.04","PSQF_S02.01","PSSD_S02.03","PSSD_S02.04","PSSF_S02.03"]},
-					{"type": "rps", "position": 2461, "name": "RPS_AB02.20" ,"reverse": true, "embedded":["PSCFH_S02.03","PSCFV_S02.03","PSQK_S02.01","PSCEV_S02.09","PSCEH_S02.10","PSCEV_S02.10","PSQK_S02.02","PSCEV_S02.11","PSCH_S02.01","PSCV_S02.01","PSQD_S02.01","PSQF_S02.02","PSQD_S02.02","PSSD_S02.05","PSSH_S02.01","PSSH_S02.02"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB02.05" ,"reverse": true, "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"]}
 				]
 			},
 			{
@@ -2424,31 +2433,34 @@
 			{
 				"start": {"x": 22446, "y": -300, "z": 24930},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB02.25" ,"reverse": true, "embedded":["PSCFH_S02.04","PSCFV_S02.04","PSCH_S02.02","PSCV_S02.02","PSQK_S02.03","PSCEH_S02.13","PSCEV_S02.13","PSQK_S02.04","PSQD_S02.03","PSQF_S02.03","PSQD_S02.04","PSSH_S02.03","PSSH_S02.04","PSSD_S02.06"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB02.30" ,"reverse": true, "embedded":["PSCFH_S02.05","PSCFV_S02.05","PSCEH_S02.15","PSCEV_S02.15","PSCEH_S02.17","PSCEV_S02.17","PSCEH_S02.18","PSCEV_S02.18","PSQD_S02.04","PSQF_S02.04","PSQAB_S02.05","PSSF_S02.04","PSSD_S02.07","PSSD_S02.08"]},
-					{"type": "rps", "position": 1641, "name": "RPS_AB02.35" ,"reverse": true, "embedded":["PSCFH_S02.06","PSCFV_S02.06","PSCEH_S02.20","PSCEV_S02.20","PSCEH_S02.21","PSCEV_S02.21","PSCEH_S02.22","PSCEV_S02.22","PSQAB_S02.06","PSQAB_S02.07","PSSF_S02.05","PSSD_S02.09","PSSD_S02.10","PSSF_S02.06"]},
-					{"type": "rps", "position": 2461, "name": "RPS_AB02.40" ,"reverse": true, "embedded":["PSOCT_S02.03","PSOCT_S02.04","PSTRCEB_S02.03","PSTRCEB_S02.04","PSB_S02.04","PSB_S02.05","PSB_S02.06"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB02.25" ,"reverse": true, "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"]}
 				]
 			},
 			{
 				"start": {"x": 2063, "y": -300, "z": 42750}
 			},
 			{
-				"start": {"x": 27742, "y": -300, "z": 24330},
+				"start": {"x": 26842, "y": -300, "z": 23730},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RD_AA02.05" ,"reverse": true},
-					{"type": "rv", "position": 2585, "name": "RV_AA02.05" ,"reverse": true},
-					{"type": "rv", "position": 1777, "name": "RV_AA02.10" ,"reverse": true},
-					{"type": "rc", "position": 953, "name": "RCF_AA02.05" ,"reverse": true}
+					{"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":[]}
+
 				]
 			},
 			{
-				"start": {"x": 32736, "y": -300, "z": 15112}
+				"start": {"x": 33736, "y": -300, "z": 15112}
 			},
 			{
 				"start": {"x": 27182, "y": -300, "z": 19749},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB02.05" ,"reverse": true}
+					{"type": "rc", "position": 0, "name": "RC_AB02.05" ,"reverse": true, "devices":[]}
 				]
 			},
 			{
@@ -2457,7 +2469,7 @@
 			{
 				"start": {"x": 23340, "y": -300, "z": 24169},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB02.10" ,"reverse": true}
+					{"type": "rc", "position": 0, "name": "RC_AB02.10" ,"reverse": true, "devices":[]}
 				]
 			},
 			{
@@ -2466,7 +2478,7 @@
 			{
 				"start": {"x": 32967, "y": -300, "z": 16798},
 				"components": [
-					{"type": "rshid", "position": 0, "name": "RSHID_AA02.05" ,"reverse": true}
+					{"type": "rshid", "position": 0, "name": "RSHID_AA02.05" ,"reverse": true, "devices":[]}
 				]
 			},
 			{
@@ -2475,31 +2487,24 @@
 			{
 				"start": {"x": 27332, "y": -300, "z": 24969},
 				"components": [
-					{"type": "rid", "position": 0, "name": "RID_AA02.05" ,"reverse": true},
-					{"type": "rid", "position": 610, "name": "RID_AA02.10" ,"reverse": true},
-					{"type": "rid", "position": 1220, "name": "RID_AA02.15" ,"reverse": true}
+					{"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":[]}
 				]
 			},
 			{
 				"start": {"x": 17960, "y": -300, "z": 34572}
 			},
-			{
-				"start": {"x": 30337, "y": -300, "z": 21007},
-				"components": [
-					{"type": "rcry", "position": 0, "name": "RCRY_AA02.05" ,"reverse": true},
-					{"type": "rcry", "position": 610, "name": "RCRY_AA02.10" ,"reverse": true}
-				]
-			},
 			{
 				"start": {"x": 26509, "y": -300, "z": 26518}
 			},
 			{
 				"start": {"x": 12566, "y": -300, "z": 31103},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB03.05" ,"reverse": true, "embedded":["PSOCT_S03.02","PSOCT_S03.01","PSTRCEB_S03.01","PSTRCEB_S03.02","PSB_S03.01","PSB_S03.02","PSB_S03.03"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB03.10" ,"reverse": true, "embedded":["PSCFH_S03.01","PSCFV_S03.01","PSCEH_S03.01","PSCEV_S03.01","PSCEH_S03.02","PSCEV_S03.02","PSCEH_S03.03","PSQAB_S03.01","PSQAB_S03.02","PSSF_S03.01","PSSD_S03.01","PSSD_S03.02","PSSF_S03.02"]},
-					{"type": "rps", "position": 1641, "name": "RPS_AB03.15" ,"reverse": true, "embedded":["PSCFH_S03.02","PSCFV_S03.02","PSCEH_S03.05","PSCEV_S03.05","PSCEH_S03.06","PSCEH_S03.06","PSCEH_S03.08","PSCEV_S03.08","PSQAB_S03.03","PSQAB_S03.04","PSQF_S03.01","PSSD_S03.03","PSSD_S03.04","PSSF_S03.03"]},
-					{"type": "rps", "position": 2461, "name": "RPS_AB03.20" ,"reverse": true, "embedded":["PSCFH_S03.03","PSCFV_S03.03","PSQK_S03.01","PSCEV_S03.09","PSCEH_S03.10","PSCEV_S03.10","PSQK_S03.02","PSCEV_S03.11","PSCH_S03.01","PSCV_S03.01","PSQD_S03.01","PSQF_S03.02","PSQD_S03.02","PSSD_S03.05","PSSH_S03.01","PSSH_S03.02"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB03.05" ,"reverse": true, "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"]}
 				]
 			},
 			{
@@ -2508,31 +2513,31 @@
 			{
 				"start": {"x": 6974, "y": -300, "z": 32813},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB03.25" ,"reverse": true, "embedded":["PSCFH_S03.04","PSCFV_S03.04","PSCH_S03.02","PSCV_S03.02","PSQK_S03.03","PSCEH_S03.13","PSCEV_S03.13","PSQK_S03.04","PSQD_S03.03","PSQF_S03.03","PSQD_S03.04","PSSH_S03.03","PSSH_S03.04","PSSD_S03.06"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB03.30" ,"reverse": true, "embedded":["PSCFH_S03.05","PSCFV_S03.05","PSCEH_S03.15","PSCEV_S03.15","PSCEH_S03.17","PSCEV_S03.17","PSCEH_S03.18","PSCEV_S03.18","PSQD_S03.04","PSQF_S03.04","PSQAB_S03.05","PSSF_S03.04","PSSD_S03.07","PSSD_S03.08"]},
-					{"type": "rps", "position": 1641, "name": "RPS_AB03.35" ,"reverse": true, "embedded":["PSCFH_S03.06","PSCFV_S03.06","PSCEH_S03.20","PSCEV_S03.20","PSCEH_S03.21","PSCEV_S03.21","PSCEH_S03.22","PSCEV_S03.22","PSQAB_S03.06","PSQAB_S03.07","PSSF_S03.05","PSSD_S03.09","PSSD_S03.10","PSSF_S03.06"]},
-					{"type": "rps", "position": 2461, "name": "RPS_AB03.40" ,"reverse": true, "embedded":["PSOCT_S03.03","PSOCT_S03.04","PSTRCEB_S03.03","PSTRCEB_S03.04","PSB_S03.04","PSB_S03.05","PSB_S03.06"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB03.25" ,"reverse": true, "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"]}
 				]
 			},
 			{
 				"start": {"x": -19580, "y": -300, "z": 38060}
 			},
 			{
-				"start": {"x": 11861, "y": -300, "z": 34942},
+				"start": {"x": 11861, "y": -300, "z": 33942},
 				"components": [
-					{"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}
+					{"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":[]}
 				]
 			},
 			{
-				"start": {"x": 20122, "y": -300, "z": 29684}
+				"start": {"x": 20122, "y": -300, "z": 30684}
 			},
 			{
 				"start": {"x": 13666, "y": -300, "z": 30695},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB03.05" ,"reverse": true}
+					{"type": "rc", "position": 0, "name": "RC_AB03.05" ,"reverse": true, "devices":[]}
 				]
 			},
 			{
@@ -2541,7 +2546,7 @@
 			{
 				"start": {"x": 8128, "y": -300, "z": 32601},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB03.10" ,"reverse": true}
+					{"type": "rc", "position": 0, "name": "RC_AB03.10" ,"reverse": true, "devices":[]}
 				]
 			},
 			{
@@ -2550,84 +2555,83 @@
 			{
 				"start": {"x": 11248, "y": -300, "z": 35270},
 				"components": [
-					{"type": "rid", "position": 0, "name": "RID_AA03.05" ,"reverse": true},
-					{"type": "rid", "position": 610, "name": "RID_AA03.10" ,"reverse": true},
-					{"type": "rid", "position": 1220, "name": "RID_AA03.15" ,"reverse": true}
-				]
-			},
-			{
-				"start": {"x": -1666, "y": -300, "z": 38933}
-			},
-			{
-				"start": {"x": 19436, "y": -300, "z": 31718},
-				"components": [
-					{"type": "rrf", "position": 0, "name": "RRF_AA03.05" ,"reverse": true},
-					{"type": "rrf", "position": 649, "name": "RRF_AA03.10" ,"reverse": true}
+					{"type": "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":[]}
 				]
 			},
 			{
-				"start": {"x": 13551, "y": -300, "z": 35766}
+				"start": {"x": -1666, "y": -300, "z": 39933}
 			},
 			{
-				"start": {"x": -4557, "y": -300, "z": 33250},
+				"start": {"x": 21436, "y": -300, "z": 28718},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB04.05", "embedded":["PSOCT_S04.02","PSOCT_S04.01","PSTRCEB_S04.01","PSTRCEB_S04.02","PSB_S04.01","PSB_S04.02","PSB_S04.03"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB04.10", "embedded":["PSCFH_S04.01","PSCFV_S04.01","PSCEH_S04.01","PSCEV_S04.01","PSCEH_S04.02","PSCEV_S04.02","PSCEH_S04.03","PSQAB_S04.01","PSQAB_S04.02","PSSF_S04.01","PSSD_S04.01","PSSD_S04.02","PSSF_S04.02"]}
+					{"type": "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":[]}
+
 				]
 			},
 			{
-				"start": {"x": -13533, "y": -300, "z": 32348}
-			},
+				"start": {"x": 27736, "y": -300, "z": 23712}
+			},			
 			{
-				"start": {"x": -8682, "y": -300, "z": 32403},
+				"start": {"x": 19436, "y": -300, "z": 31718},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB04.15", "embedded":["PSCFH_S04.02","PSCFV_S04.02","PSCEH_S04.05","PSCEV_S04.05","PSCEH_S04.06","PSCEH_S04.06","PSCEH_S04.08","PSCEV_S04.08","PSQAB_S04.03","PSQAB_S04.04","PSQF_S04.01","PSSD_S04.03","PSSD_S04.04","PSSF_S04.03"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB04.20", "embedded":["PSCFH_S04.03","PSCFV_S04.03","PSQK_S04.01","PSCEV_S04.09","PSCEH_S04.10","PSCEV_S04.10","PSQK_S04.02","PSCEV_S04.11","PSCH_S04.01","PSCV_S04.01","PSQD_S04.01","PSQF_S04.02","PSQD_S04.02","PSSD_S04.05","PSSH_S04.01","PSSH_S04.02"]},
-					{"type": "rps", "position": 3397, "name": "RPS_AB04.25", "embedded":["PSCFH_S04.04","PSCFV_S04.04","PSCH_S04.02","PSCV_S04.02","PSQK_S04.03","PSCEH_S04.13","PSCEV_S04.13","PSQK_S04.04","PSQD_S04.03","PSQF_S04.03","PSQD_S04.04","PSSH_S04.03","PSSH_S04.04","PSSD_S04.06"]},
-					{"type": "rps", "position": 4217, "name": "RPS_AB04.30", "embedded":["PSCFH_S04.05","PSCFV_S04.05","PSCEH_S04.15","PSCEV_S04.15","PSCEH_S04.17","PSCEV_S04.17","PSCEH_S04.18","PSCEV_S04.18","PSQD_S04.04","PSQF_S04.04","PSQAB_S04.05","PSSF_S04.04","PSSD_S04.07","PSSD_S04.08"]},
-					{"type": "rps", "position": 5848, "name": "RPS_AB04.35", "embedded":["PSCFH_S04.06","PSCFV_S04.06","PSCEH_S04.20","PSCEV_S04.20","PSCEH_S04.21","PSCEV_S04.21","PSCEH_S04.22","PSCEV_S04.22","PSQAB_S04.06","PSQAB_S04.07","PSSF_S04.05","PSSD_S04.09","PSSD_S04.10","PSSF_S04.06"]},
-					{"type": "rps", "position": 6664, "name": "RPS_AB04.40", "embedded":["PSOCT_S04.03","PSOCT_S04.04","PSTRCEB_S04.03","PSTRCEB_S04.04","PSB_S04.04","PSB_S04.05","PSB_S04.06"]}
+					{"type": "rrf", "position": 0, "name": "RRF_AA03.05" ,"reverse": true, "devices":[]},
+					{"type": "rrf", "position": 649, "name": "RRF_AA03.10" ,"reverse": true, "devices":[]}
 				]
 			},
 			{
-				"start": {"x": -77278, "y": -300, "z": 6542}
+				"start": {"x": 13551, "y": -300, "z": 35766}
 			},
 			{
-				"start": {"x": -7199, "y": -300, "z": 36191},
+				"start": {"x": -4557, "y": -300, "z": 33450},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RD_AA04.05"},
-					{"type": "rv", "position": 2457, "name": "RV_AA04.05"},
-					{"type": "rv", "position": 1649, "name": "RV_AA04.10"},
-					{"type": "rc", "position": 828, "name": "RCF_AA04.05"}
+					{"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"]}
 				]
 			},
 			{
-				"start": {"x": 1898, "y": -300, "z": 35652}
+				"start": {"x": -13533, "y": -300, "z": 32348}
 			},
 			{
-				"start": {"x": -3512, "y": -300, "z": 33415},
+				"start": {"x": -8682, "y": -300, "z": 32653},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB04.05"}
+					{"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"]}
 				]
 			},
 			{
-				"start": {"x": -3522, "y": -300, "z": 33414}
+				"start": {"x": -77278, "y": -300, "z": 2442}
 			},
 			{
-				"start": {"x": -10939, "y": -300, "z": 31769},
+				"start": {"x": -7899, "y": -300, "z": 34491},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB04.10"}
+					{"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":[]}
+					
 				]
 			},
 			{
-				"start": {"x": -10948, "y": -300, "z": 31766}
+				"start": {"x": 1898, "y": -300, "z": 36352}
 			},
 			{
 				"start": {"x": -2784, "y": -300, "z": 36916},
 				"components": [
-					{"type": "rid", "position": 0, "name": "RID_AA04.05"},
-					{"type": "rid", "position": 610, "name": "RID_AA04.10"},
-					{"type": "rid", "position": 1219, "name": "RID_AA04.15"}
+					{"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":[]}
 				]
 			},
 			{
@@ -2636,8 +2640,8 @@
 			{
 				"start": {"x": 973, "y": -300, "z": 37187},
 				"components": [
-					{"type": "rrf", "position": 0, "name": "RRF_AA04.05"},
-					{"type": "rrf", "position": 650, "name": "RRF_AA04.10"}
+					{"type": "rrf", "position": 0, "name": "RRF_AA04.05", "devices":[]},
+					{"type": "rrf", "position": 650, "name": "RRF_AA04.10", "devices":[]}
 				]
 			},
 			{
@@ -2646,10 +2650,10 @@
 			{
 				"start": {"x": -20653, "y": -300, "z": 26435},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB05.05", "embedded":["PSOCT_S05.02","PSOCT_S05.01","PSTRCEB_S05.01","PSTRCEB_S05.02","PSB_S05.01","PSB_S05.02","PSB_S05.03"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB05.10", "embedded":["PSCFH_S05.01","PSCFV_S05.01","PSCEH_S05.01","PSCEV_S05.01","PSCEH_S05.02","PSCEV_S05.02","PSCEH_S05.03","PSQAB_S05.01","PSQAB_S05.02","PSSF_S05.01","PSSD_S05.01","PSSD_S05.02","PSSF_S05.02"]},
-					{"type": "rps", "position": 1641, "name": "RPS_AB05.15", "embedded":["PSCFH_S05.02","PSCFV_S05.02","PSCEH_S05.05","PSCEV_S05.05","PSCEH_S05.06","PSCEH_S05.06","PSCEH_S05.08","PSCEV_S05.08","PSQAB_S05.03","PSQAB_S05.04","PSQF_S05.01","PSSD_S05.03","PSSD_S05.04","PSSF_S05.03"]},
-					{"type": "rps", "position": 2461, "name": "RPS_AB05.20", "embedded":["PSCFH_S05.03","PSCFV_S05.03","PSQK_S05.01","PSCEV_S05.09","PSCEH_S05.10","PSCEV_S05.10","PSQK_S05.02","PSCEV_S05.11","PSCH_S05.01","PSCV_S05.01","PSQD_S05.01","PSQF_S05.02","PSQD_S05.02","PSSD_S05.05","PSSH_S05.01","PSSH_S05.02"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB05.05", "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"]}
 				]
 			},
 			{
@@ -2658,29 +2662,23 @@
 			{
 				"start": {"x": -24930, "y": -300, "z": 22447},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB05.25", "embedded":["PSCFH_S05.04","PSCFV_S05.04","PSCH_S05.02","PSCV_S05.02","PSQK_S05.03","PSCEH_S05.13","PSCEV_S05.13","PSQK_S05.04","PSQD_S05.03","PSQF_S05.03","PSQD_S05.04","PSSH_S05.03","PSSH_S05.04","PSSD_S05.06"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB05.30", "embedded":["PSCFH_S05.05","PSCFV_S05.05","PSCEH_S05.15","PSCEV_S05.15","PSCEH_S05.17","PSCEV_S05.17","PSCEH_S05.18","PSCEV_S05.18","PSQD_S05.04","PSQF_S05.04","PSQAB_S05.05","PSSF_S05.04","PSSD_S05.07","PSSD_S05.08"]},
-					{"type": "rps", "position": 1641, "name": "RPS_AB05.35", "embedded":["PSCFH_S05.06","PSCFV_S05.06","PSCEH_S05.20","PSCEV_S05.20","PSCEH_S05.21","PSCEV_S05.21","PSCEH_S05.22","PSCEV_S05.22","PSQAB_S05.06","PSQAB_S05.07","PSSF_S05.05","PSSD_S05.09","PSSD_S05.10","PSSF_S05.06"]},
-					{"type": "rps", "position": 2461, "name": "RPS_AB05.40", "embedded":["PSOCT_S05.03","PSOCT_S05.04","PSTRCEB_S05.03","PSTRCEB_S05.04","PSB_S05.04","PSB_S05.05","PSB_S05.06"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB05.25", "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"]}
 				]
 			},
 			{
 				"start": {"x": -42750, "y": -300, "z": 2064}
 			},
 			{
-				"start": {"x": -15763, "y": -300, "z": 27743},
+				"start": {"x": -15963, "y": -300, "z": 21373},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RD_AA05.05"}
+					{"type": "rd", "position": 0, "name": "RD_AC05.05", "devices":[]}
 				]
 			},
 			{
-				"start": {"x": -15772, "y": -300, "z": 27738}
-			},
-			{
-				"start": {"x": -24330, "y": -300, "z": 21302},
-				"components": [
-					{"type": "rd", "position": 0, "name": "RD_AC05.05"}
-				]
+				"start": {"x": 11773, "y": -300, "z": -15738}
 			},
 			{
 				"start": {"x": -24337, "y": -300, "z": 21294}
@@ -2688,9 +2686,9 @@
 			{
 				"start": {"x": -22315, "y": -300, "z": 29149},
 				"components": [
-					{"type": "rv", "position": 0, "name": "RV_AA05.05"},
-					{"type": "rv", "position": 810, "name": "RV_AA05.10"},
-					{"type": "rc", "position": 1643, "name": "RCF_AA05.05"}
+					{"type": "rv", "position": 0, "name": "RV_AA05.05", "devices":[]},
+					{"type": "rv", "position": 810, "name": "RV_AA05.10", "devices":[]},
+					{"type": "rc", "position": 1643, "name": "RCF_AA05.05", "devices":[]}
 				]
 			},
 			{
@@ -2699,7 +2697,7 @@
 			{
 				"start": {"x": -19749, "y": -300, "z": 27182},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB05.05"}
+					{"type": "rc", "position": 0, "name": "RC_AB05.05", "devices":[]}
 				]
 			},
 			{
@@ -2708,7 +2706,7 @@
 			{
 				"start": {"x": -24169, "y": -300, "z": 23340},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB05.10"}
+					{"type": "rc", "position": 0, "name": "RC_AB05.10", "devices":[]}
 				]
 			},
 			{
@@ -2717,10 +2715,10 @@
 			{
 				"start": {"x": -25986, "y": -300, "z": 25986},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AA05.10"},
-					{"type": "rc", "position": 769, "name": "RC_AA05.15"},
-					{"type": "rc", "position": 1539, "name": "RC_AA05.20"},
-					{"type": "rc", "position": 2758, "name": "RC_AA05.25"}
+					{"type": "rc", "position": 0, "name": "RC_AA05.10", "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":[]}
 				]
 			},
 			{
@@ -2729,9 +2727,9 @@
 			{
 				"start": {"x": -14964, "y": -300, "z": 23718},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AC05.05"},
-					{"type": "rc", "position": 700, "name": "RC_AC05.10"},
-					{"type": "rc", "position": 1400, "name": "RC_AC05.15"}
+					{"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":[]}
 				]
 			},
 			{
@@ -2740,7 +2738,7 @@
 			{
 				"start": {"x": -21638, "y": -300, "z": 29673},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AA05.05"}
+					{"type": "rc", "position": 0, "name": "RC_AA05.05", "devices":[]}
 				]
 			},
 			{
@@ -2749,17 +2747,18 @@
 			{
 				"start": {"x": -16798, "y": -300, "z": 32968},
 				"components": [
-					{"type": "rshid", "position": 0, "name": "RSHID_AA05.05"}
+					{"type": "rd", "position": 0, "name": "RSHID_AA05.05", "devices":[]}
 				]
 			},
 			{
 				"start": {"x": -16807, "y": -300, "z": 32963}
 			},
 			{
-				"start": {"x": -24884, "y": -300, "z": 27390},
+				"start": {"x": -24084, "y": -300, "z": 27700},
 				"components": [
-					{"type": "rid", "position": 0, "name": "RID_AA05.05"},
-					{"type": "rid", "position": 611, "name": "RID_AA05.10"}
+					{"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":[]}
 				]
 			},
 			{
@@ -2768,12 +2767,12 @@
 			{
 				"start": {"x": -27524, "y": -300, "z": 19273},
 				"components": [
-					{"type": "rrf", "position": 0, "name": "RRF_AB05.05"},
-					{"type": "rrf", "position": 650, "name": "RRF_AB05.10"},
-					{"type": "rps", "position": 1759, "name": "RPS_AB06.05", "embedded":["PSOCT_S06.02","PSOCT_S06.01","PSTRCEB_S06.01","PSTRCEB_S06.02","PSB_S06.01","PSB_S06.02","PSB_S06.03"]},
-					{"type": "rps", "position": 2578, "name": "RPS_AB06.10", "embedded":["PSCFH_S06.01","PSCFV_S06.01","PSCEH_S06.01","PSCEV_S06.01","PSCEH_S06.02","PSCEV_S06.02","PSCEH_S06.03","PSQAB_S06.01","PSQAB_S06.02","PSSF_S06.01","PSSD_S06.01","PSSD_S06.02","PSSF_S06.02"]},
-					{"type": "rps", "position": 3399, "name": "RPS_AB06.15", "embedded":["PSCFH_S06.02","PSCFV_S06.02","PSCEH_S06.05","PSCEV_S06.05","PSCEH_S06.06","PSCEH_S06.06","PSCEH_S06.08","PSCEV_S06.08","PSQAB_S06.03","PSQAB_S06.04","PSQF_S06.01","PSSD_S06.03","PSSD_S06.04","PSSF_S06.03"]},
-					{"type": "rps", "position": 4220, "name": "RPS_AB06.20", "embedded":["PSCFH_S06.03","PSCFV_S06.03","PSQK_S06.01","PSCEV_S06.09","PSCEH_S06.10","PSCEV_S06.10","PSQK_S06.02","PSCEV_S06.11","PSCH_S06.01","PSCV_S06.01","PSQD_S06.01","PSQF_S06.02","PSQD_S06.02","PSSD_S06.05","PSSH_S06.01","PSSH_S06.02"]}
+					{"type": "rrf", "position": 0, "name": "RRF_AB05.05", "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"]}
 				]
 			},
 			{
@@ -2782,10 +2781,10 @@
 			{
 				"start": {"x": -32813, "y": -300, "z": 6975},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB06.25", "embedded":["PSCFH_S06.04","PSCFV_S06.04","PSCH_S06.02","PSCV_S06.02","PSQK_S06.03","PSCEH_S06.13","PSCEV_S06.13","PSQK_S06.04","PSQD_S06.03","PSQF_S06.03","PSQD_S06.04","PSSH_S06.03","PSSH_S06.04","PSSD_S06.06"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB06.30", "embedded":["PSCFH_S06.05","PSCFV_S06.05","PSCEH_S06.15","PSCEV_S06.15","PSCEH_S06.17","PSCEV_S06.17","PSCEH_S06.18","PSCEV_S06.18","PSQD_S06.04","PSQF_S06.04","PSQAB_S06.05","PSSF_S06.04","PSSD_S06.07","PSSD_S06.08"]},
-					{"type": "rps", "position": 1641, "name": "RPS_AB06.35", "embedded":["PSCFH_S06.06","PSCFV_S06.06","PSCEH_S06.20","PSCEV_S06.20","PSCEH_S06.21","PSCEV_S06.21","PSCEH_S06.22","PSCEV_S06.22","PSQAB_S06.06","PSQAB_S06.07","PSSF_S06.05","PSSD_S06.09","PSSD_S06.10","PSSF_S06.06"]},
-					{"type": "rps", "position": 2461, "name": "RPS_AB06.40", "embedded":["PSOCT_S06.03","PSOCT_S06.04","PSTRCEB_S06.03","PSTRCEB_S06.04","PSB_S06.04","PSB_S06.05","PSB_S06.06"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB06.25", "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"]}
 				]
 			},
 			{
@@ -2794,19 +2793,19 @@
 			{
 				"start": {"x": -34942, "y": -300, "z": 11862},
 				"components": [
-					{"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"}
+					{"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":[]}
 				]
 			},
 			{
-				"start": {"x": -29926, "y": -300, "z": 19452}
+				"start": {"x": -31926, "y": -300, "z": 19452}
 			},
 			{
 				"start": {"x": -32601, "y": -300, "z": 8128},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB06.05"}
+					{"type": "rc", "position": 0, "name": "RC_AB06.05", "devices":[]}
 				]
 			},
 			{
@@ -2815,18 +2814,18 @@
 			{
 				"start": {"x": -33518, "y": -300, "z": 2343},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB06.10"}
+					{"type": "rc", "position": 0, "name": "RC_AB06.10", "devices":[]}
 				]
 			},
 			{
 				"start": {"x": -33519, "y": -300, "z": 2333}
 			},
 			{
-				"start": {"x": -35270, "y": -300, "z": 11249},
+				"start": {"x": -36370, "y": -300, "z": 11249},
 				"components": [
-					{"type": "rid", "position": 0, "name": "RID_AA06.05"},
-					{"type": "rid", "position": 610, "name": "RID_AA06.10"},
-					{"type": "rid", "position": 1220, "name": "RID_AA06.15"}
+					{"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":[]}
 				]
 			},
 			{
@@ -2835,8 +2834,8 @@
 			{
 				"start": {"x": -33250, "y": -300, "z": -4556},
 				"components": [
-					{"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"]}
+					{"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"]}
 				]
 			},
 			{
@@ -2845,83 +2844,77 @@
 			{
 				"start": {"x": -32403, "y": -300, "z": -8681},
 				"components": [
-					{"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": "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"]}
+					{"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"]}
 				]
 			},
 			{
 				"start": {"x": -6542, "y": -300, "z": -77277}
 			},
 			{
-				"start": {"x": -36191, "y": -300, "z": -7198},
+				"start": {"x": -35691, "y": -300, "z": -7198},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RD_AA07.05"},
-					{"type": "rv", "position": 2457, "name": "RV_AA07.05"},
-					{"type": "rv", "position": 1649, "name": "RV_AA07.10"},
-					{"type": "rc", "position": 827, "name": "RCF_AA07.05"}
+					{"type": "rd", "position": 0, "name": "RD_AA07.05", "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":[]}
 				]
 			},
 			{
-				"start": {"x": -35652, "y": -300, "z": 1888}
+				"start": {"x": -36952, "y": -300, "z": 1888}
 			},
 			{
 				"start": {"x": -33415, "y": -300, "z": -3512},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB07.05"}
+					{"type": "rc", "position": 0, "name": "RC_AB07.05", "devices":[]}
 				]
 			},
 			{
 				"start": {"x": -33414, "y": -300, "z": -3522}
 			},
 			{
-				"start": {"x": -31769, "y": -300, "z": -10939},
+				"start": {"x": -37450, "y": -300, "z": 337},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB07.10"}
+					{"type": "rid", "position": 0, "name": "RSHID_AA07.05", "devices":[]}
 				]
 			},
 			{
-				"start": {"x": -31766, "y": -300, "z": -10948}
+				"start": {"x": -37481, "y": -300, "z": -1927}
 			},
 			{
-				"start": {"x": -36950, "y": -300, "z": 1937},
+				"start": {"x": -37356, "y": -300, "z": -2325},
 				"components": [
-					{"type": "rshid", "position": 0, "name": "RSHID_AA07.05"}
+					{"type": "rid", "position": 0, "name": "RID_AA07.05", "devices":[]},
+					{"type": "rid", "position": 603, "name": "RID_AA07.10", "devices":[]}
 				]
 			},
 			{
-				"start": {"x": -36951, "y": -300, "z": 1927}
+				"start": {"x": -36941, "y": -300, "z": -9991}
 			},
 			{
-				"start": {"x": -36856, "y": -300, "z": -3325},
+				"start": {"x": -33966, "y": -300, "z": -15579},
 				"components": [
-					{"type": "rid", "position": 0, "name": "RID_AA07.05"},
-					{"type": "rid", "position": 609, "name": "RID_AA07.10"}
+					{"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":[]}
 				]
 			},
 			{
-				"start": {"x": -36141, "y": -300, "z": -9991}
-			},
-			{
-				"start": {"x": -32966, "y": -300, "z": -16579},
-				"components": [
-					{"type": "rcry", "position": 0, "name": "RCRY_AA08.05"},
-					{"type": "rcry", "position": 610, "name": "RCRY_AA08.10"}
-				]
-			},
-			{
-				"start": {"x": -29952, "y": -300, "z": -22574}
+				"start": {"x": -30352, "y": -300, "z": -22574}
 			},
 			{
 				"start": {"x": -26435, "y": -300, "z": -20652},
 				"components": [
-					{"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"]}
+					{"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"]}
 				]
 			},
 			{
@@ -2930,10 +2923,10 @@
 			{
 				"start": {"x": -22447, "y": -300, "z": -24929},
 				"components": [
-					{"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"]}
+					{"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"]}
 				]
 			},
 			{
@@ -2942,8 +2935,8 @@
 			{
 				"start": {"x": -28164, "y": -300, "z": -23841},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RD_AA08.05"},
-					{"type": "rd", "position": 645, "name": "RD_AA08.10"}
+					{"type": "rd", "position": 0, "name": "RD_AA08.05", "devices":[]},
+					{"type": "rd", "position": 645, "name": "RD_AA08.10", "devices":[]}
 				]
 			},
 			{
@@ -2952,9 +2945,9 @@
 			{
 				"start": {"x": -29534, "y": -300, "z": -21802},
 				"components": [
-					{"type": "rv", "position": 0, "name": "RV_AA08.05"},
-					{"type": "rv", "position": 810, "name": "RV_AA08.10"},
-					{"type": "rc", "position": 1643, "name": "RCF_AA08.05"}
+					{"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":[]}
 				]
 			},
 			{
@@ -2963,7 +2956,7 @@
 			{
 				"start": {"x": -27182, "y": -300, "z": -19749},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB08.05"}
+					{"type": "rc", "position": 0, "name": "RC_AB08.05", "devices":[]}
 				]
 			},
 			{
@@ -2972,7 +2965,7 @@
 			{
 				"start": {"x": -23340, "y": -300, "z": -24169},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB08.10"}
+					{"type": "rc", "position": 0, "name": "RC_AB08.10", "devices":[]}
 				]
 			},
 			{
@@ -2981,9 +2974,9 @@
 			{
 				"start": {"x": -27333, "y": -300, "z": -24968},
 				"components": [
-					{"type": "rid", "position": 0, "name": "RID_AA08.05"},
-					{"type": "rid", "position": 610, "name": "RID_AA08.10"},
-					{"type": "rid", "position": 1220, "name": "RID_AA08.15"}
+					{"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":[]}
 				]
 			},
 			{
@@ -2992,10 +2985,11 @@
 			{
 				"start": {"x": -12567, "y": -300, "z": -31102},
 				"components": [
-					{"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"]}
+					{"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"]}
 				]
 			},
 			{
@@ -3004,70 +2998,53 @@
 			{
 				"start": {"x": -6975, "y": -300, "z": -32812},
 				"components": [
-					{"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"]}
+					{"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"]}
 				]
 			},
 			{
 				"start": {"x": 19579, "y": -300, "z": -38059}
 			},
 			{
-				"start": {"x": -11862, "y": -300, "z": -34941},
-				"components": [
-					{"type": "rd", "position": 0, "name": "RD_AA09.05"},
-					{"type": "rv", "position": 2456, "name": "RV_AA09.05"},
-					{"type": "rv", "position": 1649, "name": "RV_AA09.10"},
-					{"type": "rc", "position": 827, "name": "RCF_AA09.05"}
-				]
-			},
-			{
-				"start": {"x": -19452, "y": -300, "z": -29936}
-			},
-			{
-				"start": {"x": -13666, "y": -300, "z": -30695},
+				"start": {"x": -11862, "y": -300, "z": -33941},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB09.05"}
+					{"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":[]}
 				]
 			},
 			{
-				"start": {"x": -13657, "y": -300, "z": -30699}
+				"start": {"x": -19452, "y": -300, "z": -30936}
 			},
 			{
 				"start": {"x": -8128, "y": -300, "z": -32601},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB09.10"}
+					{"type": "rc", "position": 0, "name": "RC_AB09.10", "devices":[]}
 				]
 			},
 			{
 				"start": {"x": -8118, "y": -300, "z": -32603}
 			},
 			{
-				"start": {"x": -14879, "y": -300, "z": -33576},
+				"start": {"x": -11249, "y": -300, "z": -35469},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AA09.05"}
+					{"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":[]}
 				]
 			},
 			{
-				"start": {"x": -14870, "y": -300, "z": -33580}
-			},
-			{
-				"start": {"x": -11249, "y": -300, "z": -35269},
-				"components": [
-					{"type": "rid", "position": 0, "name": "RID_AA09.05"},
-					{"type": "rid", "position": 610, "name": "RID_AA09.10"},
-					{"type": "rid", "position": 1220, "name": "RID_AA09.15"}
-				]
-			},
-			{
-				"start": {"x": 1665, "y": -300, "z": -38932}
+				"start": {"x": 1665, "y": -300, "z": -39932}
 			},
 			{
 				"start": {"x": -19436, "y": -300, "z": -31718},
 				"components": [
-					{"type": "rrf", "position": 0, "name": "RRF_AA09.05"},
-					{"type": "rrf", "position": 649, "name": "RRF_AA09.10"}
+					{"type": "rrf", "position": 0, "name": "RRF_AA09.05", "devices":[]},
+					{"type": "rrf", "position": 649, "name": "RRF_AA09.10", "devices":[]}
 				]
 			},
 			{
@@ -3076,8 +3053,8 @@
 			{
 				"start": {"x": 4556, "y": -300, "z": -33249},
 				"components": [
-					{"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"]}
+					{"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"]}
 				]
 			},
 			{
@@ -3086,108 +3063,102 @@
 			{
 				"start": {"x": 8681, "y": -300, "z": -32402},
 				"components": [
-					{"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": "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": 5848, "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": 6664, "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"]}
+					{"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"]}
 				]
 			},
 			{
 				"start": {"x": 77277, "y": -300, "z": -6541}
 			},
 			{
-				"start": {"x": 7198, "y": -300, "z": -36190},
+				"start": {"x": 7198, "y": -300, "z": -35490},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RD_AA10.05" ,"reverse": true},
-					{"type": "rv", "position": 2520, "name": "RV_AA10.05" ,"reverse": true},
-					{"type": "rv", "position": 1714, "name": "RV_AA10.10" ,"reverse": true},
-					{"type": "rc", "position": 890, "name": "RCF_AA10.05" ,"reverse": true}
+					{"type": "rd", "position": 0, "name": "RD_AA10.05" ,"reverse": true, "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":[]}
 				]
 			},
 			{
-				"start": {"x": -2581, "y": -300, "z": -35783}
+				"start": {"x": -2581, "y": -300, "z": -36583}
 			},
 			{
 				"start": {"x": 3512, "y": -300, "z": -33415},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB10.05" ,"reverse": true}
+					{"type": "rc", "position": 0, "name": "RC_AB10.05" ,"reverse": true, "devices":[]}
 				]
 			},
 			{
 				"start": {"x": 3522, "y": -300, "z": -33414}
 			},
 			{
-				"start": {"x": 10939, "y": -300, "z": -31769},
-				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB10.10" ,"reverse": true}
-				]
-			},
-			{
-				"start": {"x": 10948, "y": -300, "z": -31766}
+				"start": {"x": 14956, "y": -300, "z": -33568}
 			},
 			{
-				"start": {"x": 14947, "y": -300, "z": -33572},
+				"start": {"x": 2260, "y": -300, "z": -37261},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AA10.05" ,"reverse": true}
+					{"type": "rid", "position": 0, "name": "RID_AA10.05" ,"reverse": true, "devices":[]},
+					{"type": "rid", "position": 610, "name": "RID_AA10.10" ,"reverse": true, "devices":[]}
 				]
 			},
 			{
-				"start": {"x": 14956, "y": -300, "z": -33568}
+				"start": {"x": 9937, "y": -300, "z": -37157}
 			},
 			{
-				"start": {"x": 3260, "y": -300, "z": -36861},
+				"start": {"x": -973, "y": -300, "z": -37187},
 				"components": [
-					{"type": "rid", "position": 0, "name": "RID_AA10.05" ,"reverse": true},
-					{"type": "rid", "position": 610, "name": "RID_AA10.10" ,"reverse": true}
+					{"type": "rrf", "position": 0, "name": "RRF_AA10.05" ,"reverse": true, "devices":[]},
+					{"type": "rrf", "position": 650, "name": "RRF_AA10.10" ,"reverse": true, "devices":[]}
 				]
 			},
 			{
-				"start": {"x": 9937, "y": -300, "z": -36157}
+				"start": {"x": 6155, "y": -300, "z": -37748}
 			},
 			{
-				"start": {"x": -973, "y": -300, "z": -37187},
+				"start": {"x": 15748, "y": -300, "z": -29719},
 				"components": [
-					{"type": "rrf", "position": 0, "name": "RRF_AA10.05" ,"reverse": true},
-					{"type": "rrf", "position": 650, "name": "RRF_AA10.10" ,"reverse": true}
+					{"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"]}					
 				]
 			},
 			{
-				"start": {"x": 6155, "y": -300, "z": -37748}
+				"start": {"x": 39064, "y": -300, "z": -12562}
 			},
 			{
-				"start": {"x": 15748, "y": -300, "z": -29619},
+				"start": {"x": 22355, "y": -300, "z": -20342},
 				"components": [
-					{"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"]}
+					{"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"]}
 				]
 			},
 			{
-				"start": {"x": 39464, "y": -300, "z": -16562}
+				"start": {"x": 50741, "y": -300, "z": 8973}
 			},
-			{
-				"start": {"x": 23355, "y": -300, "z": -20342},
+						{
+				"start": {"x": 27155, "y": -300, "z": -20042},
 				"components": [
-					{"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"]},
-					{"type": "rbtsps", "position": 4303, "name": "RBTSPS_AB11.05" ,"reverse": true},
-					{"type": "rbtsps", "position": 4764, "name": "RBTSPS_AB11.10" ,"reverse": true},
-					{"type": "rbtsps", "position": 5259, "name": "RBTSPS_AB11.15" ,"reverse": true},
-					{"type": "rbtsps", "position": 5777, "name": "RBTSPS_AB11.20" ,"reverse": true}
+					{"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":[]}
 				]
 			},
 			{
-				"start": {"x": 79741, "y": -300, "z": 8973}
+				"start": {"x": 43541, "y": -300, "z": 8973}
 			},
 			{
 				"start": {"x": 19197, "y": -300, "z": -31512},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RD_AA11.05" ,"reverse": true}
+					{"type": "rd", "position": 0, "name": "RD_AA11.05" ,"reverse": true, "devices":[]}
 				]
 			},
 			{
@@ -3196,18 +3167,18 @@
 			{
 				"start": {"x": 21203, "y": -300, "z": -21576},
 				"components": [
-					{"type": "rbtsd", "position": 0, "name": "RBTSD_AB11.05" ,"reverse": true}
+					{"type": "rd", "position": 0, "name": "RBTSD_AB11.05" ,"reverse": true, "devices":[]}
 				]
 			},
 			{
 				"start": {"x": 21210, "y": -300, "z": -21569}
 			},
 			{
-				"start": {"x": 16285, "y": -300, "z": -32898},
+				"start": {"x": 16285, "y": -300, "z": -33098},
 				"components": [
-					{"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}
+					{"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":[]}
 				]
 			},
 			{
@@ -3216,7 +3187,7 @@
 			{
 				"start": {"x": 28805, "y": -300, "z": -17103},
 				"components": [
-					{"type": "rbtsv", "position": 0, "name": "RBTSV_AB11.05" ,"reverse": true}
+					{"type": "rv", "position": 0, "name": "RBTSV_AB11.05" ,"reverse": true, "devices":[]}
 				]
 			},
 			{
@@ -3225,7 +3196,7 @@
 			{
 				"start": {"x": 21728, "y": -300, "z": -22110},
 				"components": [
-					{"type": "rbtsc", "position": 0, "name": "RBTSC_AB11.05" ,"reverse": true}
+					{"type": "rc", "position": 0, "name": "RBTSC_AB11.05" ,"reverse": true, "devices":[]}
 				]
 			},
 			{
@@ -3234,26 +3205,27 @@
 			{
 				"start": {"x": 13022, "y": -300, "z": -27303},
 				"components": [
-					{"type": "rid", "position": 0, "name": "RID_AB11.05" ,"reverse": true},
-					{"type": "rid", "position": 793, "name": "RID_AB11.10" ,"reverse": true}
+					{"type": "rid", "position": 0, "name": "RID_AB11.05" ,"reverse": true, "devices":[]},
+					{"type": "rid", "position": 793, "name": "RID_AB11.10" ,"reverse": true, "devices":[]}
 				]
 			},
 			{
 				"start": {"x": 20843, "y": -300, "z": -23442}
 			},
 			{
-				"start": {"x": 15636, "y": -300, "z": -33533},
+				"start": {"x": 14436, "y": -300, "z": -33733},
 				"components": [
-					{"type": "rshid", "position": 0, "name": "RSHID_AA11.05" ,"reverse": true}
+					{"type": "rc", "position": -603, "name": "RC_AA10.05" ,"reverse": true, "devices":[]},
+					{"type": "rd", "position": 0, "name": "RSHID_AA11.05" ,"reverse": true, "devices":[]}
 				]
 			},
 			{
-				"start": {"x": 15645, "y": -300, "z": -33529}
+				"start": {"x": 15645, "y": -300, "z": -33229}
 			},
 			{
 				"start": {"x": 19826, "y": -300, "z": -31121},
 				"components": [
-					{"type": "rcry", "position": 0, "name": "RCRY_AA11.05" ,"reverse": true}
+					{"type": "rcry", "position": 0, "name": "RCRY_AA11.05" ,"reverse": true, "devices":[]}
 				]
 			},
 			{
@@ -3262,10 +3234,10 @@
 			{
 				"start": {"x": 31102, "y": -300, "z": -12566},
 				"components": [
-					{"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"]}
+					{"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"]}
 				]
 			},
 			{
@@ -3274,10 +3246,10 @@
 			{
 				"start": {"x": 32812, "y": -300, "z": -6974},
 				"components": [
-					{"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"]}
+					{"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"]}
 				]
 			},
 			{
@@ -3286,9 +3258,9 @@
 			{
 				"start": {"x": 36086, "y": -300, "z": -6730},
 				"components": [
-					{"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}
+					{"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":[]}
 				]
 			},
 			{
@@ -3297,7 +3269,7 @@
 			{
 				"start": {"x": 30695, "y": -300, "z": -13666},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB12.05" ,"reverse": true}
+					{"type": "rc", "position": 0, "name": "RC_AB12.05" ,"reverse": true, "devices":[]}
 				]
 			},
 			{
@@ -3306,28 +3278,33 @@
 			{
 				"start": {"x": 32601, "y": -300, "z": -8128},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB12.10" ,"reverse": true}
+					{"type": "rc", "position": 0, "name": "RC_AB12.10" ,"reverse": true, "devices":[]}
 				]
 			},
 			{
 				"start": {"x": 32603, "y": -300, "z": -8118}
 			},
 			{
-				"start": {"x": 32414, "y": -300, "z": -17269},
+				"start": {"x": 32042, "y": -300, "z": -20592},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RD_AA12.05" ,"reverse": true},
-					{"type": "rd", "position": 678, "name": "RD_AA12.15" ,"reverse": true}
+					{"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":[]}
 				]
 			},
 			{
-				"start": {"x": 26342, "y": -300, "z": -21592}
+				"start": {"x": 33642, "y": -300, "z": -17592}
 			},
 			{
 				"start": {"x": 36644, "y": -300, "z": -4337},
 				"components": [
-					{"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}
+					{"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":[]}
 				]
 			},
 			{
@@ -3336,21 +3313,424 @@
 			{
 				"start": {"x": 33765, "y": -300, "z": -14577},
 				"components": [
-					{"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}
+					{"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":[]}
 				]
 			},
 			{
 				"start": {"x": 56238, "y": -300, "z": 48629}
+			},
+			{
+				"start": {"x": 9380, "z": -35740}
+			},
+			{
+				"start": {"x": 9260, "z": -34980},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 13100, "z": -33860},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 13640, "z": -36720},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 21140, "z": -33060},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 26100, "z": -28580},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 24160, "z": -25360},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 34780, "z": -18060},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 38500, "z": -6760},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 39120, "z": 1720},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 37080, "z": 11640},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 36040, "z": 11500},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 35660, "z": 9360}
+			},
+			{
+				"start": {"x": 34900, "z": 9220},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 33840, "z": 13000},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 36680, "z": 13660},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 32980, "z": 21040},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 25100, "z": 30020},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 18000, "z": 34740},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 6640, "z": 38480},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -1780, "z": 39080},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -11680, "z": 37060},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -11500, "z": 36060},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -9400, "z": 35600}
+			},
+			{
+				"start": {"x": -9240, "z": 34860},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -13020, "z": 33780},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -13680, "z": 36580},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -21100, "z": 32920},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -30020, "z": 25040},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -34760, "z": 17920},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -38520, "z": 6660},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -39100, "z": -1920},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -37100, "z": -11800},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -36020, "z": -11600},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -35600, "z": -9460}
+			},
+			{
+				"start": {"x": -34900, "z": -9360},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -33800, "z": -13180},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -36600, "z": -13740},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -32940, "z": -21260},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -25040, "z": -30160},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -17940, "z": -34840},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -6700, "z": -38620},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 1840, "z": -39200},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 11680, "z": -37180},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 11500, "z": -36140},
+				"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": 20160, "z": -21240},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 23460, "z": -17440},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 26140, "z": -13060},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 28080, "z": -8220},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 28500, "z": -6200},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 28780, "z": -4540}
+			},
+			{
+				"start": {"x": 29060, "z": -3360},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 29160, "z": 1880},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 28380, "z": 6980},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 26780, "z": 11680},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 24280, "z": 16120},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 21220, "z": 20120},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 19580, "z": 21540},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 18240, "z": 22680}
+			},
+			{
+				"start": {"x": 17120, "z": 23620},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 12940, "z": 26180},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 8300, "z": 27960},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 3280, "z": 28960},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -1760, "z": 29100},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -6920, "z": 28300},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -8920, "z": 27720},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -10660, "z": 27120}
+			},
+			{
+				"start": {"x": -11600, "z": 26840},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -16080, "z": 24380},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -18260, "z": 22660},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -20040, "z": 21180}
+			},
+			{
+				"start": {"x": -23540, "z": 17360},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -26040, "z": 13020},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -20880, "z": 11000},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -21620, "z": 8940},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -21960, "z": 8120}
+			},
+			{
+				"start": {"x": -22800, "z": 6040},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -28040, "z": 8120},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -28460, "z": 6060},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -28780, "z": 4380}
+			},
+			{
+				"start": {"x": -29020, "z": 3140},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -29140, "z": -1880},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -28320, "z": -7040},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -26800, "z": -11760},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -24300, "z": -16340},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -21300, "z": -20060},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -19540, "z": -21700},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -18220, "z": -22800}
+			},
+			{
+				"start": {"x": -17320, "z": -23600},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -12940, "z": -26280},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -8180, "z": -28120},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": -3260, "z": -29160},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 1760, "z": -29220},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 7000, "z": -28460},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 8900, "z": -27780},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 10540, "z": -27220}
+			},
+			{
+				"start": {"x": 11780, "z": -26820},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 13540, "z": -25860},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 19780, "z": -27460},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 22060, "z": -27460},
+				"chamber": {"type": "wall"}
+			},
+			{
+				"start": {"x": 24740, "z": -26920},
+				"chamber": {"type": "wall"}
 			}
 		]
 	}
-- 
GitLab