diff --git a/fermi_lattice.json b/fermi_lattice.json
index d4bf23631282d8b6a1b1435d3ac11c3da09af08b..14fc50fb0cead07db007e6531fc385024c2ba63e 100644
--- a/fermi_lattice.json
+++ b/fermi_lattice.json
@@ -31,23 +31,27 @@
 				"start": {"x": -173929, "z": -5811},
 				"components": [
 					{"type": "INJ", "position": 0, "name": "INJ_01"},
-					{"type": "gun", "position": -100, "name": "GUN_INJ.01"},
+					{"type": "gun", "position": -200, "name": "GUN_INJ.01"},
+					{"type": "sip", "position": 30, "name": "SIP150_INJ.01", "name2": "SIP75_INJ.01", "name3": "SIP75_INJ.02","offset2d": [30, -40], "labelReverse": [90, -220, 150]},
 					{"type": "SOL", "position": -130, "name": "SOL_INJ.01"},
 					{"type": "vlv", "position": 200, "name": "VLV_INJ.01", "labelReverse": [90, 1350, 200]},
-					{"type": "correctorfermi", "position": 300, "ps": ["PSCH_INJ.01","PSCV_INJ.01"], "name": "CHV_INJ.01"},
-					{"type": "cm", "position": 450, "name": "CM_INJ.01", "labelReverse": [90, -220, 150]},
-					{"type": "flsc", "position": 550, "name": "YSCR_INJ.01"},
-					{"type": "flsc", "position": 720, "name": "YSCR_INJ.02"},
+					{"type": "sip", "position": 270, "name": "SIP55_INJ.01", "name2": "SIP75_SPINJ.01", "offset2d": [30, -40], "labelReverse": [90, -160, 150]},
+					{"type": "correctorfermi", "position": 400, "ps": ["PSCH_INJ.01","PSCV_INJ.01"], "name": "CHV_INJ.01"},
+					{"type": "cm", "position": 550, "name": "CM_INJ.01", "labelReverse": [90, -220, 150]},
+					{"type": "flsc", "position": 650, "name": "YSCR_INJ.01"},
+					{"type": "flsc", "position": 820, "name": "YSCR_INJ.02"},
 					{"type": "FC", "position": 931, "name": "FC_INJ.01"},
 					{"type": "flsc", "position": 1600, "name": "YSCR_INJ.03"},
 					{"type": "bpm", "position": 1850, "name": "BPM_INJ.01"},
 					{"type": "correctorfermi", "position": 2051, "ps": ["PSCH_INJ.02","PSCV_INJ.02"], "name": "CHV_INJ.02"},
 					{"type": "vlv", "position": 2290, "name": "VLV_L00.01"},
+					{"type": "sip", "position": 2380, "name": "SIP75_L00.01","name2": "SIP75_L00.02","name3": "SIP20_L00.01","name4": "SIP20_L00.01", "offset2d": [30, -40], "labelReverse": [90, -250, 250]},
 					{"type": "cavitylinac", "position": 2502, "name": "ACCT_L00.01"},
 					{"type": "SOL", "position": 4636, "name": "SOL_L0.01"},
 					{"type": "ACCT", "position": 4221, "name": "ACCT_L00.01"},
 					{"type": "blm", "position": 4221, "name": "BLM_ACCT_L00.01"},
 					{"type": "ACCT", "position": 4887, "name": "ACCT0_L00.01"},
+					{"type": "sip", "position": 4700, "name": "SIP55_L00.01","name2": "SIP55_L00.02", "offset2d": [30, -40], "labelReverse": [90, -250, 250]},
 					{"type": "bpm", "position": 4868, "name": "RTBPM_L00.01"},
 					{"type": "quadrupolefermi", "position": 5049, "name": "Q_L00.01"},
 					{"type": "blm", "position": 5149, "name": "BLM_Q_L00.01"},
@@ -55,6 +59,7 @@
 					{"type": "blm", "position": 5339, "name": "BLM_Q_L00.02"},
 					{"type": "flsc", "position": 5541, "name": "MSCR_L00.01"},
 					{"type": "blm", "position": 5541, "name": "BLM_MSCR_L00.01"},
+					{"type": "sip", "position": 5800, "name": "SIP75_L00.03","name2": "SIP75_L00.04","name3": "SIP20_L00.03","name4": "SIP20_L00.04", "offset2d": [30, -40], "labelReverse": [90, -250, 250]},
 					{"type": "ACCT0", "position": 5598, "name": "ACCT0_L00.02"},
 					{"type": "SOL", "position": 5906, "name": "SOL_L00.02"},
 					{"type": "cavitylinac", "position": 6402, "name": "ACCT_L00.02"},
@@ -63,10 +68,12 @@
 					{"type": "ACCT0", "position": 9207, "name": "ACCT0_L00.02"},
 					{"type": "L00", "position": 9207, "name": "L00"},
 					{"type": "LH", "position": 9207, "name": "LH_01"},
+					{"type": "sip", "position": 9100, "name": "SIP55_L00.03","name2": "SIP55_L00.04", "offset2d": [30, -40], "labelReverse": [90, -250, 250]},
 					{"type": "cm", "position": 9301, "name": "CM_LH.01"},
 					{"type": "quadrupolefermi", "position": 9521, "name": "Q_LH.01"},
 					{"type": "blm", "position": 9521, "name": "BLM_Q_LH.01"},
 					{"type": "vlv", "position": 9880, "name": "VLV_LH.01"},
+					{"type": "sip", "position": 9975, "name": "SIP55_LH.01", "offset2d": [30, -40], "labelReverse": [90, -250, 250]},
 					{"type": "quadrupolefermi", "position": 10111, "name": "Q_LH.02"},
 					{"type": "correctorfermi", "position": 10451, "ps": ["PSCH_LH.01","PSCV_LH.01"], "name": "CHV_LH.01"},
 					{"type": "quadrupolefermi", "position": 10811, "name": "Q_LH.03"},
@@ -77,6 +84,7 @@
 					{"type": "blm", "position": 12081, "name": "BLM_MSCR_LH.01"},
 					{"type": "correctorfermi", "position": 12281, "ps": ["PSCH_LH.02","PSCV_LH.02"], "name": "CHV_LH.02"},
 					{"type": "bpm", "position": 12536, "name": "RTBPM_LH.01"},
+					{"type": "sip", "position": 12700, "name": "SIP55_LH.02", "offset2d": [30, -40], "labelReverse": [90, -250, 250]},
 					{"type": "BAM", "position": 13044, "name": "BAM_LH.01"},
 					{"type": "bpm", "position": 13600, "name": "RTBPM_LH.02"},
 					{"type": "LS", "position": 14096, "name": "LS_CHICANE"}
@@ -94,7 +102,7 @@
 				]
 			},
 			{
-				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "-PI", "length": 100, "name": "B_SPINJ.01", "labelReverse": [63.5, 1300, 0]},
+				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "-PI", "length": 200, "name": "B_SPINJ.01", "labelReverse": [63.5, 1300, 0]},
 				"start": {"x": -172609, "z": -5811},
 				"components": [
 					{"type": "bpm", "position": 350, "name": "BPM_SPINJ.01", "labelReverse": [90, -350, 300]},
@@ -125,6 +133,7 @@
 					{"type": "flsc", "position": 326, "name": "MSCR_LH.02"},
 					{"type": "blm", "position": 326, "name": "BLM_MSCR_LH.02"},
 					{"type": "miniundulator", "position": 536, "name": "ID_LH.01", "labelReverse": [90, 1350, 800]},
+					{"type": "sip", "position": 1600, "name": "SIP55_LH.03", "offset2d": [30, -40], "labelReverse": [90, -250, 250]},
 					{"type": "flsc", "position": 1790, "name": "MSCR_LH.03"},
 					{"type": "blm", "position": 1790, "name": "BLM_MSCR_LH.03"},
 					{"type": "bpm", "position": 2076, "name": "RTBPM_LH.03"}
@@ -148,6 +157,7 @@
 					{"type": "bpm", "position": 710, "name": "RTBPM_LH.04", "labelReverse": [90, 1700, 200]},
 					{"type": "quadrupolefermi", "position": 925, "name": "Q_LH.05", "labelReverse": [90, 1150, 300]},
 					{"type": "blm", "position": 925, "name": "BLM_Q_LH.05"},
+					{"type": "sip", "position": 1200, "name": "SIP55_SPLH.01","name2": "SIP55_SPLH.02", "offset2d": [30, -40], "labelReverse": [90, -250, 250]},
 					{"type": "LH", "position": 1250, "name": "LH_01"},
 					{"type": "SPLH", "position": 1250, "name": "SPLH"}
 				]
@@ -178,6 +188,7 @@
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "LH", "position": 496, "name": "LH_02"},
+					
 					{"type": "bpm", "position": 506, "name": "RTBPM_LH.05", "labelReverse": [90, -470, 270]},
 					{"type": "flsc", "position": 736, "name": "MSCR_LH.04", "labelReverse": [90, -470, 270]},
 					{"type": "blm", "position": 736, "name": "BLM_MSCR_LH.04"},
@@ -185,14 +196,16 @@
 					{"type": "blm", "position": 1075, "name": "BLM_Q_LH.06"},
 					{"type": "vlv", "position": 1430, "name": "VLV_L01.01", "labelReverse": [90, -420, 220]},
 					{"type": "correctorfermi", "position": 1651, "ps": ["PSCH_LH.04","PSCV_LH.04"], "name": "CHV_LH.04", "labelReverse": [90, -470, 300]},
-					{"type": "quadrupolefermi", "position": 1891, "name": "Q_LH.07"},
+					{"type": "quadrupolefermi", "position": 1891, "name": "Q_LH.07", "labelReverse": [90, -470, 300]},
 					{"type": "blm", "position": 1811, "name": "BLM_Q_LH.07"},
+					{"type": "sip", "position": 2200, "name": "SIP300_L01.01","name2": "SIP75_L01.01", "name3": "SIP75_L01.02","name4": "SIP300_L01.02","name5": "SIP300_L01.03","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
 					{"type": "LH", "position": 2011, "name": "LH_02"},
 					{"type": "L01", "position": 2011, "name": "L01"},
 					{"type": "cavitylinac", "position": 2711, "name": "ACCT_L01.01"},
 					{"type": "blm", "position": 2711, "name": "BLM_ACCT_L01.01"},
 					{"type": "ACCT", "position": 4419, "name": "ACCT_L01.01"},
 					{"type": "ACCT", "position": 6807, "name": "ACCT_L01.01"},
+					{"type": "sip", "position": 6600, "name": "SIP75_L01.03","name2": "SIP75_L01.04", "name3": "SIP300_L01.04","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
 					{"type": "bpm", "position": 6736, "name": "RTBPM_L01.01"},
 					{"type": "quadrupolefermi", "position": 7023, "name": "Q_L01.01"},
 					{"type": "blm", "position": 7023, "name": "BLM_Q_L01.01"},
@@ -209,11 +222,13 @@
 					{"type": "ACcorrectorfermi", "position": 13261, "name": "ACCH_L01.01"},
 					{"type": "bpm", "position": 13317, "name": "RTBPM_L01.03"},
 					{"type": "vlv", "position": 13700, "name": "VLV_L01.02", "labelReverse": [90, 1370, 170]},
+					{"type": "sip", "position": 13900, "name": "SIP300_L01.05","name2": "SIP75_L01.05", "name3": "SIP75_L01.06","name4": "SIP300_L01.06","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
 					{"type": "cavitylinac", "position": 14225, "name": "ACCT_L01.03"},
 					{"type": "blm", "position": 14225, "name": "BLM_ACCT_L01.03"},
 					{"type": "ACCT", "position": 16511, "name": "ACCT_L01.04"},
 					{"type": "blm", "position": 16511, "name": "BLM_ACCT_L01.04"},
 					{"type": "ACCT", "position": 18809, "name": "ACCT_L01.03"},
+					{"type": "sip", "position": 18600, "name": "SIP300_L01.07","name2": "SIP75_L01.07", "name3": "SIP75_L01.08","name4": "SIP300_L01.08","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
 					{"type": "bpm", "position": 18828, "name": "RTBPM_L01.04"},
 					{"type": "quadrupolefermi", "position": 19136, "name": "Q_L01.03"},
 					{"type": "blm", "position": 19136, "name": "BLM_Q_L01.03"},
@@ -226,9 +241,10 @@
 					{"type": "bpm", "position": 24424, "name": "RTBPM_L01.05"},
 					{"type": "quadrupolefermi", "position": 24717, "name": "Q_L01.04"},
 					{"type": "blm", "position": 24717, "name": "BLM_Q_L01.04"},
-					{"type": "correctorfermi", "position": 25108, "ps": ["PSCH_L01.04","PSCV_L01.04"], "name": "CHV_L01.04"},
+					{"type": "correctorfermi", "position": 25008, "ps": ["PSCH_L01.04","PSCV_L01.04"], "name": "CHV_L01.04"},
 					{"type": "plc", "position": 24717, "name": "SPIN_L01.01", "offset3d": [0, -700, 0], "offset2d": [0, 300], "labelReverse": [90, -250, 250]},
-					{"type": "vlv", "position": 25370, "name": "VLV_BC01.01"},
+					{"type": "vlv", "position": 25270, "name": "VLV_BC01.01"},
+					{"type": "sip", "position": 25400, "name": "SIP150_BC01.01","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
 					{"type": "L01", "position": 25667, "name": "L01"},
 					{"type": "BC01", "position": 25667, "name": "BC01_01"}
 				]
@@ -241,7 +257,8 @@
 					{"type": "blm", "position": 100, "name": "BLM_B_BC01.01_L"},
 					{"type": "blm", "position": 100, "name": "BLM_B_BC01.01_R"},
 					{"type": "quadrupolefermi", "position": 602, "name": "Q_BC01.01", "labelReverse": [90, 1300, 250]},
-					{"type": "blm", "position": 602, "name": "BLM_Q_BC01.01"}
+					{"type": "blm", "position": 602, "name": "BLM_Q_BC01.01"},
+					{"type": "sip", "position": 2302, "name": "SIP150_BC01.02","offset2d": [30, -40], "labelReverse": [90, -470, 200]}
 				]
 			},
 			{
@@ -263,6 +280,7 @@
 				"components": [
 					{"type": "blm", "position": 100, "name": "BLM_B_BC01.03_L"},
 					{"type": "blm", "position": 100, "name": "BLM_B_BC01.03_R"},
+					{"type": "sip", "position": 300, "name": "SIP55_BC01.01","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
 					{"type": "quadrupolefermi", "position": 2392, "name": "Q_BC01.02"},
 					{"type": "blm", "position": 2392, "name": "BLM_Q_BC01.02"}
 				]
@@ -283,14 +301,16 @@
 					{"type": "vlv", "position": 2200, "name": "VLV_BC01.02", "labelReverse": [90, 1480, 200]},
 					{"type": "DCAV", "position": 3022, "name": "DCAV_BC01.01"},
 					{"type": "blm", "position": 3022, "name": "BLM_DCAV_BC01.01"},
-					{"type": "vlv", "position": 3200, "name": "VLV_BC01.03", "labelReverse": [90, 1480, 200]},
+					{"type": "vlv", "position": 3100, "name": "VLV_BC01.03", "labelReverse": [90, 1480, 200]},
+					{"type": "sip", "position": 3250, "name": "SIP300_BC01.01","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
 					{"type": "quadrupolefermi", "position": 3492, "name": "Q_BC01.03", "labelReverse": [90, 1280, 200]},
 					{"type": "blm", "position": 3492, "name": "BLM_Q_BC01.03"},
 					{"type": "quadrupolefermi", "position": 3942, "name": "Q_BC01.04", "labelReverse": [90, 1280, 200]},
 					{"type": "blm", "position": 3942, "name": "BLM_Q_BC01.04"},
 					{"type": "correctorfermi", "position": 4367, "ps": ["PSCH_BC01.02","PSCV_BC01.02"], "name": "CHV_BC01.02", "labelReverse": [90, 1530, 250]},
-					{"type": "quadrupolefermi", "position": 4642, "name": "Q_BC01.05", "labelReverse": [90, 1280, 300]},
-					{"type": "blm", "position": 4642, "name": "BLM_Q_BC01.05"},
+					{"type": "quadrupolefermi", "position": 4602, "name": "Q_BC01.05", "labelReverse": [90, 1280, 300]},
+					{"type": "blm", "position": 4602, "name": "BLM_Q_BC01.05"},
+					{"type": "sip", "position": 4902, "name": "SIP55_BC01.02","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
 					{"type": "quadrupolefermi", "position": 5092, "name": "Q_BC01.06", "labelReverse": [90, 1280, 300]},
 					{"type": "blm", "position": 5092, "name": "BLM_Q_BC01.06"},
 					{"type": "bpm", "position": 5423, "name": "RTBPM_BC01.03", "labelReverse": [90, 1850, 200]},
@@ -302,6 +322,8 @@
 					{"type": "blm", "position": 6667, "name": "BLM_GCOL_BC01.01"},
 					{"type": "flsc", "position": 7269, "name": "MSCR_BC01.02", "labelReverse": [90, 1750, 300]},
 					{"type": "blm", "position": 7269, "name": "BLM_MSCR_BC01.02"},
+					{"type": "sip", "position": 10300, "name": "SIP55_BC01.03","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
+					{"type": "sip", "position": 10000, "name": "SIP300_BC01.02","name2": "SIP55_BC01.04","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
 					{"type": "flsc", "position": 12350, "name": "MSCR_BC01.03", "labelReverse": [90, 1750, 300]},
 					{"type": "correctorfermi", "position": 13128, "ps": ["PSCH_BC01.04","PSCV_BC01.04"], "name": "CHV_BC01.04", "labelReverse": [90, 1550, 250]},
 					{"type": "quadrupolefermi", "position": 13444, "name": "Q_BC01.08", "labelReverse": [90, 1280, 300]},
@@ -310,7 +332,7 @@
 					{"type": "correctorfermi", "position": 13843, "ps": ["PSCH_BC01.05","PSCV_BC01.05"], "name": "CHV_BC01.05", "labelReverse": [90, 1550, 250]},
 					{"type": "quadrupolefermi", "position": 14278, "name": "Q_BC01.09", "labelReverse": [90, 1280, 300]},
 					{"type": "blm", "position": 14278, "name": "BLM_Q_BC01.09"},
-					{"type": "bpm", "position": 14568, "name": "RTBPM_BC01.04", "labelReverse": [90, 1850, 300]},
+					{"type": "bpm", "position": 14568, "name": "RTBPM_BC01.04", "labelReverse": [90, -350, 250]},
 					{"type": "BC01", "position": 15259, "name": "BC01_01"},
 					{"type": "SPBC01", "position": 15259, "name": "SPBC01"}
 				]
@@ -320,6 +342,7 @@
 				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI/2", "length": 320, "name": "B_SPBC01.01", "labelReverse": [-72, -300, 100]},
 				"chamber": {"type": "chamber"},
 				"components": [
+					{"type": "sip", "position": 300, "name": "SIP55_SPBC01.01","offset2d": [30, -40], "labelReverse": [270, -270, 0]},
 					{"type": "bpm", "position": 589, "name": "BPM_SPBC01.01"},
 					{"type": "quadrupolefermi", "position": 1128, "name": "Q_SPBC01.01"},
 					{"type": "quadrupolefermi", "position": 1678, "name": "Q_SPBC01.02"},
@@ -356,18 +379,21 @@
 					{"type": "quadrupolefermi", "position": 3374, "name": "Q_BC01.11"},
 					{"type": "blm", "position": 3474, "name": "BLM_Q_BC01.11"},
 					{"type": "vlv", "position": 3710, "name": "VLV_L02.01", "labelReverse": [90, 1380, 250]},
+					{"type": "sip", "position": 3910, "name": "SIP300_L02.01","name2": "SIP75_L02.01","name3": "SIP75_L02.03","name4": "SIP300_L02.02","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
 					{"type": "BC01", "position": 3910, "name": "BC01_02"},
 					{"type": "L02", "position": 3910, "name": "L02"},
-					{"type": "cavitylinac", "position": 3910, "name": "ACCT_L02.01"},
-					{"type": "blm", "position": 3910, "name": "BLM_ACCT_L02.01"},
+					{"type": "cavitylinac", "position": 4110, "name": "ACCT_L02.01"},
+					{"type": "blm", "position": 4110, "name": "BLM_ACCT_L02.01"},
 					{"type": "ACCT", "position": 6320, "name": "ACCT_L02.01"},
 					{"type": "ACCT", "position": 8708, "name": "ACCT_L02.01"},
+					{"type": "sip", "position": 8428, "name": "SIP300_L02.03","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
 					{"type": "bpm", "position": 8578, "name": "RTBPM_L02.01"},
 					{"type": "quadrupolefermi", "position": 8803, "name": "Q_L02.01"},
 					{"type": "blm", "position": 8953, "name": "BLM_Q_L02.01"},
 					{"type": "correctorfermi", "position": 9193, "ps": ["PSCH_L02.01","PSCV_L02.01"], "name": "CHV_L02.01"},
-					{"type": "cavitylinac", "position": 9506, "name": "ACCT_L02.02"},
-					{"type": "blm", "position": 9506, "name": "BLM_ACCT_L02.02"},
+					{"type": "sip", "position": 9393, "name": "SIP300_L02.04","name2": "SIP75_L02.03","name3": "SIP75_L02.04","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
+					{"type": "cavitylinac", "position": 9606, "name": "ACCT_L02.02"},
+					{"type": "blm", "position": 9606, "name": "BLM_ACCT_L02.02"},
 					{"type": "ACCT", "position": 11916, "name": "ACCT_L02.02"},
 					{"type": "ACCT", "position": 14304, "name": "ACCT_L02.02"},
 					{"type": "bpm", "position": 14134, "name": "RTBPM_L02.02"},
@@ -376,16 +402,19 @@
 					{"type": "blm", "position": 14439, "name": "BLM_Q_L02.02"},
 					{"type": "correctorfermi", "position": 14729, "ps": ["PSCH_L02.02","PSCV_L02.02"], "name": "CHV_L02.02"},
 					{"type": "vlv", "position": 15000, "name": "VLV_L02.02", "labelReverse": [90, 1380, 250]},
-					{"type": "cavitylinac", "position": 15202, "name": "ACCT_L02.03", "length": 200},
+					{"type": "sip", "position": 15150, "name": "SIP300_L02.05","name2": "SIP75_L02.05","name3": "SIP75_L02.06","name4": "SIP300_L02.06","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
+					{"type": "cavitylinac", "position": 15302, "name": "ACCT_L02.03", "length": 200},
 					{"type": "blm", "position": 15102, "name": "BLM_ACCT_L02.03"},
 					{"type": "ACCT", "position": 17512, "name": "ACCT_L02.03"},
 					{"type": "ACCT", "position": 19900, "name": "ACCT_L02.03"},
+					{"type": "sip", "position": 19750, "name": "SIP300_L02.07","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
 					{"type": "bpm", "position": 19830, "name": "RTBPM_L02.03"},
 					{"type": "quadrupolefermi", "position": 20125, "name": "Q_L02.03"},
 					{"type": "blm", "position": 20125, "name": "BLM_Q_L02.03"},
 					{"type": "correctorfermi", "position": 20426, "ps": ["PSCH_L02.03","PSCV_L02.03"], "name": "CHV_L02.03"},
 					{"type": "ACCT", "position": 22300, "name": "ACCT_L02.04"},
 					{"type": "blm", "position": 22300, "name": "BLM_ACCT_L02.04"},
+					{"type": "sip", "position": 23740, "name": "SIP300_L02.08","name2": "SIP75_L03.03","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
 					{"type": "bpm", "position": 23846, "name": "RTBPM_L02.04"},
 					{"type": "quadrupolefermi", "position": 24041, "name": "Q_L02.04"},
 					{"type": "blm", "position": 24041, "name": "BLM_Q_L02.04"},
@@ -393,17 +422,20 @@
 					{"type": "vlv", "position": 24590, "name": "VLV_L03.01"},
 					{"type": "L02", "position": 24700, "name": "L02"},
 					{"type": "L03", "position": 24700, "name": "L03"},
-					{"type": "cavitylinac", "position": 24800, "name": "ACCBT_L03.01"},
+					{"type": "cavitylinac", "position": 24900, "name": "ACCBT_L03.01"},
 					{"type": "ACCBT", "position": 27931, "name": "ACCBT_L03.01"},
 					{"type": "ACCBT", "position": 31133, "name": "ACCBT_L03.01"},
+					{"type": "sip", "position": 30900, "name": "SIP75_L03.04","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
 					{"type": "bpm", "position": 31063, "name": "RTBPM_L03.01"},
 					{"type": "quadrupolefermi", "position": 31371, "name": "Q_L03.01"},
 					{"type": "blm", "position": 31371, "name": "BLM_Q_L03.01"},
 					{"type": "correctorfermi", "position": 31695, "ps": ["PSCH_L03.01","PSCV_L03.01"], "name": "CHV_L03.01"},
-					{"type": "cavitylinac", "position": 31933, "name": "ACCBT_L03.02"},
+					{"type": "sip", "position": 31855, "name": "SIP300_L03.03","name": "SIP300_L03.04","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
+					{"type": "cavitylinac", "position": 31999, "name": "ACCBT_L03.02"},
 					{"type": "blm", "position": 31933, "name": "BLM_ACCBT_L03.02"},
 					{"type": "ACCBT", "position": 35164, "name": "ACCBT_L03.02"},
 					{"type": "ACCBT", "position": 38365, "name": "ACCBT_L03.02"},
+					{"type": "sip", "position": 37700, "name": "SIP150_BC02.01","name2": "SIP75_L03.05","name3": "SIP75_L03.06","name4": "SIP75_L03.07","name5": "SIP75_L03.08","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
 					{"type": "vlv", "position": 37980, "name": "VLV_BC02.01", "labelReverse": [90, 1530, 260]},					
 					{"type": "bpm", "position": 38189, "name": "RTBPM_L03.02"},
 					{"type": "quadrupolefermi", "position": 38425, "name": "Q_L03.02"},
@@ -423,6 +455,7 @@
 				"components": [
 					{"type": "blm", "position": 100, "name": "BLM_B_BC02.01_L"},
 					{"type": "blm", "position": 100, "name": "BLM_B_BC02.01_R"},
+					{"type": "sip", "position": 250, "name": "SIP150_BC02.02","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
 					{"type": "quadrupolefermi", "position": 500, "name": "Q_BC02.01"},
 					{"type": "blm", "position": 500, "name": "BLM_Q_BC02.01"}
 				]
@@ -466,48 +499,59 @@
 					{"type": "cm", "position": 1258, "name": "CM_BC02.01"},
 					{"type": "correctorfermi", "position": 1460, "ps": ["PSCH_BC02.01","PSCV_BC02.01"], "name": "CHV_BC02.01"},
 					{"type": "vlv", "position": 1717, "name": "VLV_L04.01"},
+					{"type": "sip", "position": 1847, "name": "SIP300_L04.01","name2": "SIP300_L04.02","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
 					{"type": "BC02", "position": 1817, "name": "BC02"},
 					{"type": "L04", "position": 1817, "name": "L04"},
 					{"type": "cavitylinac", "position": 1997, "name": "ACCBT_L04.01"},
 					{"type": "ACCBT", "position": 5048, "name": "ACCBT_L04.01"},
 					{"type": "ACCBT", "position": 8250, "name": "ACCBT_L04.01"},
+					{"type": "sip", "position": 8000, "name": "SIP75_L04.01","name2": "SIP75_L04.02","name3": "SIP75_L04.03","name4": "SIP75_L04.04","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
 					{"type": "bpm", "position": 8180, "name": "RTBPM_L04.01"},
 					{"type": "quadrupolefermi", "position": 8428, "name": "Q_L04.01"},
 					{"type": "blm", "position": 8428, "name": "BLM_Q_L04.01"},
 					{"type": "flsc", "position": 8682, "name": "MSCR_L04.01"},
 					{"type": "correctorfermi", "position": 8912, "ps": ["PSCH_L04.01","PSCV_L04.01"], "name": "CHV_L04.01"},
-					{"type": "cavitylinac", "position": 9150, "name": "ACCBT_L04.02"},
+					{"type": "sip", "position": 9100, "name": "SIP300_L04.03","name2": "SIP300_L04.04","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
+					{"type": "cavitylinac", "position": 9250, "name": "ACCBT_L04.02"},
 					{"type": "ACCBT", "position": 12281, "name": "ACCBT_L04.02"},
 					{"type": "ACCBT", "position": 15482, "name": "ACCBT_L04.02"},
+					{"type": "sip", "position": 15262, "name": "SIP75_L04.05","name2": "SIP75_L04.06","name3": "SIP75_L04.07","name4": "SIP75_L04.08","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
 					{"type": "bpm", "position": 15412, "name": "RTBPM_L04.02"},
 					{"type": "quadrupolefermi", "position": 15712, "name": "Q_L04.02"},
 					{"type": "blm", "position": 15712, "name": "BLM_Q_L04.02"},
 					{"type": "correctorfermi", "position": 16007, "ps": ["PSCH_L04.02","PSCV_L04.02"], "name": "CHV_L04.02"},
 					{"type": "vlv", "position": 16260, "name": "VLV_L04.02"},
-					{"type": "cavitylinac", "position": 16482, "name": "ACCBT_L04.03"},
+					{"type": "sip", "position": 16400, "name": "SIP300_L04.05","name2": "SIP300_L04.06","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
+					{"type": "cavitylinac", "position": 16582, "name": "ACCBT_L04.03"},
 					{"type": "ACCBT", "position": 19513, "name": "ACCBT_L04.03"},
 					{"type": "ACCBT", "position": 22715, "name": "ACCBT_L04.03"},
+					{"type": "sip", "position": 22500, "name": "SIP75_L04.09","name2": "SIP75_L04.10","name3": "SIP75_L04.11","name4": "SIP75_L04.12","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
 					{"type": "bpm", "position": 22645, "name": "RTBPM_L04.03"},
 					{"type": "quadrupolefermi", "position": 22945, "name": "Q_L04.03"},
 					{"type": "blm", "position": 22945, "name": "BLM_Q_L04.03"},
 					{"type": "correctorfermi", "position": 23240, "ps": ["PSCH_L04.03","PSCV_L04.03"], "name": "CHV_L04.03"},
-					{"type": "cavitylinac", "position": 23515, "name": "ACCBT_L04.04"},
+					{"type": "sip", "position": 23440, "name": "SIP300_L04.07","name2": "SIP300_L04.08","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
+					{"type": "cavitylinac", "position": 23615, "name": "ACCBT_L04.04"},
 					{"type": "ACCBT", "position": 26746, "name": "ACCBT_L04.04"},
 					{"type": "ACCBT", "position": 29947, "name": "ACCBT_L04.04"},
+					{"type": "sip", "position": 29700, "name": "SIP75_L04.13","name2": "SIP75_L04.14","name3": "SIP75_L04.15","name4": "SIP75_L04.16","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
 					{"type": "bpm", "position": 29817, "name": "RTBPM_L04.04"},
 					{"type": "quadrupolefermi", "position": 30117, "name": "Q_L04.04"},
 					{"type": "plc", "position": 30117, "name": "SPIN_L04.01", "offset3d": [0, -700, 0], "offset2d": [0, 300], "labelReverse": [90, -250, 250]},
 					{"type": "blm", "position": 30117, "name": "BLM_Q_L04.04"},
 					{"type": "correctorfermi", "position": 30412, "ps": ["PSCH_L04.04","PSCV_L04.04"], "name": "CHV_L04.04"},
 					{"type": "vlv", "position": 30650, "name": "VLV_L04.03"},
-					{"type": "cavitylinac", "position": 30847, "name": "ACCBT_L04.05"},
+					{"type": "sip", "position": 30800, "name": "SIP300_L04.09","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
+					{"type": "cavitylinac", "position": 30947, "name": "ACCBT_L04.05"},
 					{"type": "ACCBT", "position": 33978, "name": "ACCBT_L04.05"},
 					{"type": "ACCBT", "position": 37180, "name": "ACCBT_L04.05"},
+					{"type": "sip", "position": 37000, "name": "SIP75_L04.17","name2": "SIP75_L04.18","name3": "SIP75_L04.19","name4": "SIP75_L04.20","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
 					{"type": "bpm", "position": 37110, "name": "RTBPM_L04.05"},
 					{"type": "quadrupolefermi", "position": 37410, "name": "Q_L04.05"},
 					{"type": "blm", "position": 37410, "name": "BLM_Q_L04.05"},
 					{"type": "correctorfermi", "position": 37805, "ps": ["PSCH_L04.05","PSCV_L04.05"], "name": "CHV_L04.05"},
 					{"type": "blm", "position": 37805, "name": "BLM_CHV_L04.05"},
+					{"type": "sip", "position": 37990, "name": "SIP75_L04.21","name2": "SIP75_L04.22","name3": "SIP75_L04.23","name4": "SIP75_L04.24","name5": "SIP75_L04.25","name6": "SIP55_L04.01","name7": "SIP55_L04.02","name8": "SIP75_L04.26","name9": "SIP55_L04.03","name10": "SIP55_L04.04","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
 					{"type": "ACCT", "position": 39660, "name": "ACCT_L04.06"},
 					{"type": "bpm", "position": 41160, "name": "RTBPM_L04.06"},
 					{"type": "blm", "position": 41417, "name": "BLM_CHV_L04.06"},
@@ -516,6 +560,7 @@
 					{"type": "vlv", "position": 41877, "name": "VLV_L.04.04"},
 					{"type": "correctorfermi", "position": 42197, "ps": ["PSCH_L04.06","PSCV_L04.06"], "name": "CHV_L04.06"},					
 					{"type": "ACCT", "position": 43297, "name": "ACCT_L04.07"},
+					{"type": "sip", "position": 44950, "name": "SIP75_L04.27","name2": "SIP75_L04.28","name3": "SIP75_L04.29","name4": "SIP75_L04.30","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
 					{"type": "quadrupolefermi", "position": 45133, "name": "Q_L04.07"},
 					{"type": "blm", "position": 45133, "name": "BLM_Q_L04.07"},
 					{"type": "bpm", "position": 45372, "name": "RTBPM_L04.07"},
@@ -531,14 +576,16 @@
 					{"type": "plc", "position": 49455, "name": "SPIN_TLS.01", "offset3d": [0, -700, 0], "offset2d": [0, 300], "labelReverse": [90, -250, 250]},
 					{"type": "blm", "position": 49455, "name": "BLM_Q_TLS.02"},
 					{"type": "vlv", "position": 49850, "name": "VLV_TLS.01"},
-					{"type": "correctorfermi", "position": 50105, "ps": ["PSCH_TLS.01","PSCV_TLS.01"], "name": "CHV_TLS.01"},
+					{"type": "sip", "position": 49990, "name": "SIP300_TLS.01","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
+     				{"type": "correctorfermi", "position": 50155, "ps": ["PSCH_TLS.01","PSCV_TLS.01"], "name": "CHV_TLS.01"},
 					{"type": "blm", "position": 50105, "name": "BLM_CHV_TLS.01"},
 					{"type": "bpm", "position": 50392, "name": "RTBPM_TLS.01"},
 					{"type": "flsc", "position": 50695, "name": "MSCR_TLS.01"},
 					{"type": "blm", "position": 50695, "name": "BLM_MSCR_TLS.01"},
 					{"type": "GCOL", "position": 51315, "name": "GCOL_TLS.01"},
 					{"type": "blm", "position": 51315, "name": "BLM_GCOL_TLS.01"},
-					{"type": "quadrupolefermi", "position": 51910, "name": "Q_TLS.03"},
+					{"type": "sip", "position": 51710, "name": "SIP55_TLS.01","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
+  					{"type": "quadrupolefermi", "position": 51910, "name": "Q_TLS.03"},
 					{"type": "blm", "position": 51910, "name": "BLM_Q_TLS.03"},
 					{"type": "quadrupolefermi", "position": 52710, "name": "Q_TLS.04"},
 					{"type": "blm", "position": 52710, "name": "BLM_Q_TLS.04"},
@@ -548,7 +595,7 @@
 			},
 			{
 				"start": {"x": -3722, "z": -5645},
-				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI", "length": 2437, "name": "B_DBD.01"},
+				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI", "length": 2437, "name": "B_DBD.01" , "labelReverse": [90, -450, 250]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "blm", "position": 100, "name": "BLM_B_DBD.01_L"},
@@ -594,12 +641,12 @@
 			}
 		],
 		"blm": {
-			"confsrc": "https://puma-01.elettra.eu/misc/threejs/fermi_blm.php?linac&conf=long",
-			"datasrc": "https://puma-01.elettra.eu/misc/threejs/fermi_blm.php?linac"
+			"confsrc": "https://pwma-dev.elettra.eu/misc/threejs/fermi_blm.php?linac&conf=long",
+			"datasrc": "https://pwma-dev.elettra.eu/misc/threejs/fermi_blm.php?linac"
 		},
 		"bpm": {
-			"pos": "https://puma-01.elettra.eu/misc/threejs/fermi_bpm.php?std&linac",
-			"rms": "https://puma-01.elettra.eu/misc/threejs/fermi_bpm.php?rms&linac",
+			"pos": "https://pwma-dev.elettra.eu/misc/threejs/fermi_bpm.php?std&linac",
+			"rms": "https://pwma-dev.elettra.eu/misc/threejs/fermi_bpm.php?rms&linac",
 			"defaultZoom": 0.01,
 			"length": 38,
 			"offset": 0
@@ -610,7 +657,8 @@
 			{
 				"start": {"x": -3722, "z": -5645},
 				"components": [
-					{"type": "flsc", "position": 549, "name": "MSCR_TLS.02"},
+					{"type": "sip", "position": 300, "name": "SIP300_TLS.02","offset2d": [30, -40], "labelReverse": [90, 1620, 200]},
+  					{"type": "flsc", "position": 549, "name": "MSCR_TLS.02"},
 					{"type": "correctorfermi", "position": 899, "ps": ["PSCH_TLS.02","PSCV_TLS.02"], "name": "CHV_TLS.02"},
 					{"type": "blm", "position": 1249, "name": "RTBLM_TLS.02"},
 					{"type": "flsc", "position": 1549, "name": "MSCR_TLS.03"},
@@ -620,7 +668,8 @@
 					{"type": "blm", "position": 2806, "name": "RTBPM_TLS.03"},
 					{"type": "quadrupolefermi", "position": 3114, "name": "Q_TLS.07"},
 					{"type": "bst", "position": 3414, "name": "BST_TLS.01"},
-					{"type": "vlv", "position": 3800, "name": "VLV_SCL.01"},
+					{"type": "sip", "position": 3714, "name": "SIP75_TLS.01","offset2d": [30, -40]},
+  					{"type": "vlv", "position": 4100, "name": "VLV_SCL.01"},
 					{"type": "quadrupolefermi", "position": 10100, "name": "Q_SCL.01", "labelReverse": [90, 1300, 250]}
 					
 				]
@@ -905,12 +954,12 @@
 			}
 		],
 		"blm": {
-			"confsrc": "https://puma-01.elettra.eu/misc/threejs/fermi_blm.php?fel1&conf=long",
-			"datasrc": "https://puma-01.elettra.eu/misc/threejs/fermi_blm.php?fel1"
+			"confsrc": "https://pwma-dev.elettra.eu/misc/threejs/fermi_blm.php?fel1&conf=long",
+			"datasrc": "https://pwma-dev.elettra.eu/misc/threejs/fermi_blm.php?fel1"
 		},
 		"bpm": {
-			"pos": "https://puma-01.elettra.eu/misc/threejs/fermi_bpm.php?std&fel1",
-			"rms": "https://puma-01.elettra.eu/misc/threejs/fermi_bpm.php?rms&fel1",
+			"pos": "https://pwma-dev.elettra.eu/misc/threejs/fermi_bpm.php?std&fel1",
+			"rms": "https://pwma-dev.elettra.eu/misc/threejs/fermi_bpm.php?rms&fel1",
 			"defaultZoom": 0.01,
 			"length": 24,
 			"offset": 0
@@ -1130,12 +1179,12 @@
 			}			
 		],
 		"blm": {
-			"confsrc": "https://puma-01.elettra.eu/misc/threejs/fermi_blm.php?fel2&conf=long",
-			"datasrc": "https://puma-01.elettra.eu/misc/threejs/fermi_blm.php?fel2"
+			"confsrc": "https://pwma-dev.elettra.eu/misc/threejs/fermi_blm.php?fel2&conf=long",
+			"datasrc": "https://pwma-dev.elettra.eu/misc/threejs/fermi_blm.php?fel2"
 		},
 		"bpm": {
-			"pos": "https://puma-01.elettra.eu/misc/threejs/fermi_bpm.php?std&fel2",
-			"rms": "https://puma-01.elettra.eu/misc/threejs/fermi_bpm.php?rms&fel2",
+			"pos": "https://pwma-dev.elettra.eu/misc/threejs/fermi_bpm.php?std&fel2",
+			"rms": "https://pwma-dev.elettra.eu/misc/threejs/fermi_bpm.php?rms&fel2",
 			"defaultZoom": 0.01,
 			"length": 21,
 			"offset": 0
@@ -1500,10 +1549,10 @@
 						"PSCSOL_INJ.01",  "PSTRMCQ_SPINJ.01","PSTRMCQ_SPINJ.02","PSCV_INJ.01","PSCH_INJ.01","PSCV_INJ.02","PSCH_INJ.02","PSQ_SPINJ.01","PSB_SPINJ.01","PSSOL_INJ.01","PSSOL_INJ.02","PSSOL_INJ.03","PSSOL_INJ.04","SW-PS-KG01.01"
 					]},
 					{"type": "rv", "position": 13550, "name": "RG_KG01.01", "devices":[
-						"PSSIP_CTF.01","SIP_CTF.03","SIP_CTF.04",
-						"PSSIP_CTF.02","SIP_CTF.05","SIP_CTF.06",
-						"PSSIP_CTF.03","SIP_CTF.01","SIP_CTF.02","SIP_CTF.07","SIP_CTF.08",
-						"PSSIP_CTF.04","SIP_CTF.09","SIP_CTF.10",
+						"PSSIP_CTF.01","PSSIP_CTF.03","PSSIP_CTF.04",
+						"PSSIP_CTF.02","PSSIP_CTF.05","PSSIP_CTF.06",
+						"PSSIP_CTF.03","PSSIP_CTF.01","PSSIP_CTF.02","PSSIP_CTF.07","PSSIP_CTF.08",
+						"PSSIP_CTF.04","PSSIP_CTF.09","PSSIP_CTF.10",
 						"PSNIP_CTF.01","GIP_CTF.01",
 						"PSNIP_CTF.02","GIP_CTF.02",
 						"TPG_CTF.01","VGPE_CTF.01","VGPI_CTF.01","VGPE_CTF.02","VGPI_CTF.02",
@@ -1512,9 +1561,9 @@
 					]},
 					{"type": "rc", "position": 14350, "name": "RC_KG01.01", "devices":["PLC MASTER_IN_KG01.01","PLC MASTER_MOD_KG01.01", "CMM-PS-KG01-01"]},
 					{"type": "rv", "position": 14950, "name": "RV_KG01.01", "devices":[
-						"PSSIP_KG01.01","GIP500_INJ.01","SIP75_SPINJ.01",
-						"PSSIP_KG01.02","SIP55_INJ.01","SIP75_INJ.01",
-						"PSSIP_KG01.03","SIP150_INJ.01","SIP75_INJ.02",
+						"PSSIP_KG01.01","GIP500_INJ.01","PSSIP75_SPINJ.01",
+						"PSSIP_KG01.02","PSSIP55_INJ.01","PSSIP75_INJ.01",
+						"PSSIP_KG01.03","PSSIP150_INJ.01","PSSIP75_INJ.02",
 						"PSNIP_KG01.01","GIP200_INJ.01",
 						"TPG_KG01.01","VGPE_INJ.01","VGPI_INJ.01","VGPE_INJ.02","VGPI_INJ.02",
 						"TPG_KG01.02","VGPE_INJ.03","VGPI_INJ.03","VGPE_INJ.04","VGPI_INJ.04",
@@ -1531,7 +1580,7 @@
 					{"type": "rd", "position": 23500, "name": "RD_KG02.02"},
 					{"type": "rd", "position": 24100, "name": "RD_KG02.01", "devices":[
 						"EC-BPM-KG02-01","LIBERA_BPM_SPINJ.01","LIBERA_BPM_INJ.01","LIBERA_BPM_L0.01","LIBERA_BPM_LH.01","LIBERA_BPM_LH.02","LIBERA_BPM_LH.03_A","LIBERA_BPM_LH.03_B","LIBERA_BPM_LH.04","LIBERA_BPM_SPLH.01","LIBERA_BPM_LH.05","LIBERA_BPM_L01.01",
-						"YSCR_INJ.01","YSCR_INJ.02","BPM_SPINJ.01","YSCR_SPINJ.01","YSCR_INJ.03","BPM_INJ.01","BPM_L00.01","MSCR_L00.01","MSCR_LH.01","BPM_LH.01","BPM_LH.02","MSCR_LH.02","MSCR_LH.03","BPM_LH.03","BPM_LH.04","BPM_SPLH.01","MSCR_SPLH.01","BPM_LH.05","MSCR_LH.04","BPM_L01.01"
+						"YSCR_INJ.01","YSCR_INJ.02","BPM_SPINJ.01","YSCR_SPINJ.01","YSCR_INJ.03","BPM_INJ.01","BPM_L00.01","PSMSCR_L00.01","PSMSCR_LH.01","BPM_LH.01","BPM_LH.02","PSMSCR_LH.02","PSMSCR_LH.03","BPM_LH.03","BPM_LH.04","BPM_SPLH.01","PSMSCR_SPLH.01","BPM_LH.05","PSMSCR_LH.04","BPM_L01.01"
 					]},
 					{"type": "rc", "position": 25300, "name": "RC_KG02.01", "devices":["EC-PS-KG02-01","SPAC_KG02.01","CMM-PS-KG02-01"]},
 					{"type": "rps", "position": 25900, "name": "RPS_KG02.01", "devices":[
@@ -1544,25 +1593,25 @@
 						"PSCV_L01.01","PSCH_L01.01","PSCV_L01.02","PSCH_L01.02", "PSCV_L01.03","PSCH_L01.03","PSCV_L01.04","PSCH_L01.04", "PSQ_L01.01","PSQ_L01.02","PSQ_L01.03","PSQ_L01.04"
 					]},
 					{"type": "rv", "position": 27700, "name": "RV_KG02.01", "devices":[
-						"PSSIP_KG02.01","SIP20_L00.01","SIP20_L00.03",
-						"PSSIP_KG02.02","SIP20_L00.02","SIP20_L00.04",
-						"PSSIP_KG02.03","SIP55_L00.01","SIP55_L00.03",
-						"PSSIP_KG02.04","SIP55_L00.02","SIP55_L00.04",
-						"PSSIP_KG02.05","SIP75_L00.01","SIP75_L00.02",
-						"PSSIP_KG02.06","SIP75_L00.03","SIP75_L00.04",
+						"PSSIP_KG02.01","PSSIP20_L00.01","PSSIP20_L00.03",
+						"PSSIP_KG02.02","PSSIP20_L00.02","PSSIP20_L00.04",
+						"PSSIP_KG02.03","PSSIP55_L00.01","PSSIP55_L00.03",
+						"PSSIP_KG02.04","PSSIP55_L00.02","PSSIP55_L00.04",
+						"PSSIP_KG02.05","PSSIP75_L00.01","PSSIP75_L00.02",
+						"PSSIP_KG02.06","PSSIP75_L00.03","PSSIP75_L00.04",
 						"TPG_KG02.01","VGPE_L00.01","VGPI_L00.01","VGPE_L00.02"
 					]},
 					{"type": "rv", "position": 28500, "name": "RV_KG02.02", "devices":[
-						"PSSIP_KG02.07","SIP300_L01.01","SIP300_L01.05",
-						"PSSIP_KG02.08","SIP300_L01.02","SIP300_L01.06",
-						"PSSIP_KG02.09","SIP300_L01.03","SIP300_L01.07",
-						"PSSIP_KG02.10","SIP300_L01.04","SIP300_L01.08",
-						"PSSIP_KG02.11","SIP75_L01.01","SIP75_L01.02",
-						"PSSIP_KG02.12","SIP75_L01.03","SIP75_L01.04",
-						"PSSIP_KG02.13","SIP75_L01.05","SIP75_L01.06",
-						"PSSIP_KG02.14","SIP75_L01.07","SIP75_L01.08",
-						"PSSIP_KG02.25","SIP55_LH.01","SIP55_LH.03",
-						"PSSIP_KG02.26","SIP55_LH.02","SIP75_SPLH.01",
+						"PSSIP_KG02.07","PSSIP300_L01.01","PSSIP300_L01.05",
+						"PSSIP_KG02.08","PSSIP300_L01.02","PSSIP300_L01.06",
+						"PSSIP_KG02.09","PSSIP300_L01.03","PSSIP300_L01.07",
+						"PSSIP_KG02.10","PSSIP300_L01.04","PSSIP300_L01.08",
+						"PSSIP_KG02.11","PSSIP75_L01.01","PSSIP75_L01.02",
+						"PSSIP_KG02.12","PSSIP75_L01.03","PSSIP75_L01.04",
+						"PSSIP_KG02.13","PSSIP75_L01.05","PSSIP75_L01.06",
+						"PSSIP_KG02.14","PSSIP75_L01.07","PSSIP75_L01.08",
+						"PSSIP_KG02.25","PSSIP55_LH.01","PSSIP55_LH.03",
+						"PSSIP_KG02.26","PSSIP55_LH.02","PSSIP75_SPLH.01",
 						"TPG_KG02.02","VGPE_LH.01","VGPI_LH.01","VGPE_LH.02",
 						"TPG_KG02.03","VGPE_SPLH.01",
 						"TPG_KG02.04","VGPE_L01.01","VGPI_L01.01","VGPE_L01.02","VGPI_L01.02",
@@ -1572,12 +1621,12 @@
 					{"type": "rid", "position": 29600, "name": "RID_KG02.01"},	
 					{"type": "rc", "position": 30350, "name": "RC_KG02.02", "devices":["EC-VAC-KG02-01","EC-ID-KG02-01"]},
 					{"type": "rv", "position": 30950, "name": "RV_KG02.03", "devices":[
-						"PSSIP_KG02.16","SIP20_XBL01.02","SIP20_XBL01.03",
-						"PSSIP_KG02.17","SIP40_XBL01.01","SIP40_XBL01.02",
-						"PSSIP_KG02.18","SIP20_XBL01.04","SIP40_XBL01.03",
-						"PSSIP_KG02.19","SIP20_XBL01.05","SIP20_XBL01.06",
-						"PSSIP_KG02.20","SIP20_XBL01.07","SIP20_XBL01.08",
-						"PSSIP_KG02.21","SIP_KXS.02","SIP_KXS.03","SIP_KXS.04",
+						"PSSIP_KG02.16","PSSIP20_XBL01.02","PSSIP20_XBL01.03",
+						"PSSIP_KG02.17","PSSIP40_XBL01.01","PSSIP40_XBL01.02",
+						"PSSIP_KG02.18","PSSIP20_XBL01.04","PSSIP40_XBL01.03",
+						"PSSIP_KG02.19","PSSIP20_XBL01.05","PSSIP20_XBL01.06",
+						"PSSIP_KG02.20","PSSIP20_XBL01.07","PSSIP20_XBL01.08",
+						"PSSIP_KG02.21","PSSIP_KXS.02","PSSIP_KXS.03","PSSIP_KXS.04",
 						"TPG_KG02.06","VGPE_XBL01.02","VGPI_XBL01.01","VGPE_XBL01.03"
 					]},
 
@@ -1601,11 +1650,11 @@
 					{"type": "rar1", "position": 47700, "name": "RAR1_KG04.01", "devices":["PST_K04","PSK_K04"]},
 					{"type": "rar2", "position": 48500, "name": "RAR2_KG04.01", "devices": [
 						"EC-MOD-KG01-04","PSFOC_K04",
-						"PSSIP_KG02.15","SIP20_XBL01.01",
-						"PSSIP_KG04.01", "SIP02_KG04.01",
-						"PSSIP_KG04.02", "SIP02_KG04.02",
-						"PSSIP_KG04.03", "SIP02_KG04.03",
-						"PSSIP_KG04.04", "SIP02_KG04.04"
+						"PSSIP_KG02.15","PSSIP20_XBL01.01",
+						"PSSIP_KG04.01", "PSSIP02_KG04.01",
+						"PSSIP_KG04.02", "PSSIP02_KG04.02",
+						"PSSIP_KG04.03", "PSSIP02_KG04.03",
+						"PSSIP_KG04.04", "PSSIP02_KG04.04"
 					]},
 
 					{"type": "rllrf", "position": 49400, "name": "RLLRF_KG05.01"},
@@ -1620,10 +1669,10 @@
 					{"type": "camod", "position": 58000, "name": "CAMOD_KGXS.01"},
 					{"type": "rar1", "position": 59500, "name": "RAR1_KGXS.01"},
 					{"type": "rar2", "position": 60300, "name": "RAR2_KGXS.01", "name2": "RAR2_KG05.02", "devices": [
-						"PSSIP_KXS.01", "SIP_KXS.10",
-						"PSSIP_KXS.02", "SIP_KXS.11",
-						"PSSIP_KXS.03", "SIP_KXS.12",
-						"PSSIP_KXS.04", "SIP_KXS.01"
+						"PSSIP_KXS.01", "PSSIP_KXS.10",
+						"PSSIP_KXS.02", "PSSIP_KXS.11",
+						"PSSIP_KXS.03", "PSSIP_KXS.12",
+						"PSSIP_KXS.04", "PSSIP_KXS.01"
 					]},
 					{"type": "fug", "position": 61100, "name": "HVPS_KGXS.01"},
 
@@ -1665,27 +1714,27 @@
 					]},
 					{"type": "rc", "position": 99900, "name": "RC_KG07.01", "devices":["SPAC_K07"]},
 					{"type": "rv", "position": 100500, "name": "RV_KG07.01", "devices":[
-						"PSSIP_KG07.01","SIP300_L02.01","SIP300_L02.05",
-						"PSSIP_KG07.02","SIP300_L02.02","SIP300_L02.06",
-						"PSSIP_KG07.03","SIP300_L02.03","SIP300_L02.07",
-						"PSSIP_KG07.04","SIP300_L02.04","SIP300_L02.08",
-						"PSSIP_KG07.05","SIP75_L02.01","SIP75_L02.02",
-						"PSSIP_KG07.06","SIP75_L02.03","SIP75_L02.04",
-						"PSSIP_KG07.07","SIP75_L02.05","SIP75_L02.06",
-						"PSSIP_KG07.08","SIP75_L02.07","SIP75_L02.08",
+						"PSSIP_KG07.01","PSSIP300_L02.01","PSSIP300_L02.05",
+						"PSSIP_KG07.02","PSSIP300_L02.02","PSSIP300_L02.06",
+						"PSSIP_KG07.03","PSSIP300_L02.03","PSSIP300_L02.07",
+						"PSSIP_KG07.04","PSSIP300_L02.04","PSSIP300_L02.08",
+						"PSSIP_KG07.05","PSSIP75_L02.01","PSSIP75_L02.02",
+						"PSSIP_KG07.06","PSSIP75_L02.03","PSSIP75_L02.04",
+						"PSSIP_KG07.07","PSSIP75_L02.05","PSSIP75_L02.06",
+						"PSSIP_KG07.08","PSSIP75_L02.07","PSSIP75_L02.08",
 						"TPG_KG07.01","VGPE_L02.01","VGPI_L02.01","VGPE_L02.02","VGPI_L02.02",
 						"TPG_KG07.02","VGPE_L02.03","VGPI_L02.03","VGPE_L02.04",
 						"SPIN_KG07.01"
 					]},
 					{"type": "rv", "position": 101300, "name": "RV_KG07.02", "devices":[
-						"PSSIP_KG07.09","SIP300_L03.01","SIP300_L03.03",
-						"PSSIP_KG07.10","SIP300_L03.02","SIP300_L03.04",
-						"PSSIP_KG07.11","SIP75_L03.01","SIP75_L03.02",
-						"PSSIP_KG07.12","SIP75_L03.03","SIP75_L03.04",
-						"PSSIP_KG07.13","SIP75_L03.05","SIP75_L03.06",
-						"PSSIP_KG07.14","SIP75_L03.07","SIP75_L03.08",
-						"PSSIP_KG07.15","SIP150_BC02.01",
-						"PSSIP_KG07.16","SIP150_BC02.02",
+						"PSSIP_KG07.09","PSSIP300_L03.01","PSSIP300_L03.03",
+						"PSSIP_KG07.10","PSSIP300_L03.02","PSSIP300_L03.04",
+						"PSSIP_KG07.11","PSSIP75_L03.01","PSSIP75_L03.02",
+						"PSSIP_KG07.12","PSSIP75_L03.03","PSSIP75_L03.04",
+						"PSSIP_KG07.13","PSSIP75_L03.05","PSSIP75_L03.06",
+						"PSSIP_KG07.14","PSSIP75_L03.07","PSSIP75_L03.08",
+						"PSSIP_KG07.15","PSSIP150_BC02.01",
+						"PSSIP_KG07.16","PSSIP150_BC02.02",
 						"TPG_KG07.03","VGPE_L03.01","VGPI_L03.01","VGPE_L03.02","VGPI_L03.02",
 						"TPG_KG07.04","VGPE_BC02.01","VGPI_BC02.01","VGPE_L02.04"
 					]},
@@ -1709,7 +1758,7 @@
 					{"type": "fug", "position": 116300, "name": "HVPS_KG09.01"},
 
 					{"type": "rd", "position": 118100, "name": "RD_KG09.01", "devices":[
-						"MSCR_L03.01","MSCR_BC02.01","BPM_L04.01","MSCR_L04.01","BPM_L04.02","BPM_L04.03","BPM_L04.04","LIBERA_BPM_L04.01","LIBERA_BPM_L04.02","LIBERA_BPM_L04.03","LIBERA_BPM_L04.04","EC-CBLM-KG09-01"
+						"PSMSCR_L03.01","PSMSCR_BC02.01","BPM_L04.01","PSMSCR_L04.01","BPM_L04.02","BPM_L04.03","BPM_L04.04","LIBERA_BPM_L04.01","LIBERA_BPM_L04.02","LIBERA_BPM_L04.03","LIBERA_BPM_L04.04","EC-CBLM-KG09-01"
 					]},
 					{"type": "rd", "position": 118700, "name": "RD_KG09.02"},
 					{"type": "rc", "position": 119900, "name": "RC_KG09.01", "devices":["EC-PS-KG09-01", "SPIN_K09.01"]},
@@ -1723,33 +1772,33 @@
 						"PSCV_L04.06", "PSCH_L04.06", "PSCV_L04.07", "PSCH_L04.07", "PSQ_L04.01", "PSQ_L04.02", "PSQ_L04.06", "PSQ_L04.07", "PSQ_L04.03", "PSQ_L04.04", "PSQ_L04.05"
 					]},
 					{"type": "rv", "position": 122300, "name": "RV_KG09.01", "devices":[
-						"PSSIP_KG09.01","SIP300_L04.01","SIP300_L04.06",
-						"PSSIP_KG09.02","SIP300_L04.02","SIP300_L04.07",
-						"PSSIP_KG09.03","SIP300_L04.03","SIP300_L04.08",
-						"PSSIP_KG09.04","SIP300_L04.04","SIP300_L04.09",
-						"PSSIP_KG09.05","SIP300_L04.05",
-						"PSSIP_KG09.06","SIP55_L04.01","SIP55_L04.04",
-						"PSSIP_KG09.07","SIP55_L04.02","SIP75_L04.27",
-						"PSSIP_KG09.08","SIP55_L04.03","SIP75_L04.28",
+						"PSSIP_KG09.01","PSSIP300_L04.01","PSSIP300_L04.06",
+						"PSSIP_KG09.02","PSSIP300_L04.02","PSSIP300_L04.07",
+						"PSSIP_KG09.03","PSSIP300_L04.03","PSSIP300_L04.08",
+						"PSSIP_KG09.04","PSSIP300_L04.04","PSSIP300_L04.09",
+						"PSSIP_KG09.05","PSSIP300_L04.05",
+						"PSSIP_KG09.06","PSSIP55_L04.01","PSSIP55_L04.04",
+						"PSSIP_KG09.07","PSSIP55_L04.02","PSSIP75_L04.27",
+						"PSSIP_KG09.08","PSSIP55_L04.03","PSSIP75_L04.28",
 						"PSNIP_KG09.01","GIP1000_L04.01"
 					]},
 					{"type": "rv", "position": 123100, "name": "RV_KG09.02", "devices":[
-						"PSSIP_KG09.09","SIP75_L04.01","SIP75_L04.02",
-						"PSSIP_KG09.10","SIP75_L04.03","SIP75_L04.04",
-						"PSSIP_KG09.11","SIP75_L04.05","SIP75_L04.06",
-						"PSSIP_KG09.12","SIP75_L04.07","SIP75_L04.08",
-						"PSSIP_KG09.13","SIP75_L04.09","SIP75_L04.10",
-						"PSSIP_KG09.14","SIP75_L04.11","SIP75_L04.12",
-						"PSSIP_KG09.15","SIP75_L04.13","SIP75_L04.14",
-						"PSSIP_KG09.16","SIP75_L04.15","SIP75_L04.16",
-						"PSSIP_KG09.17","SIP75_L04.17","SIP75_L04.18",
-						"PSSIP_KG09.18","SIP75_L04.19","SIP75_L04.20"
+						"PSSIP_KG09.09","PSSIP75_L04.01","PSSIP75_L04.02",
+						"PSSIP_KG09.10","PSSIP75_L04.03","PSSIP75_L04.04",
+						"PSSIP_KG09.11","PSSIP75_L04.05","PSSIP75_L04.06",
+						"PSSIP_KG09.12","PSSIP75_L04.07","PSSIP75_L04.08",
+						"PSSIP_KG09.13","PSSIP75_L04.09","PSSIP75_L04.10",
+						"PSSIP_KG09.14","PSSIP75_L04.11","PSSIP75_L04.12",
+						"PSSIP_KG09.15","PSSIP75_L04.13","PSSIP75_L04.14",
+						"PSSIP_KG09.16","PSSIP75_L04.15","PSSIP75_L04.16",
+						"PSSIP_KG09.17","PSSIP75_L04.17","PSSIP75_L04.18",
+						"PSSIP_KG09.18","PSSIP75_L04.19","PSSIP75_L04.20"
 					]},
 					{"type": "rv", "position": 123900, "name": "RV_KG09.03", "devices":[
-						"PSSIP_KG09.19","SIP150_L04.21","SIP75_L04.22",
-						"PSSIP_KG09.20","SIP75_L04.23","SIP75_L04.24",
-						"PSSIP_KG09.21","SIP75_L04.25","SIP75_L04.26",
-						"PSSIP_KG09.22","SIP75_L04.29","SIP75_L04.30",
+						"PSSIP_KG09.19","PSSIP150_L04.21","PSSIP75_L04.22",
+						"PSSIP_KG09.20","PSSIP75_L04.23","PSSIP75_L04.24",
+						"PSSIP_KG09.21","PSSIP75_L04.25","PSSIP75_L04.26",
+						"PSSIP_KG09.22","PSSIP75_L04.29","PSSIP75_L04.30",
 						"TPG_KG09.01","VGPE_L04.01","VGPI_L04.01","VGPE_L04.02","VGPI_L04.02",
 						"TPG_KG09.02","VGPE_L04.03","VGPI_L04.03","VGPE_L04.04","VGPI_L04.04",
 						"TPG_KG09.03","VGPE_L04.05","VGPI_L04.05","VGPE_L04.06",
@@ -1980,14 +2029,14 @@
 						"PSQ_BC01.04","PSQ_BC01.05","PSQ_BC01.07", "PSB_BC01"
 					]},
 					{"type": "rv", "position": 1800, "name": "RV_KG05.01", "devices":[
-						"PSSIP_KG05.01","SIP150_BC01.01","SIP300_BC01.01",
-						"PSSIP_KG05.02","SIP150_BC01.02","SIP55_BC01.03",
-						"PSSIP_KG05.03","SIP55_BC01.01","SIP55_BC01.04",
-						"PSSIP_KG05.04","SIP55_BC01.02","SIP300_BC01.02",
-						"PSSIP_KG05.05","SIP75_BC01.01","SIP75_BC01.02",
-						"PSSIP_KG05.06","SIP75_BC01.03","SIP75_BC01.04",
-						"PSSIP_KG05.07","SIP75_BC01.05","SIP75_BC01.06",
-						"PSSIP_KG05.08","SIP55_SPBC01.01","SIP55_SPBC01.02",
+						"PSSIP_KG05.01","PSSIP150_BC01.01","PSSIP300_BC01.01",
+						"PSSIP_KG05.02","PSSIP150_BC01.02","PSSIP55_BC01.03",
+						"PSSIP_KG05.03","PSSIP55_BC01.01","PSSIP55_BC01.04",
+						"PSSIP_KG05.04","PSSIP55_BC01.02","PSSIP300_BC01.02",
+						"PSSIP_KG05.05","PSSIP75_BC01.01","PSSIP75_BC01.02",
+						"PSSIP_KG05.06","PSSIP75_BC01.03","PSSIP75_BC01.04",
+						"PSSIP_KG05.07","PSSIP75_BC01.05","PSSIP75_BC01.06",
+						"PSSIP_KG05.08","PSSIP55_SPBC01.01","PSSIP55_SPBC01.02",
 						"TPG_KG05.01","VGPE_BC01.01","VGPI_BC01.01","VGPE_BC01.02",
 						"TPG_KG05.02","VGPE_BC01.03","VGPE_BC01.04",
 						"TPG_KG05.03","VGPE_BC01.05","VGPI_BC01.02","VGPE_BC01.06",
@@ -2012,9 +2061,9 @@
 				"start": {"x": -11200, "y": 4000, "z": -11600},
 				"components": [
 					{"type": "rv", "position": 400, "name": "RV_KG15.01", "width": 800, "height": 2000, "depth": 600, "devices":[
-						"PSSIP_KG15.01","SIP300_TLS.01","SIP300_TLS.02", 
-						"PSSIP_KG15.02","SIP55_TLS.01","SIP75_TLS.01",
-						"PSSIP_KG15.03","SIP75_DBD.01","SIP150_DBD.01",
+						"PSSIP_KG15.01","PSSIP300_TLS.01","PSSIP300_TLS.02", 
+						"PSSIP_KG15.02","PSSIP55_TLS.01","PSSIP75_TLS.01",
+						"PSSIP_KG15.03","PSSIP75_DBD.01","PSSIP150_DBD.01",
 						"TPG_KG15.01","VGPE_TLS.01","VGPI_TLS.01","VGPE_TLS.02",
 						"TPG_KG15.02","VGPE_TLS.03",
 						"TPG_KG15.03","VGPE_DBD.01","VGPI_DBD.01","VGPE_TLS.02",
@@ -2022,7 +2071,7 @@
 					]},
 					{"type": "rc", "position": 1400, "name": "RC_KG15.01", "devices":["EC-PS-KG15-01", "SPAC_KG15.02", "SPAC_KG15.01"]},
 					{"type": "rd", "position": 2000, "name": "RD_KG15.01", "devices":[
-						"BPM_L04.05","BPM_L04.06","BPM_L04.07","BPM_TLS.01","MSCR_TLS.01","BPM_DBD.01","MSCR_DBD.01","BPM_DBD.02","MSCR_DBD.02","MSCR_TLS.02","BPM_TLS.02","MSCR_TLS.03","BPM_TLS.03","EC-BPM-KG15-01","LIBERA_BPM_L04.05","LIBERA_BPM_L04.06","LIBERA_BPM_L04.07","LIBERA_BPM_TLS.01","LIBERA_BPM_DBD.01","LIBERA_BPM_DBD.02","LIBERA_BPM_TLS.02","LIBERA_BPM_TLS.03"
+						"BPM_L04.05","BPM_L04.06","BPM_L04.07","BPM_TLS.01","PSMSCR_TLS.01","BPM_DBD.01","PSMSCR_DBD.01","BPM_DBD.02","PSMSCR_DBD.02","PSMSCR_TLS.02","BPM_TLS.02","PSMSCR_TLS.03","BPM_TLS.03","EC-BPM-KG15-01","LIBERA_BPM_L04.05","LIBERA_BPM_L04.06","LIBERA_BPM_L04.07","LIBERA_BPM_TLS.01","LIBERA_BPM_DBD.01","LIBERA_BPM_DBD.02","LIBERA_BPM_TLS.02","LIBERA_BPM_TLS.03"
 					]},
 					{"type": "rps", "position": 3200, "name": "RPS_KG15.01", "devices":[
 						"PSQ_TLS.01", "PSQ_TLS.02", "PSQ_TLS.03", "PSQ_TLS.04", "PSQ_TLS.05", "PSQ_TLS.06", "PSQ_TLS.07", "PSCV_TLS.01", "PSCH_TLS.01", "PSCV_TLS.02", "PSCH_TLS.02", "PSCV_TLS.03", "PSCH_TLS.03", "PSCV_DBD.01", "PSCH_DBD.01"
@@ -2123,27 +2172,27 @@
 				"start": {"x": 8000, "y": 4000, "z": -7600},
 				"components": [
 					{"type": "rd", "position": -300, "name": "RD_SSA.03", "devices":[
-						"MSCR_SCL.01","MSCR_SFEL01.01","CBPM_SFEL01.01","MSCR_SFEL01.02","CBPM_SFEL01.02","CBPM_SFEL01.03","MSCR_SFEL02.01","MSCR_SFEL02.02","EC-MSCR-SSA-01"
+						"PSMSCR_SCL.01","PSMSCR_SFEL01.01","CBPM_SFEL01.01","PSMSCR_SFEL01.02","CBPM_SFEL01.02","CBPM_SFEL01.03","PSMSCR_SFEL02.01","PSMSCR_SFEL02.02","EC-MSCR-SSA-01"
 					]},
 					{"type": "rd", "position": 300, "name": "RD_SSA.04", "devices":[
 						"CBPM_SFEL02.01","CBPM_SFEL02.02","CBPM_SFEL02.03","EC-CBPM-SSA-01"
 					]},
 					{"type": "rv", "position": 900, "name": "RV_SSA.01", "devices":[
-						"PSSIP_SSA.01","SIP55_SCL.01","SIP55_SCL.02",
-						"PSSIP_SSA.02","SIP300_SCL.01","SIP55_SCL.03",
-						"PSSIP_SSA.03","SIP55_SFEL01.01","SIP55_SFEL01.04",
-						"PSSIP_SSA.04","SIP55_SFEL01.02","SIP55_SFEL01.05",
-						"PSSIP_SSA.05","SIP55_SFEL01.03","SIP55_SFEL01.06",
-						"PSSIP_SSA.06","SIP300_SFEL01.01", "SIP150_SFEL01.01",
+						"PSSIP_SSA.01","PSSIP55_SCL.01","PSSIP55_SCL.02",
+						"PSSIP_SSA.02","PSSIP300_SCL.01","PSSIP55_SCL.03",
+						"PSSIP_SSA.03","PSSIP55_SFEL01.01","PSSIP55_SFEL01.04",
+						"PSSIP_SSA.04","PSSIP55_SFEL01.02","PSSIP55_SFEL01.05",
+						"PSSIP_SSA.05","PSSIP55_SFEL01.03","PSSIP55_SFEL01.06",
+						"PSSIP_SSA.06","PSSIP300_SFEL01.01", "PSSIP150_SFEL01.01",
 						"TPG_SSA.01","VGPE_SCL.01","VGPI_SCL.01","VGPE_SCL.02",
 						"TPG_SSA.02","VGPE_SFEL01.01","VGPI_SFEL01.01","VGPE_SFEL01.02",
 						"TPG_SSA.03","VGPE_SFEL01.03",
 						"sds-vac-ssa-01"
 					]},
 					{"type": "rv", "position": 1700, "name": "RV_SSA.02", "width": 800, "height": 2000, "depth": 600, "devices":[
-						"PSSIP_SSA.07","SIP300_SFEL02.01","SIP55_SFEL02.04",
-						"PSSIP_SSA.08","SIP55_SFEL02.01","SIP150_SFEL02.01",
-						"PSSIP_SSA.09","SIP55_SFEL02.02",
+						"PSSIP_SSA.07","PSSIP300_SFEL02.01","PSSIP55_SFEL02.04",
+						"PSSIP_SSA.08","PSSIP55_SFEL02.01","PSSIP150_SFEL02.01",
+						"PSSIP_SSA.09","PSSIP55_SFEL02.02",
 						"TPG_SSA.04","VGPE_SFEL02.01","VGPI_SFEL02.01","VGPE_SFEL02.02",
 						"TPG_SSA.05","VGPE_SFEL02.03"
 					]},
@@ -2160,10 +2209,10 @@
 				"start": {"x": 63500, "y": 4000, "z": -7000},
 				"components": [
 					{"type": "rps", "position": 30300, "name": "RPS_USA.01", "devices":[
-						"PSTRMCW_FEL01.01","PSTRMCW_FEL01.02","PSCV_FEL01.01","PSCH_FEL01.01", "PSQ_FEL01.01","PSCID_FEL01.01","PSCID_FEL01.02","PSCID_FEL01.03","PSCID_FEL01.04", "PSCID_FEL01.05","PSCID_FEL01.06","PSCID_FEL01.07","PSCID_FEL01.08", "PSCID_FEL01.09","PSCID_FEL01.10","PSCID_FEL01.11","PSCID_FEL01.12"
+						"PSTRMCW_FEL01.01","PSTRMCW_FEL01.02","PSCV_FEL01.01","PSCH_FEL01.01", "PSQ_FEL01.01","PSCID_FEL01.01","PSCID_FEL01.02","PSCID_FEL01.03","PSCID_FEL01.04", "PSCID_FEL01.05","PSCID_FEL01.06","PSCID_FEL01.07","PSCID_FEL01.08", "PSCID_FEL01.09","PSCID_FEL01.10","PSCID_FEL01.11","PSCID_FEL01.12","PSBDS_FEL01.01"
 					]},
 					{"type": "rps", "position": 29700, "name": "RPS_USA.02", "devices":[
-						"PSTRMCB_FEL01.01","PSTRMCB_FEL01.02","PSTRMCB_FEL01.03","PSTRMCB_FEL01.04","PSCID_FEL01.13","PSCID_FEL01.14","PSCID_FEL01.15","PSCID_FEL01.16", "PSCID_FEL01.17","PSCID_FEL01.18","PSCID_FEL01.19","PSCID_FEL01.20", "PSCID_FEL01.21","PSCID_FEL01.22","PSCID_FEL01.23","PSCID_FEL01.24", "PSCID_FEL01.25","PSCID_FEL01.26","PSCID_FEL01.27","PSCID_FEL01.28"
+						"PSTRMCB_FEL01.01","PSTRMCB_FEL01.02","PSTRMCB_FEL01.03","PSTRMCB_FEL01.04","PSCID_FEL01.13","PSCID_FEL01.14","PSCID_FEL01.15","PSCID_FEL01.16", "PSCID_FEL01.17","PSCID_FEL01.18","PSCID_FEL01.19","PSCID_FEL01.20", "PSCID_FEL01.21","PSCID_FEL01.22","PSCID_FEL01.23","PSCID_FEL01.24", "PSCID_FEL01.25","PSCID_FEL01.26","PSCID_FEL01.27","PSCID_FEL01.28","PSBDS_FEL01.02"
 					]},
 					{"type": "rps", "position": 29100, "name": "RPS_USA.03", "devices":[
 						"PSCV_IUFEL01.01","PSCH_IUFEL01.01","PSCV_IUFEL01.02","PSCH_IUFEL01.02", "PSCV_IUFEL01.03","PSCH_IUFEL01.03","PSCV_IUFEL01.04","PSCH_IUFEL01.04", "PSQ_IUFEL01.01","PSQ_IUFEL01.02","PSQ_IUFEL01.03","PSQ_IUFEL01.04", "PSQ_IUFEL01.05","PSQ_IUFEL01.06","PSQ_IUFEL01.07","PSQ_IUFEL01.08", "PSQ_FEL02.01","PSQ_FEL02.02","PSQ_FEL02.03","PSQ_FEL02.04"
@@ -2175,9 +2224,9 @@
 						"PSCV_FEL02.04","PSCH_FEL02.04","PSTRMCW_FEL02.03","PSTRMCW_FEL02.04", "PSCID_FEL02.01","PSCID_FEL02.02","PSCID_FEL02.03","PSCID_FEL02.04","PSCID_FEL02.05","PSCID_FEL02.06","PSCID_FEL02.07","PSCID_FEL02.08"
 					]},
 					{"type": "rv", "position": 27100, "name": "RV_USA.01", "devices":[
-						"PSSIP_USA.01","SIP55_FEL01.01","SIP55_IUFEL01.02","SIP55_IUFEL01.05","SIP55_IUFEL01.08",
-						"PSSIP_USA.02","GIP500_FEL01.01","SIP55_IUFEL01.03","SIP55_IUFEL01.06",
-						"PSSIP_USA.03","SIP55_FEL01.02","SIP55_IUFEL01.04","SIP55_IUFEL01.07",
+						"PSSIP_USA.01","PSSIP55_FEL01.01","PSSIP55_IUFEL01.02","PSSIP55_IUFEL01.05","PSSIP55_IUFEL01.08",
+						"PSSIP_USA.02","GIP500_FEL01.01","PSSIP55_IUFEL01.03","PSSIP55_IUFEL01.06",
+						"PSSIP_USA.03","PSSIP55_FEL01.02","PSSIP55_IUFEL01.04","PSSIP55_IUFEL01.07",
 						"TPG_USA.01","VGPE_FEL01.01","VGPI_IUFEL01.01","VGPE_IUFEL01.01",
 						"TPG_USA.02","VGPE_IUFEL01.02","VGPI_IUFEL01.02","VGPE_IUFEL01.03"
 				
@@ -2205,10 +2254,10 @@
 					]},
 					{"type": "rc", "position": 15500, "name": "RC_USA.02", "devices":["EC-MPS-USA-01","MAST MPS_USA_01"]},
 					{"type": "rv", "position": 14700, "name": "RV_USA.02", "devices":[
-						"PSSIP_USA.04","SIP55_FEL02.01","SIP55_IUFEL02.01","SIP55_FEL02.03","SIP55_FEL02.05",
-						"PSSIP_USA.05","SIP55_FEL02.02","SIP55_IUFEL02.02","SIP55_FEL02.04","SIP55_FEL02.06",
-						"PSSIP_USA.06","SIP55_IUFEL02.03","SIP55_IUFEL02.05","SIP55_IUFEL02.07","SIP55_IUFEL02.09",
-						"PSSIP_USA.07","SIP55_IUFEL02.04","SIP55_IUFEL02.06","SIP55_IUFEL02.08",
+						"PSSIP_USA.04","PSSIP55_FEL02.01","PSSIP55_IUFEL02.01","PSSIP55_FEL02.03","PSSIP55_FEL02.05",
+						"PSSIP_USA.05","PSSIP55_FEL02.02","PSSIP55_IUFEL02.02","PSSIP55_FEL02.04","PSSIP55_FEL02.06",
+						"PSSIP_USA.06","PSSIP55_IUFEL02.03","PSSIP55_IUFEL02.05","PSSIP55_IUFEL02.07","PSSIP55_IUFEL02.09",
+						"PSSIP_USA.07","PSSIP55_IUFEL02.04","PSSIP55_IUFEL02.06","PSSIP55_IUFEL02.08",
 						"TPG_USA.03","VGPE_FEL02.01","VGPI_IUFEL02.01","VGPE_FEL02.02",
 						"TPG_USA.04","VGPE_IUFEL02.01",
 						"TPG_USA.05","VGPE_IUFEL02.02","VGPI_IUFEL02.02","VGPE_FEL02.03","VGPI_IUFEL02.03",
@@ -2225,13 +2274,13 @@
 						"CBPM_IUFEL01.03","CBPM_IUFEL01.04","CBPM_IUFEL01.05","EC-IUFEL-USA-02"]},
 					{"type": "rc", "position": 8500, "name": "RC_USA.03", "devices":["EC-ID-USA-01","MASTIN_USA.01"]},
 					{"type": "rv", "position": 7700, "name": "RV_USA.03", "devices":[
-						"PSSIP_USA.14","SIP75_MBD_FEL01.01","SIP55_MBD_FEL01.05",
-						"PSSIP_USA.15","SIP55_MBD_FEL01.02","SIP55_MBD_FEL01.06",
-						"PSSIP_USA.16","SIP55_MBD_FEL01.03","SIP55_MBD_FEL01.07",
-						"PSSIP_USA.17","SIP55_MBD_FEL01.04","SIP55_MBD_FEL01.08",
-						"PSSIP_USA.18","SIP55_MBD_FEL02.01","SIP55_MBD_FEL02.04",
-						"PSSIP_USA.19","SIP55_MBD_FEL02.02","SIP55_MBD_FEL02.05",
-						"PSSIP_USA.20","SIP55_MBD_FEL02.03",
+						"PSSIP_USA.14","PSSIP75_MBD_FEL01.01","PSSIP55_MBD_FEL01.05",
+						"PSSIP_USA.15","PSSIP55_MBD_FEL01.02","PSSIP55_MBD_FEL01.06",
+						"PSSIP_USA.16","PSSIP55_MBD_FEL01.03","PSSIP55_MBD_FEL01.07",
+						"PSSIP_USA.17","PSSIP55_MBD_FEL01.04","PSSIP55_MBD_FEL01.08",
+						"PSSIP_USA.18","PSSIP55_MBD_FEL02.01","PSSIP55_MBD_FEL02.04",
+						"PSSIP_USA.19","PSSIP55_MBD_FEL02.02","PSSIP55_MBD_FEL02.05",
+						"PSSIP_USA.20","PSSIP55_MBD_FEL02.03",
 						"TPG_USA.06","VGPE_MBDFEL01.01","VGPI_MBDFEL01.01","VGPE_MBDFEL01.02",
 						"TPG_USA.07","VGPE_MBDFEL01.03","VGPI_MBDFEL01.02",
 						"TPG_USA.08","VGPE_MBDFEL02.01","VGPI_MBDFEL02.01","VGPE_MBDFEL02.02","VGPI_MBDFEL02.02",
@@ -2243,7 +2292,7 @@
 					{"type": "rid", "position": 5900, "name": "RID_USA.22", "devices":["ID_FEL01.09"]},
 
 					{"type": "rd", "position": 4300, "name": "RD_USA.03", "devices":[
-						"MSCR_FEL01.01","MSCR_EEHG_FEL01.01","MSCR_FEL01.02","MSCR_IUFEL01.02","MSCR_IUFEL01.03","MSCR_IUFEL01.04","MSCR_IUFEL01.06","MSCR_IUFEL01.08","MSCR_FEL02.01","MSCR_IUFEL02.02","MSCR_FEL02.02","MSCR_FEL02.03","MSCR_IUFEL02.03","MSCR_IUFEL02.05","MSCR_IUFEL02.07","MSCR_IUFEL02.08","MSCR_IUFEL02.09","EC-SE-USA-01","CMM-IUFEL-USA-01"
+						"PSMSCR_FEL01.01","PSMSCR_EEHG_FEL01.01","PSMSCR_FEL01.02","PSMSCR_IUFEL01.02","PSMSCR_IUFEL01.03","PSMSCR_IUFEL01.04","PSMSCR_IUFEL01.06","PSMSCR_IUFEL01.08","PSMSCR_FEL02.01","PSMSCR_IUFEL02.02","PSMSCR_FEL02.02","PSMSCR_FEL02.03","PSMSCR_IUFEL02.03","PSMSCR_IUFEL02.05","PSMSCR_IUFEL02.07","PSMSCR_IUFEL02.08","PSMSCR_IUFEL02.09","EC-SE-USA-01","CMM-IUFEL-USA-01"
 					]},
 					{"type": "rc", "position": 3700, "name": "RC_USA.04", "devices":["EC-PS-USA-02","PDU-RC-USA-04"]},
 					{"type": "rps", "position": 3100, "name": "RPS_USA.06", "devices":[
@@ -2260,8 +2309,8 @@
 					]},
 					{"type": "rc", "position": 700, "name": "RC_USA.05", "devices":["EC-VAC-USA-01","SPIN_USA.02"]},
 					{"type": "rv", "position": -100, "name": "RV_USA.04", "devices":[
-						"PSSIP_USA.21","SIP75_MBD.01","SIP150_MBD.02",
-						"PSSIP_USA.22","SIP150_MBD.01",
+						"PSSIP_USA.21","PSSIP75_MBD.01","PSSIP150_MBD.02",
+						"PSSIP_USA.22","PSSIP150_MBD.01",
 						"TPG_USA.10","VGPE_MBD.01","VGPI_MBD.01","VGPE_MBD.02",
 						"sds-vac-usa-04"
 					]}
@@ -2304,20 +2353,20 @@
 						"CMM-PS-ESA-01","sw-c-esa-02","ESA/YAMS/11","PDU-RC-ESA-02"
 					]},
 					{"type": "rv", "position": 1700, "name": "RV_ESA.01", "labelReverse": [90, 950, 300], "devices":[
-						"PSSIP_ESA.05","SIP300_POS_F01.01","SIP300_POS_F01.02",
-						"PSSIP_ESA.06","SIP300_POS_F02.01","SIP300_POS_F02.02",
-						"PSSIP_ESA.07","SIP300_POS.01","SIP300_POS.03",
-						"PSSIP_ESA.08","SIP300_POS_02",
+						"PSSIP_ESA.05","PSSIP300_POS_F01.01","PSSIP300_POS_F01.02",
+						"PSSIP_ESA.06","PSSIP300_POS_F02.01","PSSIP300_POS_F02.02",
+						"PSSIP_ESA.07","PSSIP300_POS.01","PSSIP300_POS.03",
+						"PSSIP_ESA.08","PSSIP300_POS_02",
 						"MAX_ESA.05","VGFR_POS_F01.01","VGFR_POS_F01.02","VGFR_POS_F02.01","VGFR_POS_F02.02",
 						"MAX_ESA.06","VGFR_POS.01","VGPE_POS.01","VGPI_POS.01","VGFR_POS.02",
 						"MAX_ESA.07","VGFR_PFE.02","VGFR_I0_PFE.01","VGHP_G1_PFE.01","VGHP_G2_PFE.01","VGHP_G3_PFE.01","VGHP_G4_PFE.01",
 						"sds-vac-esa-01"
 					]},
 					{"type": "rv", "position": 2500, "name": "RV_ESA.02", "labelReverse": [90, 950, 300], "devices":[
-						"PSSIP_ESA.01","SIP150_PFE_F01.01","SIP150_PFE_F01.02",
-						"PSSIP_ESA.02","SIP300_PFE_F01.01","SIP20_PFE_F01.01",
-						"PSSIP_ESA.03","SIP150_PFE_F02.01","SIP150_PFE_F02.02",
-						"PSSIP_ESA.04","SIP300_PFE_F02.01","SIP20_PFE_F02.01",
+						"PSSIP_ESA.01","PSSIP150_PFE_F01.01","PSSIP150_PFE_F01.02",
+						"PSSIP_ESA.02","PSSIP300_PFE_F01.01","PSSIP20_PFE_F01.01",
+						"PSSIP_ESA.03","PSSIP150_PFE_F02.01","PSSIP150_PFE_F02.02",
+						"PSSIP_ESA.04","PSSIP300_PFE_F02.01","PSSIP20_PFE_F02.01",
 						"TPG_ESA.01","VGPE_PFE_F01.01","VGPI_PFE_F01.01","VGPE_PFE_F01.02","VGPI_PFE_F01.02",
 						"TPG_ESA.02","VGPE_PFE_F01.03","VGPI_PFE_F01.03","VGPE_PFE_F01.04","VGPI_PFE_F01.04",
 						"TPG_ESA.03","VGPE_PFE_F01.05","VGPI_PFE_F01.05","VGPE_PFE_F01.06",
@@ -2349,7 +2398,7 @@
 						"sw-c-esa-04", "pdu-rc-esa-04"
 					]},
 					{"type": "rd", "position": 2000, "name": "RD_ESA.01", "labelReverse": [90, 950, 300], "devices": [
-						"sw-c-esa-05","sw-mscr-esa-01","sw-bpm-esa-01","ec-bpm-esa-01","CM_SFEL01.01", "CM_SFEL02.01", "CM_MBD_FEL01.01", "BPM_MBD_FEL01.01", "MSCR_MBD_FEL01.01", "BPM_MBD_FEL01.02", "BPM_MBD_FEL01.03", "CM_MBD_FEL02.01", "BPM_MBD_FEL02.01", "MSCR_MBD_FEL02.01", "BPM_MBD_FEL02.02", "BPM_MBD.01", "BPM_MBD.02", "BPM_MBD.03", "CM_MBD.01", "MSCR_MBD.01","EC-BPM-ESA-01","LIBERA_BPM_IUFEL01.01","LIBERA_BPM_MBD01.02","LIBERA_BPM_MBD02.01","LIBERA_BPM_MBD01.01","LIBERA_BPM_IUFEL02.02","LIBERA_BPM_MBD01.03","LIBERA_BPM_MBD02.02","LIBERA_BPM_MBD01","LIBERA_BPM_MBD02","LIBERA_BPM_MBD03"
+						"sw-c-esa-05","sw-mscr-esa-01","sw-bpm-esa-01","ec-bpm-esa-01","CM_SFEL01.01", "CM_SFEL02.01", "CM_MBD_FEL01.01", "BPM_MBD_FEL01.01", "PSMSCR_MBD_FEL01.01", "BPM_MBD_FEL01.02", "BPM_MBD_FEL01.03", "CM_MBD_FEL02.01", "BPM_MBD_FEL02.01", "PSMSCR_MBD_FEL02.01", "BPM_MBD_FEL02.02", "BPM_MBD.01", "BPM_MBD.02", "BPM_MBD.03", "CM_MBD.01", "PSMSCR_MBD.01","EC-BPM-ESA-01","LIBERA_BPM_IUFEL01.01","LIBERA_BPM_MBD01.02","LIBERA_BPM_MBD02.01","LIBERA_BPM_MBD01.01","LIBERA_BPM_IUFEL02.02","LIBERA_BPM_MBD01.03","LIBERA_BPM_MBD02.02","LIBERA_BPM_MBD01","LIBERA_BPM_MBD02","LIBERA_BPM_MBD03"
 					]}
 				]
 			},