diff --git a/fermi_lattice.json b/fermi_lattice.json
index 24d6d822ec4a7493dac45ebf280faca2893e576a..c43ad0cfd11896e4bd0d0928a2950327f20ad9ed 100644
--- a/fermi_lattice.json
+++ b/fermi_lattice.json
@@ -32,61 +32,61 @@
 				"components": [
 					{"type": "INJ", "position": 0, "name": "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": "sip", "position": 30, "name": "SIP150_INJ.01", "offset2d": [30, -40], "labelReverse": [90, -220, 150], "embedded": ["SIP75_INJ.01", "SIP75_INJ.02"]},
 					{"type": "SOL", "position": -130, "name": "SOL_INJ.01"},
-					{"type": "vlv", "position": 200, "name": "VLV_INJ.01", "labelReverse": [90, 1350, 200]},
-					{"type": "sip", "position": 270, "name": "SIP55_INJ.01", "name2": "SIP75_SPINJ.01", "offset2d": [30, -40], "labelReverse": [90, -160, 150]},
+					{"type": "vlv", "position": 200, "name": "VLV_INJ.01", "labelReverse": [90, 900, 150]},
+					{"type": "sip", "position": 270, "name": "SIP55_INJ.01", "offset2d": [30, -40], "labelReverse": [90, -160, 150], "embedded": ["SIP75_SPINJ.01"]},
 					{"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": "bpm", "position": 1890, "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": "vlv", "position": 2390, "name": "VLV_L00.01", "labelReverse": [90, 910, 130]},
+					{"type": "sip", "position": 2550, "name": "SIP75_L00.01", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L00.02", "SIP20_L00.01"]},
+					{"type": "cavitylinacshort", "position": 2702, "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": "bpm", "position": 4868, "name": "RTBPM_L00.01", "labelReverse": [90, 1060, 130]},
 					{"type": "quadrupolefermi", "position": 5049, "name": "Q_L00.01"},
 					{"type": "blm", "position": 5149, "name": "BLM_Q_L00.01"},
-					{"type": "quadrupolefermi", "position": 5339, "name": "Q_L00.02"},
+					{"type": "quadrupolefermi", "position": 5439, "name": "Q_L00.02"},
 					{"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": "flsc", "position": 5841, "name": "MSCR_L00.01"},
+					{"type": "blm", "position": 5841, "name": "BLM_MSCR_L00.01"},
+					{"type": "sip", "position": 6200, "name": "SIP75_L00.01", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L00.02", "SIP20_L00.03", "SIP20_L00.04"]},
 					{"type": "ACCT0", "position": 5598, "name": "ACCT0_L00.02"},
 					{"type": "SOL", "position": 5906, "name": "SOL_L00.02"},
-					{"type": "cavitylinac", "position": 6402, "name": "ACCT_L00.02"},
+					{"type": "cavitylinacshort", "position": 6402, "name": "ACCT_L00.02"},
 					{"type": "ACCT", "position": 7491, "name": "ACCT_L00.02"},
 					{"type": "blm", "position": 8100, "name": "BLM_ACCT_L00.02"},
 					{"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": "cm", "position": 8901, "name": "CM_LH.01"},
+					{"type": "quadrupolefermi", "position": 9221, "name": "Q_LH.01"},
+					{"type": "blm", "position": 9221, "name": "BLM_Q_LH.01"},
+					{"type": "vlv", "position": 9580, "name": "VLV_LH.01", "labelReverse": [90, 870, 130]},
+					{"type": "sip", "position": 9775, "name": "SIP55_LH.01", "offset2d": [30, -40], "labelReverse": [90, -450, 150]},
 					{"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"},
-					{"type": "plc", "position": 10811, "name": "SPIN_LH01.01", "offset3d": [0, -700, 0], "offset2d": [0, 300], "labelReverse": [90, -250, 250]},
-					{"type": "blm", "position": 10811, "name": "BLM_Q_LH.03"},
+					{"type": "correctorfermi", "position": 10401, "ps": ["PSCH_LH.01","PSCV_LH.01"], "name": "CHV_LH.01"},
+					{"type": "sip", "position": 10811, "name": "SIP55_L00.01", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP55_L00.02"]},
+					{"type": "quadrupolefermi", "position": 11111, "name": "Q_LH.03"},
+					{"type": "plc", "position": 11111, "name": "SPIN_LH01.01", "offset3d": [0, -700, 0], "offset2d": [0, 300], "labelReverse": [90, -250, 250]},
+					{"type": "blm", "position": 11111, "name": "BLM_Q_LH.03"},
 					{"type": "quadrupolefermi", "position": 11511, "name": "Q_LH.04"},
-					{"type": "flsc", "position": 12081, "name": "MSCR_LH.01"},
-					{"type": "blm", "position": 12081, "name": "BLM_MSCR_LH.01"},
+					{"type": "flsc", "position": 11881, "name": "MSCR_LH.01"},
+					{"type": "blm", "position": 11881, "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": "bpm", "position": 12736, "name": "RTBPM_LH.01", "labelReverse": [90, 1060, 130]},
 					{"type": "BAM", "position": 13044, "name": "BAM_LH.01"},
-					{"type": "bpm", "position": 13600, "name": "RTBPM_LH.02"},
+					{"type": "bpm", "position": 13200, "name": "RTBPM_LH.02", "labelReverse": [90, 1060, 130]},
+					{"type": "sip", "position": 13600, "name": "SIP55_LH.02", "offset2d": [30, -40], "labelReverse": [90, -450, 150]},
+					
 					{"type": "LS", "position": 14096, "name": "LS_CHICANE"}
 				]
 			},
@@ -102,11 +102,11 @@
 				]
 			},
 			{
-				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "-PI", "length": 200, "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, 900, 0]},
 				"start": {"x": -172609, "z": -5811},
 				"components": [
-					{"type": "bpm", "position": 350, "name": "BPM_SPINJ.01", "labelReverse": [90, -350, 300]},
-					{"type": "quadrupolefermi", "position": 530, "name": "Q_SPINJ.01", "labelReverse": [90, -350, 300]},
+					{"type": "bpm", "position": 350, "name": "BPM_SPINJ.01", "labelReverse": [90, -350, 100]},
+					{"type": "quadrupolefermi", "position": 530, "name": "Q_SPINJ.01", "labelReverse": [90, -350, 200]},
 					{"type": "FC", "position": 631, "name": "FC_SPINJ.01", "labelReverse": [90, -350, 300]},
 					{"type": "flsc", "position": 700, "name": "YSCR_SPINJ.01", "labelReverse": [90, -550, 300]}
 				]
@@ -119,29 +119,29 @@
 			},
 			{
 				"start": {"x": -159733, "z": -5809},
-				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI", "length": 200, "name": "B_LH.01"},
+				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI", "length": 200, "name": "B_LH.01", "labelReverse": [90, 780, 0]},
 				"components": [
 					{"type": "blm", "position": 100, "name": "BLM_B_LH.01"}
 				]
 			},
 			{
 				"start": {"x": -159233, "z": -5782},
-				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI", "length": 200, "name": "B_LH.02"},
+				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI", "length": 200, "name": "B_LH.02", "labelReverse": [90, 780, 0]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "blm", "position": 100, "name": "BLM_B_LH.02"},
 					{"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"}
+					{"type": "miniundulator", "position": 536, "name": "ID_LH.01", "labelReverse": [90, 800, 800]},
+					{"type": "sip", "position": 1600, "name": "SIP55_LH.03", "offset2d": [30, -40], "labelReverse": [90, -450, 150]},
+					{"type": "flsc", "position": 1990, "name": "MSCR_LH.03"},
+					{"type": "blm", "position": 1990, "name": "BLM_MSCR_LH.03"},
+					{"type": "bpm", "position": 2476, "name": "RTBPM_LH.03", "labelReverse": [90, 1060, 130]}
 				]
 			},
 			{
 				"start": {"x": -156205, "z": -5782},
-				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI", "length": 200, "name": "B_LH.03", "labelReverse": [270, 1100, 100]},
+				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI", "length": 200, "name": "B_LH.03", "labelReverse": [270, 880, 100]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "blm", "position": 100, "name": "BLM_B_LH.03"}
@@ -149,15 +149,15 @@
 			},
 			{
 				"start": {"x": -155706, "z": -5809},
-				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI", "length": 200, "name": "B_LH.04", "labelReverse": [270, 1100, 100]},
+				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI", "length": 200, "name": "B_LH.04", "labelReverse": [270, 880, 100]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "LS", "position": 100, "name": "LS_CHICANE"},
-					{"type": "correctorfermi", "position": 450, "ps": ["PSCH_LH.03","PSCV_LH.03"], "name": "CHV_LH.03", "labelReverse": [90, 1400, 100]},
-					{"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": "correctorfermi", "position": 300, "ps": ["PSCH_LH.03","PSCV_LH.03"], "name": "CHV_LH.03", "labelReverse": [90, 1050, 200]},
+					{"type": "bpm", "position": 710, "name": "RTBPM_LH.04", "labelReverse": [90, 1200, 130]},
+					{"type": "quadrupolefermi", "position": 925, "name": "Q_LH.05", "labelReverse": [90, 950, 200]},
 					{"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": "sip", "position": 1200, "name": "SIP55_SPLH.01", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP55_SPLH.02"]},
 					{"type": "LH", "position": 1250, "name": "LH_01"},
 					{"type": "SPLH", "position": 1250, "name": "SPLH"}
 				]
@@ -171,8 +171,8 @@
 					{"type": "blm", "position": 100, "name": "BLM_B_SPLH.01_L"},
 					{"type": "bpm", "position": 689, "name": "RTBPM_LH.03B"},
 					{"type": "CM", "position": 1893, "name": "CM_SPLH.01"},
-					{"type": "flsc", "position": 2163, "name": "MSCR_SPLH.01"},
-					{"type": "blm", "position": 2163, "name": "BLM_MSCR_SPLH.01"},
+					{"type": "flsc", "position": 2293, "name": "MSCR_SPLH.01"},
+					{"type": "blm", "position": 2293, "name": "BLM_MSCR_SPLH.01"},
 					{"type": "BD", "position": 2435, "name": "BD_SPLH.01"},
 					{"type": "SPLH", "position": 2635, "name": "SPLH"}
 				]
@@ -189,150 +189,155 @@
 				"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": "sip", "position": 250, "name": "SIP55_L00.03", "offset2d": [30, -40], "labelReverse": [90, -350, 150], "embedded": ["SIP55_L00.04"]},
+					{"type": "bpm", "position": 506, "name": "RTBPM_LH.05", "labelReverse": [90, -350, 150]},
+					{"type": "flsc", "position": 736, "name": "MSCR_LH.04", "labelReverse": [90, -350, 270]},
 					{"type": "blm", "position": 736, "name": "BLM_MSCR_LH.04"},
-					{"type": "quadrupolefermi", "position": 1075, "name": "Q_LH.06", "labelReverse": [90, -470, 270]},
+					{"type": "quadrupolefermi", "position": 1075, "name": "Q_LH.06", "labelReverse": [90, -350, 200]},
 					{"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", "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": "vlv", "position": 1430, "name": "VLV_L01.01", "labelReverse": [90, -250, 150]},
+					{"type": "correctorfermi", "position": 1651, "ps": ["PSCH_LH.04","PSCV_LH.04"], "name": "CHV_LH.04", "labelReverse": [90, -350, 220]},
+					{"type": "quadrupolefermi", "position": 1991, "name": "Q_LH.07", "labelReverse": [90, -350, 200]},
+					{"type": "blm", "position": 1991, "name": "BLM_Q_LH.07"},
+					{"type": "sip", "position": 2300, "name": "SIP300_L01.01", "offset2d": [30, -40], "labelReverse": [90, -350, 150], "embedded": ["SIP75_L01.01", "SIP75_L01.02", "SIP300_L01.02", "SIP300_L01.03"]},
 					{"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": "sip", "position": 6400, "name": "SIP300_L01.02", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L01.04"]},
+					{"type": "bpm", "position": 6736, "name": "RTBPM_L01.01", "labelReverse": [90, 1070, 130]},
 					{"type": "quadrupolefermi", "position": 7023, "name": "Q_L01.01"},
 					{"type": "blm", "position": 7023, "name": "BLM_Q_L01.01"},
 					{"type": "correctorfermi", "position": 7414, "ps": ["PSCH_L01.01","PSCV_L01.01"], "name": "CHV_L01.01"},
-					{"type": "cavitylinac", "position": 7605, "name": "ACCT_L01.02"},
-					{"type": "blm", "position": 7605, "name": "BLM_ACCT_L01.02"},
+					{"type": "sip", "position": 7755, "name": "SIP300_L01.03", "offset2d": [30, -40], "labelReverse": [90, -450, 150]},
+					{"type": "cavitylinac", "position": 8005, "name": "ACCT_L01.02"},
+					{"type": "blm", "position": 8005, "name": "BLM_ACCT_L01.02"},
 					{"type": "ACCT", "position": 10015, "name": "ACCT_L01.02"},
 					{"type": "ACCT", "position": 12803, "name": "ACCT_L01.02"},
 					{"type": "correctorfermi", "position": 11800, "ps": ["PSCH_L01.02","PSCV_L01.02"], "name": "CHV_L01.02"},					
-					{"type": "vlv", "position": 12200, "name": "VLV_XBL01.01", "labelReverse": [90, 1630, 170]},
-					{"type": "bpm", "position": 12396, "name": "RTBPM_L01.02"},
-					{"type": "quadrupolefermi", "position": 12809, "name": "Q_L01.02"},
-					{"type": "blm", "position": 12609, "name": "BLM_Q_L01.02"},
+					{"type": "sip", "position": 12050, "name": "SIP300_L01.04", "offset2d": [30, -40], "labelReverse": [90, -450, 150]},
+					{"type": "vlv", "position": 12350, "name": "VLV_XBL01.01", "labelReverse": [90, 1040, 130]},
+					{"type": "bpm", "position": 12596, "name": "RTBPM_L01.02", "labelReverse": [90, 1070, 130]},
+					{"type": "quadrupolefermi", "position": 12889, "name": "Q_L01.02"},
+					{"type": "blm", "position": 12609, "name": "BLM_Q_L01.02", "labelReverse": [90, 1070, 130]},
 					{"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": "vlv", "position": 13700, "name": "VLV_L01.02", "labelReverse": [90, 920, 130]},
+					{"type": "sip", "position": 13960, "name": "SIP300_L01.05", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L01.05", "SIP75_L01.06", "SIP300_L01.06"]},
 					{"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"},
+					{"type": "sip", "position": 18200, "name": "SIP300_L01.07", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L01.07", "SIP75_L01.08", "SIP300_L01.08"]},
+					{"type": "bpm", "position": 18628, "name": "RTBPM_L01.04", "labelReverse": [90, 1070, 130]},
+					{"type": "quadrupolefermi", "position": 18936, "name": "Q_L01.03"},
+					{"type": "blm", "position": 19036, "name": "BLM_Q_L01.03"},
 					{"type": "flsc", "position": 19360, "name": "MSCR_L01.01"},
-					{"type": "plc", "position": 19130, "name": "SPMO_INL03.01", "offset3d": [0, -700, 0], "offset2d": [0, 300], "labelReverse": [90, -250, 250]},
-					{"type": "correctorfermi", "position": 19576, "ps": ["PSCH_L01.03","PSCV_L01.03"], "name": "CHV_L01.03"},
-					{"type": "cavitylinac", "position": 19896, "name": "ACCT_L01.04"},
+					{"type": "plc", "position": 19036, "name": "SPMO_INL03.01", "offset3d": [0, -700, 0], "offset2d": [0, 300], "labelReverse": [90, -250, 250]},
+					{"type": "correctorfermi", "position": 19676, "ps": ["PSCH_L01.03","PSCV_L01.03"], "name": "CHV_L01.03"},
+					{"type": "sip", "position": 19996, "name": "SIP300_L01.07", "offset2d": [30, -40], "labelReverse": [90, -450, 150]},
+					{"type": "cavitylinac", "position": 20396, "name": "ACCT_L01.04"},
 					{"type": "ACCT", "position": 22106, "name": "ACCT_L01.04"},
 					{"type": "ACCT", "position": 24494, "name": "ACCT_L01.04"},
-					{"type": "bpm", "position": 24424, "name": "RTBPM_L01.05"},
+					{"type": "sip", "position": 24100, "name": "SIP300_L01.08", "offset2d": [30, -40], "labelReverse": [90, -450, 150]},
+					{"type": "bpm", "position": 24424, "name": "RTBPM_L01.05", "labelReverse": [90, 1070, 130]},
 					{"type": "quadrupolefermi", "position": 24717, "name": "Q_L01.04"},
 					{"type": "blm", "position": 24717, "name": "BLM_Q_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": 25270, "name": "VLV_BC01.01"},
-					{"type": "sip", "position": 25400, "name": "SIP150_BC01.01","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
+					{"type": "vlv", "position": 25270, "name": "VLV_BC01.01", "labelReverse": [90, 1000, 130]},
+					{"type": "sip", "position": 25400, "name": "SIP150_BC01.01","offset2d": [30, -40], "labelReverse": [90, -450, 150]},
 					{"type": "L01", "position": 25667, "name": "L01"},
 					{"type": "BC01", "position": 25667, "name": "BC01_01"}
 				]
 			},
 			{
 				"start": {"x": -128103, "z": -5815},
-				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI/2", "length": 400, "name": "B_BC01.01", "labelReverse": [270, 1310, 100]},
+				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI/2", "length": 400, "name": "B_BC01.01", "labelReverse": [270, 900, 50]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"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": "quadrupolefermi", "position": 602, "name": "Q_BC01.01", "labelReverse": [90, 900, 200]},
 					{"type": "blm", "position": 602, "name": "BLM_Q_BC01.01"},
-					{"type": "sip", "position": 2302, "name": "SIP150_BC01.02","offset2d": [30, -40], "labelReverse": [90, -470, 200]}
+					{"type": "sip", "position": 902, "name": "SIP150_BC01.02","offset2d": [30, -40], "labelReverse": [90, -450, 200]}
 				]
 			},
 			{
 				"start": {"x": -125125, "z": -6060},
-				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI/2", "length": 400, "name": "B_BC01.02", "labelReverse": [90, 1300, 100]},
+				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI/2", "length": 400, "name": "B_BC01.02", "labelReverse": [90, 890, 10]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "blm", "position": 100, "name": "BLM_B_BC01.02_L"},
 					{"type": "blm", "position": 100, "name": "BLM_B_BC01.02_R"},
-					{"type": "SCRPH", "position": 524, "name": "SCRPH_BC01.01"},
-					{"type": "bpm", "position": 675, "name": "BPM_BC01.01"},
-					{"type": "flsc", "position": 967, "name": "MSCR_BC01.01"}
+					{"type": "SCRPH", "position": 324, "name": "SCRPH_BC01.01"},
+					{"type": "bpm", "position": 475, "name": "BPM_BC01.01", "labelReverse": [90, 1070, 130]},
+					{"type": "flsc", "position": 767, "name": "MSCR_BC01.01"}
 				]
 			},
 			{
 				"start": {"x": -123631, "z": -6060},
-				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI", "length": 400, "name": "B_BC01.03", "labelReverse": [90, 1300, 100]},
+				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI", "length": 400, "name": "B_BC01.03", "labelReverse": [90, 890, 10]},
 				"chamber": {"type": "chamber"},
 				"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": "sip", "position": 2000, "name": "SIP150_BC01.01","offset2d": [30, -40], "labelReverse": [90, -450, 150]},
 					{"type": "quadrupolefermi", "position": 2392, "name": "Q_BC01.02"},
 					{"type": "blm", "position": 2392, "name": "BLM_Q_BC01.02"}
 				]
 			},
 			{
 				"start": {"x": -120647, "z": -5815},
-				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI/2", "length": 400, "name": "B_BC01.04", "labelReverse": [270, 1400, 100]},
+				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI/2", "length": 400, "name": "B_BC01.04", "labelReverse": [270, 920, 10]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "blm", "position": 100, "name": "BLM_B_BC01.04_L"},
 					{"type": "blm", "position": 100, "name": "BLM_B_BC01.04_R"},
 					{"type": "CBLM", "position": 330, "name": "CBLM_BC01.01"},
 					{"type": "GBLM", "position": 978, "name": "GBLM_BC01.01"},
-					{"type": "correctorfermi", "position": 1645, "ps": ["PSCH_BC01.01","PSCV_BC01.01"], "name": "CHV_BC01.01", "labelReverse": [90, 1500, 200]},
-					{"type": "blm", "position": 1645, "name": "BLM_CHV_BC01.01"},
+					{"type": "sip", "position": 1245, "name": "SIP55_BC01.01","offset2d": [30, -40], "labelReverse": [90, -450, 150]},
+					{"type": "correctorfermi", "position": 1545, "ps": ["PSCH_BC01.01","PSCV_BC01.01"], "name": "CHV_BC01.01", "labelReverse": [90, 1100, 200]},
+					{"type": "blm", "position": 1545, "name": "BLM_CHV_BC01.01"},
 					{"type": "BAM", "position": 1917, "name": "BAM_BC01.01"},
-					{"type": "bpm", "position": 1908, "name": "RTBPM_BC01.02", "labelReverse": [90, 1800, 200]},
-					{"type": "vlv", "position": 2200, "name": "VLV_BC01.02", "labelReverse": [90, 1480, 200]},
+					{"type": "bpm", "position": 1908, "name": "RTBPM_BC01.02", "labelReverse": [90, 1250, 130]},
+					{"type": "vlv", "position": 2200, "name": "VLV_BC01.02", "labelReverse": [90, 1110, 150]},
+					{"type": "sip", "position": 2600, "name": "SIP55_BC01.02","offset2d": [30, -40], "labelReverse": [90, -450, 150]},
 					{"type": "DCAV", "position": 3022, "name": "DCAV_BC01.01"},
 					{"type": "blm", "position": 3022, "name": "BLM_DCAV_BC01.01"},
-					{"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": "vlv", "position": 3100, "name": "VLV_BC01.03", "labelReverse": [90, 1110, 150]},
+					{"type": "quadrupolefermi", "position": 3492, "name": "Q_BC01.03", "labelReverse": [90, 1010, 200]},
 					{"type": "blm", "position": 3492, "name": "BLM_Q_BC01.03"},
-					{"type": "quadrupolefermi", "position": 3942, "name": "Q_BC01.04", "labelReverse": [90, 1280, 200]},
+					{"type": "quadrupolefermi", "position": 3942, "name": "Q_BC01.04", "labelReverse": [90, 1010, 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": 4602, "name": "Q_BC01.05", "labelReverse": [90, 1280, 300]},
+					{"type": "correctorfermi", "position": 4267, "ps": ["PSCH_BC01.02","PSCV_BC01.02"], "name": "CHV_BC01.02", "labelReverse": [90, 1140, 200]},
+					{"type": "quadrupolefermi", "position": 4602, "name": "Q_BC01.05", "labelReverse": [90, 1010, 200]},
 					{"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": "sip", "position": 4852, "name": "SIP55_BC01.02","offset2d": [30, -40], "labelReverse": [90, -450, 150]},
+					{"type": "quadrupolefermi", "position": 5092, "name": "Q_BC01.06", "labelReverse": [90, 1010, 200]},
 					{"type": "blm", "position": 5092, "name": "BLM_Q_BC01.06"},
-					{"type": "bpm", "position": 5423, "name": "RTBPM_BC01.03", "labelReverse": [90, 1850, 200]},
-					{"type": "quadrupolefermi", "position": 5629, "name": "Q_BC01.07", "labelReverse": [90, 1280, 300]},
+					{"type": "bpm", "position": 5423, "name": "RTBPM_BC01.03", "labelReverse": [90, 1270, 130]},
+					{"type": "quadrupolefermi", "position": 5629, "name": "Q_BC01.07", "labelReverse": [90, 1010, 200]},
 					{"type": "blm", "position": 5629, "name": "BLM_Q_BC01.07"},
-					{"type": "correctorfermi", "position": 5939, "ps": ["PSCH_BC01.03","PSCV_BC01.03"], "name": "CHV_BC01.03", "labelReverse": [90, 1550, 250]},
+					{"type": "correctorfermi", "position": 5939, "ps": ["PSCH_BC01.03","PSCV_BC01.03"], "name": "CHV_BC01.03", "labelReverse": [90, 1140, 200]},
 					{"type": "blm", "position": 5939, "name": "BLM_CHV_BC01.03"},
 					{"type": "GCOL", "position": 6667, "name": "GCOL_BC01.01"},
 					{"type": "blm", "position": 6667, "name": "BLM_GCOL_BC01.01"},
-					{"type": "flsc", "position": 7269, "name": "MSCR_BC01.02", "labelReverse": [90, 1750, 300]},
+					{"type": "flsc", "position": 7269, "name": "MSCR_BC01.02", "labelReverse": [90, 1250, 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]},
-					{"type": "plc", "position": 13444, "name": "SPIN_BC01.01", "offset3d": [0, -700, 0], "offset2d": [0, 300], "labelReverse": [90, -250, 250]},
-					{"type": "blm", "position": 13444, "name": "BLM_Q_BC01.08"},
-					{"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": "sip", "position": 10300, "name": "SIP55_BC01.03","offset2d": [30, -40], "labelReverse": [90, -450, 150]},
+					{"type": "flsc", "position": 12350, "name": "MSCR_BC01.03", "labelReverse": [90, 1250, 300]},
+					{"type": "correctorfermi", "position": 12728, "ps": ["PSCH_BC01.04","PSCV_BC01.04"], "name": "CHV_BC01.04", "labelReverse": [90, 1140, 200]},
+					{"type": "quadrupolefermi", "position": 13144, "name": "Q_BC01.08", "labelReverse": [90, 1010, 200]},
+					{"type": "plc", "position": 13144, "name": "SPIN_BC01.01", "offset3d": [0, -700, 0], "offset2d": [0, 300], "labelReverse": [90, -250, 250]},
+					{"type": "blm", "position": 13144, "name": "BLM_Q_BC01.08"},
+					{"type": "correctorfermi", "position": 13643, "ps": ["PSCH_BC01.05","PSCV_BC01.05"], "name": "CHV_BC01.05", "labelReverse": [90, 1140, 200]},
+					{"type": "quadrupolefermi", "position": 14278, "name": "Q_BC01.09", "labelReverse": [90, 1010, 200]},
 					{"type": "blm", "position": 14278, "name": "BLM_Q_BC01.09"},
-					{"type": "bpm", "position": 14568, "name": "RTBPM_BC01.04", "labelReverse": [90, -350, 250]},
+					{"type": "bpm", "position": 14568, "name": "RTBPM_BC01.04", "labelReverse": [90, 1250, 130]},
 					{"type": "BC01", "position": 15259, "name": "BC01_01"},
 					{"type": "SPBC01", "position": 15259, "name": "SPBC01"}
 				]
@@ -342,15 +347,15 @@
 				"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"},
-					{"type": "flsc", "position": 2168, "name": "MSCR_SPBC01.01"},
-					{"type": "blm", "position": 2268, "name": "BLM_MSCR_SPBC01.01"},
-					{"type": "cm", "position": 2483, "name": "CM_SPBC01.01"},
-					{"type": "D", "position": 3703, "name": "D_SPBC01.01"},
-					{"type": "SPBC01", "position": 3903, "name": "SPBC01"}
+					{"type": "quadrupolefermi", "position": 928, "name": "Q_SPBC01.01"},
+					{"type": "sip", "position": 1158, "name": "SIP55_SPBC01.01","offset2d": [30, -70]},
+					{"type": "quadrupolefermi", "position": 1478, "name": "Q_SPBC01.02"},
+					{"type": "flsc", "position": 1868, "name": "MSCR_SPBC01.01"},
+					{"type": "blm", "position": 2068, "name": "BLM_MSCR_SPBC01.01"},
+					{"type": "cm", "position": 2283, "name": "CM_SPBC01.01"},
+					{"type": "D", "position": 3503, "name": "D_SPBC01.01"},
+					{"type": "SPBC01", "position": 3703, "name": "SPBC01"}
 				]
 			},	
 			{
@@ -366,7 +371,7 @@
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "BC01", "position": 850, "name": "BC01_02"},
-					{"type": "bpm", "position": 446, "name": "RTBPM_BC01.05", "labelReverse": [90, -450, 300]},
+					{"type": "bpm", "position": 446, "name": "RTBPM_BC01.05", "labelReverse": [90, -450, 150]},
 					{"type": "blm", "position": 846, "name": "BLM_BPM_BC01.05"},
 					{"type": "GCOL", "position": 1471, "name": "GCOL_BC01.02"},
 					{"type": "blm", "position": 1471, "name": "BLM_GCOL_BC01.02"},
@@ -378,71 +383,75 @@
 					{"type": "correctorfermi", "position": 3049, "ps": ["PSCH_BC01.06","PSCV_BC01.06"], "name": "CHV_BC01.06"},
 					{"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": "vlv", "position": 3710, "name": "VLV_L02.01", "labelReverse": [90, 960, 150]},
+					{"type": "sip", "position": 3910, "name": "SIP300_L02.01", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L02.01", "SIP75_L02.03", "SIP300_L02.02"]},
 					{"type": "BC01", "position": 3910, "name": "BC01_02"},
 					{"type": "L02", "position": 3910, "name": "L02"},
 					{"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": "sip", "position": 7928, "name": "SIP300_L02.03","offset2d": [30, -40], "labelReverse": [90, -450, 150]},
+					{"type": "bpm", "position": 8278, "name": "RTBPM_L02.01", "labelReverse": [90, 1080, 130]},
+					{"type": "quadrupolefermi", "position": 8603, "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": "sip", "position": 9393, "name": "SIP300_L02.04","name2": "SIP75_L02.03","name3": "SIP75_L02.04","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
+					{"type": "correctorfermi", "position": 8993, "ps": ["PSCH_L02.01","PSCV_L02.01"], "name": "CHV_L02.01"},
+					{"type": "sip", "position": 9393, "name": "SIP300_L02.04", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L02.03", "SIP75_L02.04"]},
 					{"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"},
-					{"type": "quadrupolefermi", "position": 14439, "name": "Q_L02.02"},
-					{"type": "plc", "position": 14439, "name": "SPMO_L0.01", "offset3d": [0, -700, 0], "offset2d": [0, 300], "labelReverse": [90, -250, 250]},
-					{"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": "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": "sip", "position": 13434, "name": "SIP300_L02.04","offset2d": [30, -40], "labelReverse": [90, -450, 150]},
+					{"type": "bpm", "position": 13834, "name": "RTBPM_L02.02", "labelReverse": [90, 1080, 130]},
+					{"type": "quadrupolefermi", "position": 14139, "name": "Q_L02.02"},
+					{"type": "plc", "position": 14139, "name": "SPMO_L0.01", "offset3d": [0, -700, 0], "offset2d": [0, 300], "labelReverse": [90, -250, 250]},
+					{"type": "blm", "position": 14139, "name": "BLM_Q_L02.02"},
+					{"type": "correctorfermi", "position": 14429, "ps": ["PSCH_L02.02","PSCV_L02.02"], "name": "CHV_L02.02"},
+					{"type": "vlv", "position": 14800, "name": "VLV_L02.02", "labelReverse": [90, 940, 150]},
+					{"type": "sip", "position": 15050, "name": "SIP300_L02.05", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L02.05", "SIP75_L02.06", "SIP300_L02.06"]},
 					{"type": "cavitylinac", "position": 15302, "name": "ACCT_L02.03", "length": 200},
-					{"type": "blm", "position": 15102, "name": "BLM_ACCT_L02.03"},
+					{"type": "blm", "position": 15102, "name": "BLM_ACCT_L02.03", "labelReverse": [90, 1080, 130]},
 					{"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"},
-					{"type": "correctorfermi", "position": 24336, "ps": ["PSCH_L02.04","PSCV_L02.04"], "name": "CHV_L02.04"},
-					{"type": "vlv", "position": 24590, "name": "VLV_L03.01"},
-					{"type": "L02", "position": 24700, "name": "L02"},
-					{"type": "L03", "position": 24700, "name": "L03"},
-					{"type": "cavitylinac", "position": 24900, "name": "ACCBT_L03.01"},
+					{"type": "sip", "position": 19250, "name": "SIP300_L02.06","offset2d": [30, -40], "labelReverse": [90, -450, 150]},
+					{"type": "bpm", "position": 19630, "name": "RTBPM_L02.03", "labelReverse": [90, 1080, 130]},
+					{"type": "quadrupolefermi", "position": 20000, "name": "Q_L02.03"},
+					{"type": "blm", "position": 20000, "name": "BLM_Q_L02.03"},
+					{"type": "correctorfermi", "position": 20326, "ps": ["PSCH_L02.03","PSCV_L02.03"], "name": "CHV_L02.03"},
+					{"type": "sip", "position": 20626, "name": "SIP300_L02.07","offset2d": [30, -40], "labelReverse": [90, -450, 150]},
+					{"type": "cavitylinac", "position": 20826, "name": "ACCT_L02.04"},
+					{"type": "ACCT", "position": 23300, "name": "ACCT_L02.04"},
+					{"type": "blm", "position": 23300, "name": "BLM_ACCT_L02.04"},
+					{"type": "sip", "position": 24540, "name": "SIP300_L02.08", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L03.03"]},
+					{"type": "bpm", "position": 24846, "name": "RTBPM_L02.04", "labelReverse": [90, 1080, 130]},
+					{"type": "quadrupolefermi", "position": 25041, "name": "Q_L02.04"},
+					{"type": "blm", "position": 25041, "name": "BLM_Q_L02.04"},
+					{"type": "correctorfermi", "position": 25436, "ps": ["PSCH_L02.04","PSCV_L02.04"], "name": "CHV_L02.04"},
+					{"type": "vlv", "position": 25850, "name": "VLV_L03.01", "labelReverse": [90, 940, 150]},
+					{"type": "sip", "position": 26100, "name": "SIP300_L03.01","offset2d": [30, -40], "labelReverse": [90, -450, 150]},
+					{"type": "L02", "position": 25700, "name": "L02"},
+					{"type": "L03", "position": 25700, "name": "L03"},
+					{"type": "cavitylinac", "position": 26300, "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": "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": "sip", "position": 30300, "name": "SIP300_L03.02","offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L03.02", "SIP75_L03.3", "SIP75_L03.4"]},
+					{"type": "bpm", "position": 30703, "name": "RTBPM_L03.01", "labelReverse": [90, 1080, 130]},
+					{"type": "quadrupolefermi", "position": 31071, "name": "Q_L03.01"},
+					{"type": "blm", "position": 31071, "name": "BLM_Q_L03.01"},
+					{"type": "correctorfermi", "position": 31595, "ps": ["PSCH_L03.01","PSCV_L03.01"], "name": "CHV_L03.01"},
+					{"type": "sip", "position": 31895, "name": "SIP300_L03.03","offset2d": [30, -40], "labelReverse": [90, -450, 150]},
+					{"type": "cavitylinac", "position": 32159, "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"},
-					{"type": "blm", "position": 38425, "name": "BLM_Q_L03.02"},
-					{"type": "flsc", "position": 38831, "name": "MSCR_L03.01"},
-					{"type": "blm", "position": 38831, "name": "BLM_MSCR_L03.01"},
-					{"type": "correctorfermi", "position": 39069, "ps": ["PSCH_L03.02","PSCV_L03.02"], "name": "CHV_L03.02"},
+					{"type": "sip", "position": 36100, "name": "SIP300_L03.04", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L03.05", "SIP75_L03.06", "SIP75_L03.07", "SIP75_L03.08"]},
+					{"type": "vlv", "position": 36580, "name": "VLV_BC02.01", "labelReverse": [90, 980, 150]},				
+					{"type": "bpm", "position": 37100, "name": "RTBPM_L03.02", "labelReverse": [90, 1080, 130]},
+					{"type": "quadrupolefermi", "position": 37625, "name": "Q_L03.02"},
+					{"type": "blm", "position": 37625, "name": "BLM_Q_L03.02"},
+					{"type": "flsc", "position": 38331, "name": "MSCR_L03.01"},
+					{"type": "blm", "position": 38331, "name": "BLM_MSCR_L03.01"},
+					{"type": "correctorfermi", "position": 38869, "ps": ["PSCH_L03.02","PSCV_L03.02"], "name": "CHV_L03.02"},
 					{"type": "L03", "position": 39427, "name": "L03"},
 					{"type": "BC02", "position": 39427, "name": "BC02"}
 				]
@@ -450,42 +459,42 @@
 			
 			{
 				"start": {"x": -65603, "z": -5811},
-				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI", "length": 400, "name": "B_BC02.01", "labelReverse": [90, 1320, 100]},
+				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI", "length": 400, "name": "B_BC02.01", "labelReverse": [90, 890, 50]},
 				"chamber": {"type": "chamber"},
 				"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": "sip", "position": 250, "name": "SIP150_BC02.01","offset2d": [30, -40], "labelReverse": [90, -450, 150]},
 					{"type": "quadrupolefermi", "position": 500, "name": "Q_BC02.01"},
 					{"type": "blm", "position": 500, "name": "BLM_Q_BC02.01"}
 				]
 			},
 			{
 				"start": {"x": -62626, "z": -5811},
-				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI", "length": 400, "name": "B_BC02.02", "labelReverse": [90, 1320, 100]},
+				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI", "length": 400, "name": "B_BC02.02", "labelReverse": [90, 890, 50]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "blm", "position": 100, "name": "BLM_B_BC02.02_L"},
 					{"type": "blm", "position": 100, "name": "BLM_B_BC02.02_R"},
 					{"type": "SCRPH", "position": 524, "name": "SCRPH_BC02.01"},
-					{"type": "bpm", "position": 474, "name": "RTBPM_BC02.01"},
-					{"type": "flsc", "position": 767, "name": "MSCR_BC02.01"}
+					{"type": "flsc", "position": 597, "name": "MSCR_BC02.01"}
 				]
 			},
 			{
 				"start": {"x": -61131, "z": -5811},
-				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI", "length": 400, "name": "B_BC02.03", "labelReverse": [90, 1320, 100]},
+				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI", "length": 400, "name": "B_BC02.03", "labelReverse": [90, 890, 50]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "blm", "position": 100, "name": "BLM_B_BC02.03_L"},
 					{"type": "blm", "position": 100, "name": "BLM_B_BC02.03_R"},
+					{"type": "sip", "position": 1900, "name": "SIP150_BC02.02","offset2d": [30, -40], "labelReverse": [90, -450, 150]},
 					{"type": "quadrupolefermi", "position": 2283, "name": "Q_BC02.02"},
 					{"type": "blm", "position": 2383, "name": "BLM_Q_BC02.02"}
 				]
 			},
 			{
 				"start": {"x": -58148, "z": -5811},
-				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI", "length": 400, "name": "B_BC02.04", "labelReverse": [90, 1320, 100]},
+				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI", "length": 400, "name": "B_BC02.04", "labelReverse": [90, 890, 50]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "blm", "position": 100, "name": "BLM_B_BC02.04_L"},
@@ -493,101 +502,104 @@
 					{"type": "CBLM", "position": 331, "name": "CBLM_BC02.01"},
 					{"type": "GBLM", "position": 979, "name": "GBLM_BC02.01"},
 					{"type": "BAM", "position": 1130, "name": "BAM_BC02.01"},
-					{"type": "bpm", "position": 701, "name": "RTBPM_BC02.02"},
+					{"type": "bpm", "position": 701, "name": "RTBPM_BC02.02", "labelReverse": [90, 1160, 130]},
 					{"type": "quadrupolefermi", "position": 940, "name": "Q_BC02.03"},
 					{"type": "blm", "position": 940, "name": "BLM_Q_BC02.03"},
 					{"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": "sip", "position": 1847, "name": "SIP300_L04.01", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP300_L04.02"]},
 					{"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": "sip", "position": 9100, "name": "SIP300_L04.03","name2": "SIP300_L04.04","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
+					{"type": "sip", "position": 5900, "name": "SIP300_L04.02", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L04.01", "SIP75_L04.02", "SIP75_L04.03", "SIP75_L04.04"]},
+					{"type": "bpm", "position": 6780, "name": "RTBPM_L04.01", "labelReverse": [90, 1100, 130]},
+					{"type": "quadrupolefermi", "position": 7428, "name": "Q_L04.01"},
+					{"type": "blm", "position": 7428, "name": "BLM_Q_L04.01", "labelReverse": [90, 1160, 130]},
+					{"type": "flsc", "position": 8112, "name": "MSCR_L04.01"},
+					{"type": "correctorfermi", "position": 8612, "ps": ["PSCH_L04.01","PSCV_L04.01"], "name": "CHV_L04.01"},
+					{"type": "sip", "position": 9100, "name": "SIP300_L04.03", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP300_L04.04"]},
 					{"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": "sip", "position": 16400, "name": "SIP300_L04.05","name2": "SIP300_L04.06","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
+					{"type": "sip", "position": 13062, "name": "SIP300_L04.04", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L04.05", "SIP75_L04.06", "SIP75_L04.07", "SIP75_L04.08"]},
+					{"type": "bpm", "position": 14000, "name": "RTBPM_L04.02", "labelReverse": [90, 1100, 130]},
+					{"type": "quadrupolefermi", "position": 14712, "name": "Q_L04.02"},
+					{"type": "blm", "position": 14712, "name": "BLM_Q_L04.02", "labelReverse": [90, 1160, 130]},
+					{"type": "correctorfermi", "position": 15507, "ps": ["PSCH_L04.02","PSCV_L04.02"], "name": "CHV_L04.02"},
+					{"type": "vlv", "position": 16000, "name": "VLV_L04.02"},
+					{"type": "sip", "position": 16350, "name": "SIP300_L04.05", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP300_L04.06"]},
 					{"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": "sip", "position": 23440, "name": "SIP300_L04.07","name2": "SIP300_L04.08","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
+					{"type": "sip", "position": 20400, "name": "SIP300_L04.06", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L04.09", "SIP75_L04.10", "SIP75_L04.11", "SIP75_L04.12"]},
+					{"type": "bpm", "position": 21150, "name": "RTBPM_L04.03", "labelReverse": [90, 1100, 130]},
+					{"type": "quadrupolefermi", "position": 21945, "name": "Q_L04.03"},
+					{"type": "blm", "position": 21945, "name": "BLM_Q_L04.03"},
+					{"type": "correctorfermi", "position": 22740, "ps": ["PSCH_L04.03","PSCV_L04.03"], "name": "CHV_L04.03"},
+					{"type": "sip", "position": 23440, "name": "SIP300_L04.07", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP300_L04.08"]},
 					{"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": "sip", "position": 30800, "name": "SIP300_L04.09","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
+					{"type": "sip", "position": 27600, "name": "SIP300_L04.08", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L04.13", "SIP75_L04.14", "SIP75_L04.15", "SIP75_L04.16"]},
+					{"type": "bpm", "position": 28217, "name": "RTBPM_L04.04", "labelReverse": [90, 1100, 130]},
+					{"type": "quadrupolefermi", "position": 29117, "name": "Q_L04.04"},
+					{"type": "plc", "position": 29117, "name": "SPIN_L04.01", "offset3d": [0, -700, 0], "offset2d": [0, 300], "labelReverse": [90, -250, 250]},
+					{"type": "blm", "position": 29117, "name": "BLM_Q_L04.04"},
+					{"type": "correctorfermi", "position": 29812, "ps": ["PSCH_L04.04","PSCV_L04.04"], "name": "CHV_L04.04"},
+					{"type": "vlv", "position": 30400, "name": "VLV_L04.03"},
+					{"type": "sip", "position": 30800, "name": "SIP300_L04.09","offset2d": [30, -40], "labelReverse": [90, -450, 150]},
 					{"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": "sip", "position": 34800, "name": "SIP75_L04.17", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L04.18", "SIP75_L04.19", "SIP75_L04.20"]},
+					{"type": "bpm", "position": 35610, "name": "RTBPM_L04.05", "labelReverse": [90, 1100, 130]},
+					{"type": "quadrupolefermi", "position": 36410, "name": "Q_L04.05"},
+					{"type": "blm", "position": 36410, "name": "BLM_Q_L04.05"},
+					{"type": "correctorfermi", "position": 37305, "ps": ["PSCH_L04.05","PSCV_L04.05"], "name": "CHV_L04.05"},
+					{"type": "blm", "position": 37305, "name": "BLM_CHV_L04.05"},
+					{"type": "sip", "position": 38100, "name": "SIP75_L04.25", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L04.22", "SIP75_L04.23", "SIP75_L04.24", "SIP75_L04.25", "SIP55_L04.01", "SIP55_L04.02", "SIP75_L04.26", "SIP55_L04.03", "SIP55_L04.04"]},
+					{"type": "cavitylinac", "position": 38290, "name": "ACCBT_L04.06"},
 					{"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"},
-					{"type": "quadrupolefermi", "position": 41500, "name": "Q_L04.06"},
-					{"type": "blm", "position": 41677, "name": "BLM_Q_L04.06"},
-					{"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": "bpm", "position": 42160, "name": "RTBPM_L04.06", "labelReverse": [90, 1100, 130]},
+					{"type": "blm", "position": 42417, "name": "BLM_CHV_L04.06"},
+					{"type": "correctorfermi", "position": 42500, "ps": ["PSCH_L04.06","PSCV_L04.06"], "name": "CHV_L04.06"},	
+					{"type": "blm", "position": 42677, "name": "BLM_Q_L04.06"},
+					{"type": "quadrupolefermi", "position": 43200, "name": "Q_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": "sip", "position": 44850, "name": "SIP75_L04.26", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L04.28", "SIP75_L04.29", "SIP75_L04.30"]},
 					{"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"},
+					{"type": "bpm", "position": 45572, "name": "RTBPM_L04.07", "labelReverse": [90, 1100, 130]},
 					{"type": "correctorfermi", "position": 45828, "ps": ["PSCH_L04.07","PSCV_L04.07"], "name": "CHV_L04.07"},
 					{"type": "blm", "position": 45828, "name": "BLM_CHV_L04.07"},
+					{"type": "sip", "position": 46128, "name": "SIP75_L04.27","offset2d": [30, -40], "labelReverse": [90, -450, 150]},
+					{"type": "cavitylinac", "position": 46328, "name": "ACCBT_L04.07"},
 					{"type": "DCAV", "position": 47430, "name": "DCAV_L04.01"},
 					{"type": "blm", "position": 47430, "name": "BLM_DCAV_L04.01"},
-					{"type": "L04", "position": 48680, "name": "L04"},
-					{"type": "TLS", "position": 48680, "name": "TLS_01"},
-					{"type": "quadrupolefermi", "position": 48955, "name": "Q_TLS.01"},
-					{"type": "blm", "position": 48955, "name": "BLM_Q_TLS.01"},
-					{"type": "quadrupolefermi", "position": 49455, "name": "Q_TLS.02"},
-					{"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": "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": "L04", "position": 49680, "name": "L04"},
+					{"type": "TLS", "position": 49680, "name": "TLS_01"},
+					{"type": "quadrupolefermi", "position": 50255, "name": "Q_TLS.01"},
+					{"type": "sip", "position": 50550, "name": "SIP75_L04.28","offset2d": [30, -40], "labelReverse": [90, -450, 150]},
+					{"type": "blm", "position": 50255, "name": "BLM_Q_TLS.01"},
+					{"type": "quadrupolefermi", "position": 50955, "name": "Q_TLS.02"},
+					{"type": "plc", "position": 50955, "name": "SPIN_TLS.01", "offset3d": [0, -700, 0], "offset2d": [0, 300], "labelReverse": [90, -250, 250]},
+					{"type": "blm", "position": 50955, "name": "BLM_Q_TLS.02"},
+					{"type": "vlv", "position": 51300, "name": "VLV_TLS.01"},
+					{"type": "correctorfermi", "position": 51495, "ps": ["PSCH_TLS.01","PSCV_TLS.01"], "name": "CHV_TLS.01"},
+					{"type": "blm", "position": 51605, "name": "BLM_CHV_TLS.01"},
+					{"type": "bpm", "position": 52252, "name": "RTBPM_TLS.01", "labelReverse": [90, 1100, 130]},
+					{"type": "flsc", "position": 52495, "name": "MSCR_TLS.01"},
+					{"type": "blm", "position": 52495, "name": "BLM_MSCR_TLS.01"},
+					{"type": "sip", "position": 52895, "name": "SIP300_TLS.01","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
+					{"type": "GCOL", "position": 52315, "name": "GCOL_TLS.01"},
 					{"type": "blm", "position": 51315, "name": "BLM_GCOL_TLS.01"},
 					{"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": "quadrupolefermi", "position": 53210, "name": "Q_TLS.04"},
 					{"type": "blm", "position": 52710, "name": "BLM_Q_TLS.04"},
 					{"type": "TLS", "position": 53223, "name": "TLS_01"},
 					{"type": "DBD", "position": 53223, "name": "DBD"}
@@ -595,7 +607,7 @@
 			},
 			{
 				"start": {"x": -3722, "z": -5645},
-				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI", "length": 2437, "name": "B_DBD.01" , "labelReverse": [90, -450, 250]},
+				"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 2400, "name": "B_DBD.01" , "labelReverse": [90, -450, 150]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "blm", "position": 100, "name": "BLM_B_DBD.01_L"},
@@ -612,7 +624,7 @@
 			},
 			{
 				"start": {"x": 902, "z": -2823},
-				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI", "length": 2437, "name": "B_DBD.02"},
+				"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 2400, "name": "B_DBD.02"},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "blm", "position": 100, "name": "BLM_B_DBD.02_L"},
@@ -621,22 +633,23 @@
 					{"type": "correctorfermi", "position": 2096, "name": "CH_DBD.01"},
 					{"type": "blm", "position": 2096, "name": "BLM_CH_DBD.01"},
 					{"type": "correctorfermi", "position": 2472, "name": "CV_DBD.01"},
-					{"type": "quadrupolefermi", "position": 3208, "name": "Q_DBD.04"},
-					{"type": "blm", "position": 3208, "name": "BLM_Q_DBD.04"},
-					{"type": "sip", "position": 3900, "name": "SIP75_DBD.01","name2": "SIP75_DBD.02","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
-     				{"type": "vlv", "position": 4400, "name": "VLV_DBD.01"},
-					{"type": "sip", "position": 5000, "name": "SIP150_DBD.01","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
-     				{"type": "quadrupolefermi", "position": 5706, "name": "Q_DBD.05"},
-					{"type": "blm", "position": 5706, "name": "BLM_Q_DBD.05"},
+					{"type": "sip", "position": 3208, "name": "SIP75_DBD.01", "offset2d": [30, -40], "labelReverse": [90, -470, 200], "embedded": ["SIP75_DBD.02"]},
+     				{"type": "quadrupolefermi", "position": 3900, "name": "Q_DBD.04"},
+					{"type": "blm", "position": 3900, "name": "BLM_Q_DBD.04"},
+					{"type": "vlv", "position": 4400, "name": "VLV_DBD.01"},
+					{"type": "quadrupolefermi", "position": 5000, "name": "Q_DBD.05"},
+					{"type": "sip", "position": 5706, "name": "SIP150_DBD.01","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
+     				{"type": "blm", "position": 5706, "name": "BLM_Q_DBD.05"},
 					{"type": "cm", "position": 6476, "name": "CM_DBD.01"},
 					{"type": "flsc", "position": 6872, "name": "MSCR_DBD.02"},
 					{"type": "blm", "position": 6872, "name": "BLM_MSCR_DBD.02"},
 					{"type": "D", "position": 8300, "name": "D_DBD.01"},
-					{"type": "DBD", "position": 9152, "name": "DBD"}
+					{"type": "DBD", "position": 9152, "name": "DBD"},
+					{"type": "ending", "position": 7572, "name": ""}
 				]
 			},
 			{
-				"start": {"x": 6647, "z": 5813},
+				"start": {"x": 6047, "z": 3713},
 				
 				"chamber": {"type": "chamber"},
 				"components": []
@@ -657,265 +670,267 @@
 	"fel1": {
 		"sections": [
 			{
-				"start": {"x": -3722, "z": -5645},
-				"components": [
-					{"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"},
-					{"type": "quadrupolefermi", "position": 1899, "name": "Q_TLS.05"},
-					{"type": "correctorfermi", "position": 2221, "ps": ["PSCH_TLS.03","PSCV_TLS.03"], "name": "CHV_TLS.03"},
-					{"type": "quadrupolefermi", "position": 2599, "name": "Q_TLS.06"},
-					{"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": "sip", "position": 3714, "name": "SIP75_TLS.01","offset2d": [30, -40]},
+				"start": {"x": -3112, "z": -5645},
+				"components": [
+					{"type": "sip", "position": 1300, "name": "SIP55_TLS.02","offset2d": [30, -40], "labelReverse": [90, 1000, 130]},
+  					{"type": "correctorfermi", "position": 1899, "ps": ["PSCH_TLS.02","PSCV_TLS.02"], "name": "CHV_TLS.02"},
+					{"type": "blm", "position": 2249, "name": "RTBLM_TLS.02"},
+					{"type": "flsc", "position": 2349, "name": "MSCR_TLS.03"},
+					{"type": "quadrupolefermi", "position": 2899, "name": "Q_TLS.05"},
+					{"type": "correctorfermi", "position": 3221, "ps": ["PSCH_TLS.03","PSCV_TLS.03"], "name": "CHV_TLS.03"},
+					{"type": "quadrupolefermi", "position": 3599, "name": "Q_TLS.06"},
+					{"type": "blm", "position": 3806, "name": "RTBPM_TLS.03"},
+					{"type": "quadrupolefermi", "position": 4114, "name": "Q_TLS.07"},
+					{"type": "bst", "position": 4614, "name": "BST_TLS.01"},
+					{"type": "sip", "position": 5014, "name": "SIP75_TLS.01","offset2d": [30, -40], "labelReverse": [90, 1000, 130]},
   					{"type": "vlv", "position": 6100, "name": "VLV_SCL.01"},
-					{"type": "sip", "position": 9700, "name": "SIP55_SCL.01","offset2d": [30, -40]},
-  					{"type": "quadrupolefermi", "position": 10100, "name": "Q_SCL.01", "labelReverse": [90, 1300, 250]}
+					{"type": "quadrupolefermi", "position": 9500, "name": "Q_SCL.01", "labelReverse": [90, 900, 190]}
 					
 				]
 			},
 			{
 				"start": {"x": 7140, "z": -5645},
-				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI/2", "length": 250, "name": "B_SCL.01", "labelReverse": [270, 1400, 100]},
+				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI/2", "length": 250, "name": "B_SCL.01", "labelReverse": [270, 920, 10]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "blm", "position": 100, "name": "BLM_B_SCL.01"},
-					{"type": "correctorfermi", "position": 449, "ps": ["PSCH_SCL.01","PSCV_SCL.01"], "name": "CHV_SCL.01", "labelReverse": [90, 1550, 250]},
-					{"type": "quadrupolefermi", "position": 799, "name": "Q_SCL.02", "labelReverse": [90, 1300, 250]},
+					{"type": "correctorfermi", "position": 449, "ps": ["PSCH_SCL.01","PSCV_SCL.01"], "name": "CHV_SCL.01", "labelReverse": [90, 1050, 200]},
+					{"type": "quadrupolefermi", "position": 799, "name": "Q_SCL.02", "labelReverse": [90, 920, 200]},
 					{"type": "blm", "position": 799, "name": "BLM_Q_SCL.02"},
-					{"type": "sip", "position": 1349, "name": "SIP300_SCL.01","offset2d": [30, -40], "labelReverse": [90, 1750, 200]},
-  					{"type": "quadrupolefermi", "position": 1749, "name": "Q_SCL.03", "labelReverse": [90, 1300, 250]},
+					{"type": "sip", "position": 1199, "name": "SIP55_SCL.01","offset2d": [30, -40], "labelReverse": [90, 1030, 130]},
+					{"type": "quadrupolefermi", "position": 1749, "name": "Q_SCL.03", "labelReverse": [90, 920, 200]},
 					{"type": "blm", "position": 1749, "name": "BLM_Q_SCL.03"},
-					{"type": "bpm", "position": 2019, "name": "RTBPM_SCL.01", "labelReverse": [90, 1850, 250]},
+					{"type": "bpm", "position": 2169, "name": "RTBPM_SCL.01", "labelReverse": [90, 1200, 150]},
+					{"type": "sip", "position": 2469, "name": "SIP300_SCL.01","offset2d": [30, -40], "labelReverse": [90, 1150, 150]},
 					{"type": "ECOL", "position": 2644, "name": "ECOL_SCL.01"},
 					{"type": "blm", "position": 2644, "name": "BLM_ECOL_SCL.01"},
-					{"type": "sip", "position": 2399, "name": "SIP55_SCL.02","offset2d": [30, -40], "labelReverse": [90, 1650, 200]},
-  					{"type": "quadrupolefermi", "position": 2799, "name": "Q_SCL.04", "labelReverse": [90, 1300, 250]},
+					{"type": "quadrupolefermi", "position": 2799, "name": "Q_SCL.04", "labelReverse": [90, 920, 200]},
 					{"type": "blm", "position": 2899, "name": "BLM_Q_SCL.04"},
-					{"type": "flsc", "position": 3119, "name": "MSCR_SCL.01", "labelReverse": [90, 1750, 250]},
+					{"type": "flsc", "position": 3119, "name": "MSCR_SCL.01", "labelReverse": [90, 1050, 200]},
 					{"type": "blm", "position": 3119, "name": "BLM_MSCR_SCL.01"},
-					{"type": "quadrupolefermi", "position": 3414, "name": "Q_SCL.05", "labelReverse": [90, 1300, 250]},
+					{"type": "quadrupolefermi", "position": 3414, "name": "Q_SCL.05", "labelReverse": [90, 920, 200]},
 					{"type": "blm", "position": 3514, "name": "BLM_Q_SCL.05"},
-					{"type": "correctorfermi", "position": 3821, "ps": ["PSCH_SCL.02","PSCV_SCL.02"], "name": "CHV_SCL.02", "labelReverse": [90, 1550, 250]}
+					{"type": "correctorfermi", "position": 3721, "ps": ["PSCH_SCL.02","PSCV_SCL.02"], "name": "CHV_SCL.02", "labelReverse": [90, 1050, 200]}
 				]
 			},
 			{
 				"start": {"x": 11440, "z": -6064},
-				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "-PI", "length": 250, "name": "B_SCL.02", "labelReverse": [270, 1300, 100]},
+				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "-PI", "length": 250, "name": "B_SCL.02", "labelReverse": [270, 900, 50]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "blm", "position": 100, "name": "BLM_B_SCL.02"},
-					{"type": "bpm", "position": 315, "name": "RTBPM_SCL.02", "labelReverse": [90, 1850, 250]},
-					{"type": "quadrupolefermi", "position": 800, "name": "Q_SCL.06", "labelReverse": [90, 1300, 250]},
+					{"type": "bpm", "position": 315, "name": "RTBPM_SCL.02", "labelReverse": [90, 1200, 150]},
+					{"type": "quadrupolefermi", "position": 800, "name": "Q_SCL.06", "labelReverse": [90, 920, 200]},
 					{"type": "plc", "position": 800, "name": "SPIN-UH.01", "offset3d": [0, -700, 0], "offset2d": [0, 300], "labelReverse": [90, -250, 250]},
-					{"type": "blm", "position": 800, "name": "BLM_Q_SCL.06", "labelReverse": [90, 1300, 250]},
-					{"type": "quadrupolefermi", "position": 1750, "name": "Q_SCL.07", "labelReverse": [90, 1300, 250]},
+					{"type": "blm", "position": 800, "name": "BLM_Q_SCL.06", "labelReverse": [90, 1050, 200]},
+					{"type": "sip", "position": 1100, "name": "SIP55_SCL.02","offset2d": [30, -40], "labelReverse": [90, 1070, 150]},
+					{"type": "quadrupolefermi", "position": 1750, "name": "Q_SCL.07", "labelReverse": [90, 920, 200]},
 					{"type": "blm", "position": 1750, "name": "BLM_Q_SCL.07"},
-					{"type": "sip", "position": 2550, "name": "SIP55_SCL.03","offset2d": [30, -40], "labelReverse": [90, 1650, 200]},
-					{"type": "quadrupolefermi", "position": 3300, "name": "Q_SCL.08", "labelReverse": [90, 1300, 250]},
+					{"type": "quadrupolefermi", "position": 3300, "name": "Q_SCL.08", "labelReverse": [90, 920, 200]},
 					{"type": "blm", "position": 3300, "name": "BLM_Q_SCL.08"},
-					{"type": "correctorfermi", "position": 3680, "ps": ["PSCH_SCL.03","PSCV_SCL.03"], "name": "CHV_SCL.03", "labelReverse": [90, 1550, 250]},
+					{"type": "correctorfermi", "position": 3680, "ps": ["PSCH_SCL.03","PSCV_SCL.03"], "name": "CHV_SCL.03", "labelReverse": [90, 1050, 200]},
 					{"type": "blm", "position": 3680, "name": "BLM_CHV_SCL.03"},
-					{"type": "quadrupolefermi", "position": 4015, "name": "Q_SCL.09", "labelReverse": [90, 1300, 250]},
+					{"type": "quadrupolefermi", "position": 4015, "name": "Q_SCL.09", "labelReverse": [90, 920, 200]},
 					{"type": "blm", "position": 4015, "name": "BLM_Q_SCL.09"},
+					{"type": "sip", "position": 4315, "name": "SIP55_SCL.03","offset2d": [30, -40], "labelReverse": [90, 1050, 150]},
 					{"type": "SCL", "position": 4640, "name": "SCL"},
 					{"type": "SFEL01", "position": 4640, "name": "SFEL01"},
-					{"type": "quadrupolefermi", "position": 6015, "name": "Q_SFEL01.01", "labelReverse": [90, 1600, 250]},
+					{"type": "quadrupolefermi", "position": 6015, "name": "Q_SFEL01.01", "labelReverse": [90, 1050, 200]},
 					{"type": "blm", "position": 6015, "name": "BLM_Q_SFEL01.01"},
-					{"type": "sip", "position": 8800, "name": "SIP55_SFEL01.01","offset2d": [30, -40], "labelReverse": [90, 1850, 200]},
-					{"type": "vlv", "position": 9300, "name": "VLV_SFEL01.01", "labelReverse": [90, 1750, 150]},
-					{"type": "sip", "position": 9600, "name": "SIP55_SFEL01.02","offset2d": [30, -40], "labelReverse": [90, 1850, 200]},
-					{"type": "correctorfermi", "position": 10015, "ps": ["PSCH_SFEL01.01","PSCV_SFEL01.01"], "name": "CHV_SFEL01.01", "labelReverse": [90, 1800, 250]},
-					{"type": "bpm", "position": 10290, "name": "RTBPM_SFEL01.01", "labelReverse": [90, 2100, 250]},
-					{"type": "quadrupolefermi", "position": 10815, "name": "Q_SFEL01.02", "labelReverse": [90, 1550, 250]},
+					{"type": "sip", "position": 7060, "name": "SIP55_SFEL01.01","offset2d": [30, -40], "labelReverse": [90, 1100, 150]},
+					{"type": "vlv", "position": 9300, "name": "VLV_SFEL01.01", "labelReverse": [90, 1080, 150]},
+					{"type": "sip", "position": 9600, "name": "SIP55_SFEL01.02","offset2d": [30, -40], "labelReverse": [90, 1150, 150]},
+					{"type": "correctorfermi", "position": 10015, "ps": ["PSCH_SFEL01.01","PSCV_SFEL01.01"], "name": "CHV_SFEL01.01", "labelReverse": [90, 1110, 200]},
+					{"type": "bpm", "position": 10490, "name": "RTBPM_SFEL01.01", "labelReverse": [90, 1250, 150]},
+					{"type": "quadrupolefermi", "position": 10815, "name": "Q_SFEL01.02", "labelReverse": [90, 970, 200]},
 					{"type": "blm", "position": 10815, "name": "BLM_Q_SFEL01.02"},
-					{"type": "sip", "position": 11815, "name": "SIP300_SFEL01.01","offset2d": [30, -40], "labelReverse": [90, 1990, 200]},
-					{"type": "quadrupolefermi", "position": 12815, "name": "Q_SFEL01.03", "labelReverse": [90, 1600, 250]},
+					{"type": "sip", "position": 11215, "name": "SIP55_SFEL01.03","offset2d": [30, -40], "labelReverse": [90, 1100, 150]},
+					{"type": "quadrupolefermi", "position": 12815, "name": "Q_SFEL01.03", "labelReverse": [90, 1020, 200]},
 					{"type": "blm", "position": 12815, "name": "BLM_Q_SFEL01.03"},
 					{"type": "plc", "position": 12815, "name": "SPIN-UH.02", "offset3d": [0, -300, 0], "offset2d": [0, 300], "labelReverse": [185,50,80]},
-					{"type": "plc", "position": 13215, "name": "SP_SLU_UH.03", "offset3d": [0, -300, 0], "offset2d": [0, 300], "labelReverse": [185,1830,80]},
-					{"type": "correctorfermi", "position": 13215, "ps": ["PSCH_SFEL01.02","PSCV_SFEL01.02"], "name": "CHV_SFEL01.02", "labelReverse": [90, 1850, 250]}
+					{"type": "plc", "position": 13215, "name": "SP_SLU_UH.03", "offset3d": [0, -300, 0], "offset2d": [0, 300], "labelReverse": [185,1200,30]},
+					{"type": "correctorfermi", "position": 13215, "ps": ["PSCH_SFEL01.02","PSCV_SFEL01.02"], "name": "CHV_SFEL01.02", "labelReverse": [90, 1150, 200]},
+					{"type": "sip", "position": 13615, "name": "SIP55_SFEL01.04","offset2d": [30, -40], "labelReverse": [90, 1180, 150]}
+					
 				]
 			},
 			{
 				"start": {"x": 25655, "z": -7555},
-				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "-PI", "length": 250, "name": "B_SFEL01.01", "labelReverse": [90, 1600, 100]},
+				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "-PI", "length": 250, "name": "B_SFEL01.01", "labelReverse": [90, 1000, 50]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "blm", "position": 100, "name": "BLM_B_SFEL01.01"},
-					{"type": "bpm", "position": 357, "name": "RTBPM_SFEL01.02", "labelReverse": [90, 2170, 250]},
-					{"type": "quadrupolefermi", "position": 837, "name": "Q_SFEL01.04", "labelReverse": [90, 1600, 250]},
-					{"type": "plc", "position": 837, "name": "SP_LSU_EOS.02", "offset3d": [0, -300, 0], "offset2d": [0, 300], "labelReverse": [180,2000,80]},
+					{"type": "bpm", "position": 457, "name": "RTBPM_SFEL01.02", "labelReverse": [90, 1290, 150]},
+					{"type": "quadrupolefermi", "position": 837, "name": "Q_SFEL01.04", "labelReverse": [90, 1000, 200]},
+					{"type": "plc", "position": 837, "name": "SP_LSU_EOS.02", "offset3d": [0, -300, 0], "offset2d": [0, 300], "labelReverse": [180,1400,10]},
 					{"type": "blm", "position": 837, "name": "BLM_Q_SFEL01.04"},
-					{"type": "correctorfermi", "position": 1237, "ps": ["PSCH_SFEL01.03","PSCV_SFEL01.03"], "name": "CHV_SFEL01.03", "labelReverse": [90, 1850, 250]},
-					{"type": "quadrupolefermi", "position": 1787, "name": "Q_SFEL01.05", "labelReverse": [90, 1600, 250]},
+					{"type": "correctorfermi", "position": 1237, "ps": ["PSCH_SFEL01.03","PSCV_SFEL01.03"], "name": "CHV_SFEL01.03", "labelReverse": [90, 1130, 200]},
+					{"type": "quadrupolefermi", "position": 1787, "name": "Q_SFEL01.05", "labelReverse": [90, 1000, 200]},
 					{"type": "blm", "position": 1787, "name": "BLM_Q_SFEL01.05"},
-					{"type": "bpm", "position": 2056, "name": "RTBPM_SFEL01.03", "labelReverse": [90, 2150, 250]},
+					{"type": "sip", "position": 2087, "name": "SIP300_SFEL01.01","offset2d": [30, -40], "labelReverse": [90, 1220, 150]},
+					{"type": "bpm", "position": 2456, "name": "RTBPM_SFEL01.03", "labelReverse": [90, 1290, 150]},
 					{"type": "ECOL", "position": 2682, "name": "ECOL_SFEL01.01"},
-					{"type": "sip", "position": 2750, "name": "SIP55_SFEL01.04","offset2d": [30, -40], "labelReverse": [90, 2000, 200]},
-					{"type": "quadrupolefermi", "position": 3337, "name": "Q_SFEL01.06", "labelReverse": [90, 1600, 250]},
-					{"type": "flsc", "position": 3657, "name": "MSCR_SFEL01.01", "labelReverse": [90, 2000, 250]},
-					{"type": "quadrupolefermi", "position": 4052, "name": "Q_SFEL01.07", "labelReverse": [90, 1600, 250]},
+					{"type": "sip", "position": 2750, "name": "SIP55_SFEL01.05","offset2d": [30, -40], "labelReverse": [90, 1200, 150]},
+					{"type": "quadrupolefermi", "position": 3337, "name": "Q_SFEL01.06", "labelReverse": [90, 1050, 200]},
+					{"type": "flsc", "position": 3657, "name": "MSCR_SFEL01.01", "labelReverse": [90, 1250, 200]},
+					{"type": "quadrupolefermi", "position": 4052, "name": "Q_SFEL01.07", "labelReverse": [90, 1050, 200]},
 					{"type": "blm", "position": 4052, "name": "BLM_Q_SFEL01.07"}
 				]
 			},
 			{
 				"start": {"x": 30485, "z": -7808},
-				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "-PI", "length": 250, "name": "B_SFEL01.02", "labelReverse": [90, 1600, 100]},
+				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "-PI", "length": 250, "name": "B_SFEL01.02", "labelReverse": [90, 1050, 50]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "plc", "position": 0, "name": "SPIN-UH.03", "offset3d": [0, -300, 0], "offset2d": [-200, 350], "labelReverse": [180,1500,80]},
 					{"type": "blm", "position": 100, "name": "BLM_B_SFEL01.02"},
-					{"type": "sip", "position": 420, "name": "SIP55_SFEL01.05","offset2d": [30, -40], "labelReverse": [90, 1950, 200]},
-					{"type": "correctorfermi", "position": 800, "ps": ["PSCH_SFEL01.04","PSCV_SFEL01.04"], "name": "CHV_SFEL01.04", "labelReverse": [90, 1850, 250]},
+					{"type": "correctorfermi", "position": 800, "ps": ["PSCH_SFEL01.04","PSCV_SFEL01.04"], "name": "CHV_SFEL01.04", "labelReverse": [90, 1200, 200]},
 					{"type": "blm", "position": 800, "name": "BLM_CHV_SFEL01.04"},
-					{"type": "quadrupolefermi", "position": 1200, "name": "Q_SFEL01.08", "labelReverse": [90, 1600, 250]},
-					{"type": "correctorfermi", "position": 1503, "ps": ["PSCH_SFEL01.05","PSCV_SFEL01.05"], "name": "CHV_SFEL01.05", "labelReverse": [90, 1850, 250]},
-					{"type": "bpm", "position": 1775, "name": "RTBPM_SFEL01.04", "labelReverse": [90, 2150, 250]},
+					{"type": "quadrupolefermi", "position": 1200, "name": "Q_SFEL01.08", "labelReverse": [90, 1070, 200]},
+					{"type": "correctorfermi", "position": 1503, "ps": ["PSCH_SFEL01.05","PSCV_SFEL01.05"], "name": "CHV_SFEL01.05", "labelReverse": [90, 1200, 200]},
+					{"type": "bpm", "position": 1885, "name": "RTBPM_SFEL01.04", "labelReverse": [90, 1350, 130]},
 					{"type": "blm", "position": 1775, "name": "BLM_BPM_SFEL01.04"},
-					{"type": "quadrupolefermi", "position": 2250, "name": "Q_SFEL01.09", "labelReverse": [90, 1600, 250]},
+					{"type": "quadrupolefermi", "position": 2250, "name": "Q_SFEL01.09", "labelReverse": [90, 1070, 200]},
 					{"type": "blm", "position": 2250, "name": "BLM_Q_SFEL01.09"},
-					{"type": "quadrupolefermi", "position": 2950, "name": "Q_SFEL01.10", "labelReverse": [90, 1600, 250]},
-					{"type": "correctorfermi", "position": 3727, "ps": ["PSCH_SFEL01.06","PSCV_SFEL01.06"], "name": "CHV_SFEL01.06", "labelReverse": [90, 1850, 250]},
-					{"type": "quadrupolefermi", "position": 4050, "name": "Q_SFEL01.11", "labelReverse": [90, 1600, 250]},
+					{"type": "quadrupolefermi", "position": 2950, "name": "Q_SFEL01.10", "labelReverse": [90, 1070, 200]},
+					{"type": "correctorfermi", "position": 3727, "ps": ["PSCH_SFEL01.06","PSCV_SFEL01.06"], "name": "CHV_SFEL01.06", "labelReverse": [90, 1200, 200]},
+					{"type": "quadrupolefermi", "position": 4050, "name": "Q_SFEL01.11", "labelReverse": [90, 1070, 200]},
 					{"type": "blm", "position": 4050, "name": "BLM_Q_SFEL01.11"},
-					{"type": "bpm", "position": 4525, "name": "CBPM_SFEL01.01", "labelReverse": [90, 2050, 250]},
-					{"type": "cm", "position": 4750, "name": "CM_SFEL01.01", "labelReverse": [90, 1790, 250]},
-					{"type": "sip", "position": 5000, "name": "SIP150_SFEL01.01","name2": "SIP55_SFEL01.06","offset2d": [30, -40], "labelReverse": [90, 2080, 200]},
-					{"type": "flsc", "position": 5300, "name": "MSCR_SFEL01.02", "labelReverse": [90, 2050, 250]},
+					{"type": "cm", "position": 4405, "name": "CM_SFEL01.01", "labelReverse": [90, 1150, 170]},
+					{"type": "bpm", "position": 4750, "name": "CBPM_SFEL01.01", "labelReverse": [90, 1300, 130]},
+					{"type": "sip", "position": 5070, "name": "SIP150_SFEL01.01", "offset2d": [30, -40], "labelReverse": [90, 1280, 150], "embedded": ["SIP55_SFEL01.06"]},
+					{"type": "flsc", "position": 5300, "name": "MSCR_SFEL01.02", "labelReverse": [90, 1300, 250]},
+					{"type": "sip", "position": 5650, "name": "SIP55_SFEL01.06","offset2d": [30, -40], "labelReverse": [90, 1250, 150]},
 					{"type": "BAM", "position": 5006, "name": "BAM_SFEL01.01"},
-					{"type": "bpm", "position": 5550, "name": "CBPM_SFEL01.02", "labelReverse": [90, 2050, 250]},
+					{"type": "bpm", "position": 6050, "name": "CBPM_SFEL01.02", "labelReverse": [90, 1300, 130]},
 					{"type": "EOS", "position": 6935, "name": "EOS_SFEL01.01"},
-					{"type": "vlv", "position": 7930, "name": "VLV_SFEL01.02", "labelReverse": [90, 1850, 150]},
-					{"type": "bpm", "position": 8204, "name": "CBPM_SFEL01.03", "labelReverse": [90, 2050, 250]},
+					{"type": "sip", "position": 7804, "name": "SIP150_SFEL01.02", "offset2d": [30, -40], "labelReverse": [90, 1280, 150], "embedded": ["SIP55_SFEL01.06"]},
+					{"type": "vlv", "position": 8230, "name": "VLV_SFEL01.02", "labelReverse": [90, 1200, 150]},
+					{"type": "bpm", "position": 8604, "name": "CBPM_SFEL01.03", "labelReverse": [90, 1300, 130]},
 					{"type": "SFEL01", "position": 8675, "name": "SFEL01"},
 					{"type": "UND", "position": 8675, "name": "UND_F01"},
-					{"type": "undulator", "position": 10285, "name": "ID_FEL01.01 (MOD01.01)", "labelReverse": [90, 2650, 250]},
-					{"type": "bpm", "position": 11719, "name": "CBPM_FEL01.01", "labelReverse": [90, 1950, 250]},
-					{"type": "quadrupolefermi", "position": 11950, "name": "Q_FEL01.01", "labelReverse": [90, 1500, 250]},
-					{"type": "sip", "position": 12250, "name": "SIP55_FEL01.01","offset2d": [30, -40], "labelReverse": [90, 1860, 150]},
-					{"type": "correctorfermi", "position": 12400, "ps": ["PSCH_FEL01.01","PSCV_FEL01.01"], "name": "CHV_FEL01.01", "labelReverse": [90, 1780, 250]},
-					{"type": "flsc", "position": 12602, "name": "MSCR_FEL01.01", "labelReverse": [90, 1950, 350]}
+					{"type": "undulator", "position": 10285, "name": "ID_FEL01.01 (MOD01.01)", "labelReverse": [90, 1990, 450]},
+					{"type": "bpm", "position": 11619, "name": "CBPM_FEL01.01", "labelReverse": [90, 1300, 130]},
+					{"type": "quadrupolefermi", "position": 11850, "name": "Q_FEL01.01", "labelReverse": [90, 1070, 200]},
+					{"type": "correctorfermi", "position": 12150, "ps": ["PSCH_FEL01.01","PSCV_FEL01.01"], "name": "CHV_FEL01.01", "labelReverse": [90, 1200, 200]},
+					{"type": "sip", "position": 12420, "name": "SIP55_FEL01.01","offset2d": [30, -40], "labelReverse": [90, 1210, 150]},
+					{"type": "flsc", "position": 12602, "name": "MSCR_FEL01.01", "labelReverse": [90, 1250, 250]}
 				]
 			},
 			{
 				"start": {"x": 43690, "z": -7809},
-				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "-PI/2", "length": 413, "name": "B_EEHG_FEL01.01", "labelReverse": [90, 2150, 150]},
+				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "-PI/2", "length": 413, "name": "B_EEHG_FEL01.01", "labelReverse": [90, 1400, 50]},
 				"chamber": {"type": "chamber"},
 				"components": [
 				]
 			},
 			{
 				"start": {"x": 45099, "z": -7809},
-				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI", "length": 412, "name": "B_EEHG_FEL01.02", "labelReverse": [90, 2150, 50]},
+				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI", "length": 412, "name": "B_EEHG_FEL01.02", "labelReverse": [90, 1400, 50]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "flsc", "position": 340, "name": "MSCR_EEHG_FEL01.01", "labelReverse": [90, 2600, 250], "offset2d": [-220, 0]}
+					{"type": "flsc", "position": 370, "name": "MSCR_EEHG_FEL01.01", "labelReverse": [90, 1650, 250], "offset2d": [-220, 0]}
 				]
 			},
 			{
 				"start": {"x": 45779, "z": -7809},
-				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI", "length": 412, "name": "B_EEHG_FEL01.03", "labelReverse": [90, 2150, 150]},
+				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI", "length": 412, "name": "B_EEHG_FEL01.03", "labelReverse": [90, 1400, 50]},
 				"chamber": {"type": "chamber"},
 				"components": [
 				]
 			},
 			{
 				"start": {"x": 47188, "z": -7809},
-				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI", "length": 412, "name": "B_EEHG_FEL01.04", "labelReverse": [90, 2150, 150]},
+				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI", "length": 412, "name": "B_EEHG_FEL01.04", "labelReverse": [90, 1400, 50]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "bpm", "position": 424, "name": "CBPM_FEL01.02"},
-					{"type": "quadrupolefermi", "position": 685, "name": "Q_FEL01.02"},
-					{"type": "sip", "position": 995, "name": "SIP55_FEL01.02","offset2d": [30, -40], "labelReverse": [90, 1760, 200]},
-					{"type": "correctorfermi", "position": 1195, "ps": ["PSCH_FEL01.02","PSCV_FEL01.02"], "name": "CHV_FEL01.02"},
-					{"type": "flsc", "position": 1437, "name": "MSCR_FEL01.02"},
+					{"type": "bpm", "position": 424, "name": "CBPM_FEL01.02", "labelReverse": [90, 1300, 130]},
+					{"type": "quadrupolefermi", "position": 685, "name": "Q_FEL01.02", "labelReverse": [90, 1070, 200]},
+					{"type": "correctorfermi", "position": 1000, "ps": ["PSCH_FEL01.02","PSCV_FEL01.02"], "name": "CHV_IUFEL01.02", "labelReverse": [90, 1300, 200]},
+					{"type": "sip", "position": 1250, "name": "SIP55_IUFEL01.01","offset2d": [30, -40], "labelReverse": [90, 1210, 150]},
+					{"type": "flsc", "position": 1437, "name": "MSCR_FEL01.02", "labelReverse": [90, 1300, 250]},
 					{"type": "blm", "position": 1437, "name": "BLM_MSCR_FEL01.02"},
 					{"type": "BAM", "position": 1283, "name": "BAM_FEL01.01"},
-					{"type": "undulator", "position": 2142, "name": "ID_FEL01.03  (MOD01.02)"},
-					{"type": "W", "position": 3455, "name": "W_FEL01.01"},
-					{"type": "bpm", "position": 3721, "name": "CBPM_IUFEL01.02"},
-					{"type": "quadrupolefermi", "position": 4431, "name": "Q_IUFEL01.02"},
-					{"type": "sip", "position": 4731, "name": "SIP55_IUFEL01.02","offset2d": [30, -40], "labelReverse": [90, 1960, 210]},
-					{"type": "correctorfermi", "position": 4991, "ps": ["PSCH_IUFEL01.02","PSCV_IUFEL01.02"], "name": "CHV_IUFEL01.02"},
-					{"type": "flsc", "position": 5523, "name": "MSCR_IUFEL01.02"},
-					{"type": "undulator", "position": 6340, "name": "ID_FEL01.04  (RAD01.03)"},
-					{"type": "PHSH", "position": 7688, "name": "PHSH_IUFEL01.03"},
-					{"type": "bpm", "position": 7936, "name": "CBPM_IUFEL01.03"},
-					{"type": "quadrupolefermi", "position": 8446, "name": "Q_IUFEL01.03"},
-					{"type": "sip", "position": 8806, "name": "SIP55_IUFEL01.03","name2": "SIP55_IUFEL01.04","offset2d": [30, -40], "labelReverse": [90, 1960, 210]},
-					{"type": "correctorfermi", "position": 9006, "ps": ["PSCH_IUFEL01.03","PSCV_IUFEL01.03"], "name": "CHV_IUFEL01.03"},
-					{"type": "flsc", "position": 9338, "name": "MSCR_IUFEL01.03"},
-					{"type": "undulator", "position": 10055, "name": "ID_FEL01.05  (RAD01.04)"},
+					{"type": "undulator", "position": 2142, "name": "ID_FEL01.03  (MOD01.02)", "labelReverse": [90, 1990, 450]},
+					{"type": "W", "position": 3305, "name": "W_FEL01.01", "labelReverse": [90, 1000, 220]},
+					{"type": "bpm", "position": 3821, "name": "CBPM_IUFEL01.02", "labelReverse": [90, 1300, 130]},
+					{"type": "quadrupolefermi", "position": 4231, "name": "Q_IUFEL01.02", "labelReverse": [90, 1070, 200]},
+					{"type": "correctorfermi", "position": 4631, "ps": ["PSCH_IUFEL01.02","PSCV_IUFEL01.02"], "name": "CHV_IUFEL01.02", "labelReverse": [90, 1200, 200]},
+					{"type": "sip", "position": 5050, "name": "SIP55_IUFEL01.02","offset2d": [30, -40], "labelReverse": [90, 1210, 150]},
+					{"type": "flsc", "position": 5523, "name": "MSCR_IUFEL01.02", "labelReverse": [90, 1300, 250]},
+					{"type": "undulator", "position": 6340, "name": "ID_FEL01.04  (RAD01.03)", "labelReverse": [90, 1990, 450]},
+					{"type": "PHSH", "position": 7488, "name": "PHSH_IUFEL01.03", "labelReverse": [90, 1300, 100]},
+					{"type": "bpm", "position": 7936, "name": "CBPM_IUFEL01.03", "labelReverse": [90, 1300, 130]},
+					{"type": "quadrupolefermi", "position": 8246, "name": "Q_IUFEL01.03", "labelReverse": [90, 1070, 200]},
+					{"type": "correctorfermi", "position": 8706, "ps": ["PSCH_IUFEL01.03","PSCV_IUFEL01.03"], "name": "CHV_IUFEL01.03", "labelReverse": [90, 1200, 200]},
+					{"type": "sip", "position": 9050, "name": "SIP55_IUFEL01.03", "offset2d": [30, -40], "labelReverse": [90, 1210, 150], "embedded": ["SIP55_IUFEL01.04"]},
+					{"type": "flsc", "position": 9338, "name": "MSCR_IUFEL01.03", "labelReverse": [90, 1300, 250]},
+					{"type": "undulator", "position": 10055, "name": "ID_FEL01.05  (RAD01.04)", "labelReverse": [90, 1990, 450]},
 					{"type": "blm", "position": 10055, "name": "BLM_ID_FEL01.05"},
-					{"type": "PHSH", "position": 11403, "name": "PHSH_IUFEL01.04"},
-					{"type": "bpm", "position": 11651, "name": "CBPM_IUFEL01.04"},
-					{"type": "quadrupolefermi", "position": 12061, "name": "Q_IUFEL01.04"},
-					{"type": "correctorfermi", "position": 12431, "ps": ["PSCH_IUFEL01.04","PSCV_IUFEL01.04"], "name": "CHV_IUFEL01.04"},
-					{"type": "flsc", "position": 12903, "name": "MSCR_IUFEL01.04"},
-					{"type": "undulator", "position": 13770, "name": "ID_FEL01.06  (RAD01.05)"},
-					{"type": "PHSH", "position": 15118, "name": "PHSH_IUFEL01.05"},
-					{"type": "bpm", "position": 15365, "name": "CBPM_IUFEL01.05"},
-					{"type": "quadrupolefermi", "position": 15851, "name": "Q_IUFEL01.05"},
-					{"type": "sip", "position": 16205, "name": "SIP55_IUFEL01.05","offset2d": [30, -40], "labelReverse": [90, 1960, 210]},
-					{"type": "correctorfermi", "position": 16405, "ps": ["PSCH_IUFEL01.05","PSCV_IUFEL01.05"], "name": "CHV_IUFEL01.05"},
-					{"type": "flsc", "position": 16768, "name": "MSCR_IUFEL01.05"},
-					{"type": "undulator", "position": 17484, "name": "ID_FEL01.07  (RAD01.06)"},
-					{"type": "PHSH", "position": 18832, "name": "PHSH_IUFEL01.06"},
-					{"type": "bpm", "position": 19080, "name": "CBPM_IUFEL01.06"},
-					{"type": "quadrupolefermi", "position": 19491, "name": "Q_IUFEL01.06"},
-					{"type": "sip", "position": 19851, "name": "SIP55_IUFEL01.06","offset2d": [30, -40], "labelReverse": [90, 1960, 210]},
-					{"type": "correctorfermi", "position": 20060, "ps": ["PSCH_IUFEL01.06","PSCV_IUFEL01.06"], "name": "CHV_IUFEL01.06"},
-					{"type": "flsc", "position": 20383, "name": "MSCR_IUFEL01.06"},
-					{"type": "undulator", "position": 21189, "name": "ID_FEL01.08  (RAD01.07)"},
-					{"type": "PHSH", "position": 22547, "name": "PHSH_IUFEL01.07"},
-					{"type": "bpm", "position": 22795, "name": "CBPM_IUFEL01.07"},
-					{"type": "quadrupolefermi", "position": 23206, "name": "Q_IUFEL01.07"},
-					{"type": "sip", "position": 23606, "name": "SIP55_IUFEL01.07","offset2d": [30, -40], "labelReverse": [90, 1960, 210]},
-					{"type": "correctorfermi", "position": 23865, "ps": ["PSCH_IUFEL01.07","PSCV_IUFEL01.07"], "name": "CHV_IUFEL01.07"},
-					{"type": "flsc", "position": 24198, "name": "MSCR_IUFEL01.07"},
-					{"type": "undulator", "position": 24904, "name": "ID_FEL01.09  (RAD01.08)"},
+					{"type": "PHSH", "position": 11203, "name": "PHSH_IUFEL01.04", "labelReverse": [90, 1300, 100]},
+					{"type": "bpm", "position": 11651, "name": "CBPM_IUFEL01.04", "labelReverse": [90, 1300, 130]},
+					{"type": "quadrupolefermi", "position": 11961, "name": "Q_IUFEL01.04", "labelReverse": [90, 1070, 200]},
+					{"type": "correctorfermi", "position": 12331, "ps": ["PSCH_IUFEL01.04","PSCV_IUFEL01.04"], "name": "CHV_IUFEL01.04", "labelReverse": [90, 1200, 200]},
+					{"type": "sip", "position": 12671, "name": "SIP55_IUFEL01.04","offset2d": [30, -40], "labelReverse": [90, 1210, 150]},
+					{"type": "flsc", "position": 12903, "name": "MSCR_IUFEL01.04", "labelReverse": [90, 1300, 250]},
+					{"type": "undulator", "position": 13770, "name": "ID_FEL01.06  (RAD01.05)", "labelReverse": [90, 1990, 450]},
+					{"type": "PHSH", "position": 14900, "name": "PHSH_IUFEL01.05", "labelReverse": [90, 1300, 100]},
+					{"type": "bpm", "position": 15365, "name": "CBPM_IUFEL01.05", "labelReverse": [90, 1300, 130]},
+					{"type": "quadrupolefermi", "position": 15751, "name": "Q_IUFEL01.05", "labelReverse": [90, 1070, 200]},
+					{"type": "correctorfermi", "position": 16105, "ps": ["PSCH_IUFEL01.05","PSCV_IUFEL01.05"], "name": "CHV_IUFEL01.05", "labelReverse": [90, 1200, 200]},
+					{"type": "sip", "position": 16455, "name": "SIP55_IUFEL01.05","offset2d": [30, -40], "labelReverse": [90, 1210, 150]},
+					{"type": "undulator", "position": 17484, "name": "ID_FEL01.07  (RAD01.06)", "labelReverse": [90, 1990, 450]},
+					{"type": "PHSH", "position": 18632, "name": "PHSH_IUFEL01.06", "labelReverse": [90, 1300, 100]},
+					{"type": "bpm", "position": 19080, "name": "CBPM_IUFEL01.06", "labelReverse": [90, 1300, 130]},
+					{"type": "quadrupolefermi", "position": 19391, "name": "Q_IUFEL01.06", "labelReverse": [90, 1070, 200]},
+					{"type": "correctorfermi", "position": 19751, "ps": ["PSCH_IUFEL01.06","PSCV_IUFEL01.06"], "name": "CHV_IUFEL01.06", "labelReverse": [90, 1200, 200]},
+					{"type": "sip", "position": 20100, "name": "SIP55_IUFEL01.06","offset2d": [30, -40], "labelReverse": [90, 1210, 150]},
+					{"type": "flsc", "position": 20383, "name": "MSCR_IUFEL01.06", "labelReverse": [90, 1300, 250]},
+					{"type": "undulator", "position": 21189, "name": "ID_FEL01.08  (RAD01.07)", "labelReverse": [90, 1990, 450]},
+					{"type": "PHSH", "position": 22347, "name": "PHSH_IUFEL01.07", "labelReverse": [90, 1300, 100]},
+					{"type": "bpm", "position": 22795, "name": "CBPM_IUFEL01.07", "labelReverse": [90, 1300, 130]},
+					{"type": "quadrupolefermi", "position": 23106, "name": "Q_IUFEL01.07", "labelReverse": [90, 1070, 200]},
+					{"type": "correctorfermi", "position": 23506, "ps": ["PSCH_IUFEL01.07","PSCV_IUFEL01.07"], "name": "CHV_IUFEL01.07", "labelReverse": [90, 1200, 200]},
+					{"type": "sip", "position": 23906, "name": "SIP55_IUFEL01.07","offset2d": [30, -40], "labelReverse": [90, 1210, 150]},
+					{"type": "undulator", "position": 24904, "name": "ID_FEL01.09  (RAD01.08)", "labelReverse": [90, 1990, 450]},
 					{"type": "blm", "position": 24904, "name": "BLM_ID_FEL01.09"},
-					{"type": "bpm", "position": 26532, "name": "CBPM_IUFEL01.08"},
-					{"type": "quadrupolefermi", "position": 27021, "name": "Q_IUFEL01.08"},
-					{"type": "sip", "position": 27381, "name": "SIP55_IUFEL01.08","offset2d": [30, -40], "labelReverse": [90, 1960, 210]},
-					{"type": "correctorfermi", "position": 27590, "ps": ["PSCH_IUFEL01.08","PSCV_IUFEL01.08"], "name": "CHV_IUFEL01.08"},
-					{"type": "flsc", "position": 27899, "name": "MSCR_IUFEL01.08"},
+					{"type": "bpm", "position": 26532, "name": "CBPM_IUFEL01.08", "labelReverse": [90, 1300, 130]},
+					{"type": "quadrupolefermi", "position": 27021, "name": "Q_IUFEL01.08", "labelReverse": [90, 1070, 200]},
+					{"type": "correctorfermi", "position": 27381, "ps": ["PSCH_IUFEL01.08","PSCV_IUFEL01.08"], "name": "CHV_IUFEL01.08", "labelReverse": [90, 1200, 200]},
+					{"type": "sip", "position": 27731, "name": "SIP55_IUFEL01.08","offset2d": [30, -40], "labelReverse": [90, 1210, 150]},
+					{"type": "flsc", "position": 27999, "name": "MSCR_IUFEL01.08", "labelReverse": [90, 1300, 250]},
 					{"type": "LINE", "position": 27949, "name": "LINE_IUFEL"},
 					{"type": "BD", "position": 27949, "name": "BD_MBD_FEL01"},
 					{"type": "vlv", "position": 28530, "name": "VLV_MBD_FEL01.01"},
-					{"type": "cm", "position": 28935, "name": "CM_MBD_FEL01.01"},
+					{"type": "cm", "position": 28935, "name": "CM_MBD_FEL01.01", "labelReverse": [90, 1280, 170]},
 					{"type": "correctorfermi", "position": 29335, "ps": ["PSCH_MBD_FEL01.01","PSCV_MBD_FEL01.01"], "name": "CHV_MBD_FEL01.01"},
-					{"type": "sip", "position": 29700, "name": "SIP75_MBDFEL01.01","offset2d": [30, -40], "labelReverse": [90, 2200, 210]},
-					{"type": "flsc", "position": 30000, "name": "MBSCR_MBD_FEL01.01"},
-					{"type": "sip", "position": 30400, "name": "SIP75_MBDFEL01.02","offset2d": [30, -40], "labelReverse": [90, 2200, 210]},
+					{"type": "sip", "position": 29700, "name": "SIP75_MBDFEL01.01","offset2d": [30, -40], "labelReverse": [90, 1310, 150]},
+					{"type": "flsc", "position": 30000, "name": "MBSCR_MBD_FEL01.01", "labelReverse": [90, 1500, 250]},
+					{"type": "sip", "position": 30400, "name": "SIP75_MBDFEL01.02","offset2d": [30, -40], "labelReverse": [90, 1310, 150]},
 					{"type": "quadrupolefermi", "position": 30728, "name": "Q_MBD_FEL01.01"},
 					{"type": "vlv", "position": 31530, "name": "FVLV_MBD_FEL01.01"},
 					{"type": "quadrupolefermi", "position": 32348, "name": "Q_MBD_FEL01.02"},
 					{"type": "correctorfermi", "position": 32965, "ps": ["PSCH_MBD_FEL01.02","PSCV_MBD_FEL01.02"], "name": "CHV_MBD_FEL01.02"},
-					{"type": "sip", "position": 33411, "name": "SIP75_MBDFEL01.02","name2": "SIP75_MBDFEL01.03","offset2d": [30, -40], "labelReverse": [90, 2200, 210]},
+					{"type": "sip", "position": 33411, "name": "SIP75_MBDFEL01.02", "offset2d": [30, -40], "labelReverse": [90, 1310, 150], "embedded": ["SIP75_MBDFEL01.03"]},
 					{"type": "bpm", "position": 33761, "name": "BPM_MBD_FEL01.01"},
-					{"type": "flsc", "position": 35803, "name": "MSCR_MBD_FEL01.01"},
-					{"type": "sip", "position": 36886, "name": "SIP55_MBDFEL01.05","offset2d": [30, -40], "labelReverse": [90, 2200, 210]},
+					{"type": "flsc", "position": 35803, "name": "MSCR_MBD_FEL01.01", "labelReverse": [90, 1400, 250]},
+					{"type": "sip", "position": 36886, "name": "SIP55_MBDFEL01.05","offset2d": [30, -40], "labelReverse": [90, 1310, 150]},
 					{"type": "bpm", "position": 37886, "name": "BPM_MBD_FEL01.02"},
 					{"type": "correctorfermi", "position": 38466, "ps": ["PSCH_MBD_FEL01.03","PSCV_MBD_FEL01.03"], "name": "CHV_MBD_FEL01.03"},
 					{"type": "blm", "position": 38466, "name": "BLM_CHV_MBD_FEL01.03"},
 					{"type": "quadrupolefermi", "position": 39076, "name": "Q_MBD_FEL01.03"},
 					{"type": "blm", "position": 39076, "name": "BLM_Q_MBD_FEL01.03"},
-					{"type": "sip", "position": 39776, "name": "SIP55_MBDFEL01.06","offset2d": [30, -40], "labelReverse": [90, 2200, 210]},
+					{"type": "sip", "position": 39776, "name": "SIP55_MBDFEL01.06","offset2d": [30, -40], "labelReverse": [90, 1310, 150]},
 					{"type": "quadrupolefermi", "position": 40296, "name": "Q_MBD_FEL01.04"},
 					{"type": "blm", "position": 40296, "name": "BLM_Q_MBD_FEL01.04_L"},
 					{"type": "blm", "position": 40296, "name": "BLM_Q_MBD_FEL01.04_R"},
-					{"type": "sip", "position": 42396, "name": "SIP55_MBD_FEL01.06","offset2d": [30, -40], "labelReverse": [90, 2200, 210]},
-     				{"type": "sip", "position": 45000, "name": "SIP55_MBDFEL01.07","offset2d": [30, -40], "labelReverse": [90, 2200, 210]},
+					{"type": "sip", "position": 42396, "name": "SIP55_MBD_FEL01.06","offset2d": [30, -40], "labelReverse": [90, 1310, 150]},
+     				{"type": "sip", "position": 45000, "name": "SIP55_MBDFEL01.07","offset2d": [30, -40], "labelReverse": [90, 1310, 150]},
      				{"type": "plc", "position": 45296, "name": "SPIN-FE.01", "offset3d": [0, -300, 0], "offset2d": [0, -200]}
 				]
 			},
 			{
-				"start": {"x": 88866, "z": -7809},
+				"start": {"x": 88710, "z": -7809},
 				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI", "length": 1122, "name": "B_MBD_FEL01.01"},
 				"chamber": {"type": "chamber"},
 				"components": [
@@ -932,28 +947,28 @@
 					{"type": "blm", "position": 4662, "name": "BLM_BPM_MBD.01_DN"},
 					{"type": "blm", "position": 4662, "name": "BLM_BPM_MBD.01_UP"},
 					{"type": "correctorfermi", "position": 4922, "ps": ["PSCH_MBD.01","PSCV_MBD.01"], "name": "CHV_MBD.01"},
-					{"type": "quadrupolefermi", "position": 5246, "name": "Q_MBD.01"},
+					{"type": "sip", "position": 5246, "name": "SIP55_MBD.01","offset2d": [30, -40], "labelReverse": [90, 1050, 150]},
+ 					{"type": "quadrupolefermi", "position": 5546, "name": "Q_MBD.01"},
 					{"type": "blm", "position": 5246, "name": "BLM_Q_MBD.01_L"},
 					{"type": "blm", "position": 5246, "name": "BLM_Q_MBD.01_R"}
 				]
 			},
 			{
 				"start": {"x": 95500, "z": -5774},
-				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI/2", "length": 2437, "name": "B_MBD.01"},
+				"bending": {"type": "bending", "label": "show", "rotateY": "PI/2", "length": 2400, "name": "B_MBD.01", "labelReverse": [90, 950, 50]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "blm", "position": 100, "name": "BLM_B_MBD.01_L"},
 					{"type": "blm", "position": 100, "name": "BLM_B_MBD.01_R"},
-					{"type": "sip", "position": 500, "name": "SIP55_MBD.01","offset2d": [30, -40], "labelReverse": [90, 1650, 210]},
-     				{"type": "bpm", "position": 1543, "name": "RTBPM_MBD.02"},
+					{"type": "bpm", "position": 1543, "name": "RTBPM_MBD.02"},
 					{"type": "blm", "position": 1543, "name": "BLM_BPM_MBD.02_DN"},
 					{"type": "blm", "position": 1543, "name": "BLM_BPM_MBD.02_UP"},
 					{"type": "correctorfermi", "position": 1822, "ps": ["PSCH_MBD.02","PSCV_MBD.02"], "name": "CHV_MBD.02"},
-					{"type": "quadrupolefermi", "position": 2189, "name": "Q_MBD.02"},
-					{"type": "blm", "position": 2189, "name": "BLM_Q_MBD.02_L"},
-					{"type": "blm", "position": 2189, "name": "BLM_Q_MBD.02_R"},
-					{"type": "vlv", "position": 2600, "name": "VLV_MBD.01"},
-					{"type": "sip", "position": 2970, "name": "SIP150_MBD.01","offset2d": [30, -40], "labelReverse": [90, 1650, 210]},
+					{"type": "vlv", "position": 2229, "name": "VLV_MBD.01"},
+					{"type": "quadrupolefermi", "position": 2589, "name": "Q_MBD.02"},
+					{"type": "blm", "position": 2589, "name": "BLM_Q_MBD.02_L"},
+					{"type": "blm", "position": 2589, "name": "BLM_Q_MBD.02_R"},
+					{"type": "sip", "position": 2940, "name": "SIP150_MBD.01","offset2d": [30, -40], "labelReverse": [90, 1050, 150]},
      				{"type": "quadrupolefermi", "position": 3191, "name": "Q_MBD.03"},
 					{"type": "plc", "position": 3191, "name": "SPIN-UH.06", "offset3d": [0, -300, 0], "offset2d": [-200, 350], "labelReverse": true},
 					{"type": "blm", "position": 3191, "name": "BLM_Q_MBD.03_L"},
@@ -962,14 +977,15 @@
 					{"type": "correctorfermi", "position": 3793, "ps": ["PSCH_MBD.03","PSCV_MBD.03"], "name": "CHV_MBD.03"},
 					{"type": "blm", "position": 3793, "name": "BLM_CHV_MBD.03_L"},
 					{"type": "blm", "position": 3793, "name": "BLM_CHV_MBD.03_R"},
-					{"type": "sip", "position": 4245, "name": "SIP150_MBD.02","offset2d": [30, -40], "labelReverse": [90, 1650, 210]},
+					{"type": "sip", "position": 4245, "name": "SIP150_MBD.02","offset2d": [30, -40], "labelReverse": [90, 1050, 150]},
      				{"type": "cm", "position": 4445, "name": "CM_MBD.01"},
 					{"type": "SC", "position": 4591, "name": "SC_THZ_MBD.01"},
 					{"type": "blm", "position": 4591, "name": "BLM_SC_THZ_MBD.01_L"},
 					{"type": "blm", "position": 4591, "name": "BLM_SC_THZ_MBD.01_R"},
-					{"type": "flsc", "position": 5588, "name": "MSCR_MBD.01"},
-					{"type": "blm", "position": 5588, "name": "BLM_MSCR_MBD.01_L"},
-					{"type": "blm", "position": 5588, "name": "BLM_MSCR_MBD.01_R"},
+					{"type": "flsc", "position": 5388, "name": "MSCR_MBD.01"},
+					{"type": "blm", "position": 5388, "name": "BLM_MSCR_MBD.01_L"},
+					{"type": "blm", "position": 5388, "name": "BLM_MSCR_MBD.01_R"},
+					{"type": "ending", "position": 5788, "name": ""},
 					{"type": "D", "position": 6566, "name": "D_MBD.01"},
 					{"type": "BD", "position": 6067, "name": "BD_FEL01"},
 					{"type": "Perm", "position": 4292, "name": "Perm_Magn_F2"},
@@ -1002,216 +1018,208 @@
 			},
 			{
 				"start": {"x": 16179, "z": -6559},
-				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "-PI/2", "length": 250, "name": "B_SFEL02.01", "labelReverse": [90, 1600, 100]},
+				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "-PI/2", "length": 250, "name": "B_SFEL02.01", "labelReverse": [90, 1050, 50]},
 				"components": [
 					{"type": "blm", "position": 100, "name": "BLM_B_SFEL02.01", "labelReverse": true},
-					{"type": "quadrupolefermi", "position": 800, "name": "Q_SFEL02.01", "labelReverse": [90, -250, 250]},
+					{"type": "quadrupolefermi", "position": 800, "name": "Q_SFEL02.01", "labelReverse": [90, -350, 200]},
 					{"type": "blm", "position": 800, "name": "BLM_Q_SFEL02.01", "labelReverse": true},
-					{"type": "quadrupolefermi", "position": 1750, "name": "Q_SFEL02.02", "labelReverse": [90, -250, 250]},
+					{"type": "quadrupolefermi", "position": 1750, "name": "Q_SFEL02.02", "labelReverse": [90, -350, 200]},
 					{"type": "blm", "position": 1750, "name": "BLM_Q_SFEL02.02", "labelReverse": true},
-					{"type": "bpm", "position": 2019, "name": "RTBPM_SFEL02.01", "labelReverse": [90, -250, 250]},
+					{"type": "bpm", "position": 2219, "name": "RTBPM_SFEL02.01", "labelReverse": [90, -350, 150]},
 					{"type": "ECOL", "position": 2645, "name": "ECOL_SFEL02.01", "labelReverse": true},
-					{"type": "sip", "position": 2645, "name": "SIP300_SFEL02.01","name2": "SIP55_SFEL02.01","offset2d": [30, -40], "labelReverse": [90, -250, 250]},
-					{"type": "quadrupolefermi", "position": 3300, "name": "Q_SFEL02.03", "labelReverse": [90, -250, 250]},
+					{"type": "sip", "position": 2645, "name": "SIP300_SFEL02.01", "offset2d": [30, -40], "labelReverse": [90, -390, 150], "embedded": ["SIP55_SFEL02.01"]},
+					{"type": "quadrupolefermi", "position": 3300, "name": "Q_SFEL02.03", "labelReverse": [90, -350, 200]},
 					{"type": "blm", "position": 3300, "name": "BLM_Q_SFEL02.03", "labelReverse": true},
 					{"type": "flsc", "position": 3620, "name": "MSCR_SFEL02.01", "labelReverse": [90, -450, 250]},
-					{"type": "quadrupolefermi", "position": 4015, "name": "Q_SFEL02.04", "labelReverse": [90, -250, 250]},
-					{"type": "blm", "position": 4015, "name": "BLM_Q_SFEL02.04", "labelReverse": [90, 1550, 250]}
+					{"type": "quadrupolefermi", "position": 4015, "name": "Q_SFEL02.04", "labelReverse": [90, -350, 200]},
+					{"type": "blm", "position": 4015, "name": "BLM_Q_SFEL02.04", "labelReverse": [90, -250, 250]},
+					{"type": "sip", "position": 4285, "name": "SIP55_SFEL02.01", "offset2d": [30, -40], "labelReverse": [90, -390, 150], "embedded": ["SIP55_SFEL02.01"]}
+					
 				]
 			},
 			{
 				"start": {"x": 20972, "z": -6810},
-				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "-PI", "length": 250, "name": "B_SFEL02.02", "labelReverse": [90, -250, 0]},
+				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "-PI", "length": 250, "name": "B_SFEL02.02", "labelReverse": [90, -380, 0]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "blm", "position": 100, "name": "BLM_B_SFEL02.02", "labelReverse": [90, -250, 250]},
-					{"type": "bpm", "position": 350, "name": "RTBPM_SFEL02.02", "labelReverse": [90, -250, 250]},
-					{"type": "quadrupolefermi", "position": 800, "name": "Q_SFEL02.05", "labelReverse": [90, -250, 250]},
-					{"type": "blm", "position": 800, "name": "BLM_Q_SFEL02.05", "labelReverse": [90, -250, 250]},
-					{"type": "correctorfermi", "position": 1200, "ps": ["PSCH_SFEL02.01","PSCV_SFEL02.01"], "name": "CHV_SFEL02.01", "labelReverse": [90, -250, 250]},
-					{"type": "vlv", "position": 1480, "name": "VLV_SFEL02.01", "labelReverse": [90, -250, 200]},
-					{"type": "sip", "position": 1780, "name": "SIP55_SFEL02.02","offset2d": [30, -40], "labelReverse": [90, -310, 200]},
-					{"type": "quadrupolefermi", "position": 2150, "name": "Q_SFEL02.06", "labelReverse": [90, -250, 250]},
+					{"type": "bpm", "position": 450, "name": "RTBPM_SFEL02.02", "labelReverse": [90, -350, 150]},
+					{"type": "quadrupolefermi", "position": 800, "name": "Q_SFEL02.05", "labelReverse": [90, -350, 200]},
+					{"type": "blm", "position": 800, "name": "BLM_Q_SFEL02.05", "labelReverse": [90, -350, 200]},
+					{"type": "correctorfermi", "position": 1200, "ps": ["PSCH_SFEL02.01","PSCV_SFEL02.01"], "name": "CHV_SFEL02.01", "labelReverse": [90, -350, 200]},
+					{"type": "vlv", "position": 1580, "name": "VLV_SFEL02.01", "labelReverse": [90, -350, 150]},
+					{"type": "quadrupolefermi", "position": 2250, "name": "Q_SFEL02.06", "labelReverse": [90, -350, 200]},
 					{"type": "blm", "position": 2150, "name": "BLM_Q_SFEL02.06", "labelReverse": [90, -250, 250]},
-					{"type": "correctorfermi", "position": 2675, "ps": ["PSCH_SFEL02.02","PSCV_SFEL02.02"], "name": "CHV_SFEL02.02", "labelReverse": [90, -250, 250]},
-					{"type": "sip", "position": 3000, "name": "SIP55_SFEL02.03","offset2d": [30, -40], "labelReverse": [90, -310, 200]},
-					{"type": "quadrupolefermi", "position": 3300, "name": "Q_SFEL02.07", "labelReverse": [90, -250, 250]},
-					{"type": "blm", "position": 3300, "name": "BLM_Q_SFEL02.07", "labelReverse": [90, -250, 250]},
-					{"type": "correctorfermi", "position": 3650, "ps": ["PSCH_SFEL02.03","PSCV_SFEL02.03"], "name": "CHV_SFEL02.03", "labelReverse": [90, -250, 250]},
-					{"type": "quadrupolefermi", "position": 4050, "name": "Q_SFEL02.08", "labelReverse": [90, -250, 250]},
+					{"type": "correctorfermi", "position": 2675, "ps": ["PSCH_SFEL02.02","PSCV_SFEL02.02"], "name": "CHV_SFEL02.02", "labelReverse": [90, -350, 200]},
+					{"type": "sip", "position": 3000, "name": "SIP55_SFEL02.02","offset2d": [30, -40], "labelReverse": [90, -390, 200]},
+					{"type": "quadrupolefermi", "position": 3300, "name": "Q_SFEL02.07", "labelReverse": [90, -350, 200]},
+					{"type": "blm", "position": 3300, "name": "BLM_Q_SFEL02.07", "labelReverse": [90, -350, 200]},
+					{"type": "correctorfermi", "position": 3650, "ps": ["PSCH_SFEL02.03","PSCV_SFEL02.03"], "name": "CHV_SFEL02.03", "labelReverse": [90, -350, 200]},
+					{"type": "quadrupolefermi", "position": 4050, "name": "Q_SFEL02.08", "labelReverse": [90, -350, 200]},
 					{"type": "blm", "position": 4050, "name": "BLM_Q_SFEL02.08", "labelReverse": [90, -250, 250]},
-					{"type": "correctorfermi", "position": 4400, "ps": ["PSCH_SFEL02.04","PSCV_SFEL02.04"], "name": "CHV_SFEL02.04", "labelReverse": [90, -250, 250]},
-					{"type": "bpm", "position": 4629, "name": "CBPM_SFEL02.01", "labelReverse": [90, -250, 250]},
-					{"type": "cm", "position": 4935, "name": "CM_SFEL02.01", "labelReverse": [90, -250, 250]},
-					{"type": "sip", "position": 5250, "name": "SIP150_SFEL02.01","offset2d": [30, -40], "labelReverse": [90, -290, 200]},
-					{"type": "BAM", "position": 5300, "name": "BAM_SFEL02.01", "labelReverse": [90, -250, 250]},
-					{"type": "bpm", "position": 5500, "name": "CBPM_SFEL02.02", "labelReverse": [90, -250, 250]},
-					{"type": "flsc", "position": 5921, "name": "MSCR_SFEL02.02", "labelReverse": [90, -550, 250]},
+					{"type": "correctorfermi", "position": 4400, "ps": ["PSCH_SFEL02.04","PSCV_SFEL02.04"], "name": "CHV_SFEL02.04", "labelReverse": [90, -350, 200]},
+					{"type": "bpm", "position": 4909, "name": "CBPM_SFEL02.01", "labelReverse": [90, -350, 150]},
+					{"type": "cm", "position": 5135, "name": "CM_SFEL02.01", "labelReverse": [90, -350, 200]},
+					{"type": "sip", "position": 5350, "name": "SIP55_SFEL02.03","offset2d": [30, -40], "labelReverse": [90, -390, 150]},
+					{"type": "BAM", "position": 5400, "name": "BAM_SFEL02.01", "labelReverse": [90, -350, 200]},
+					{"type": "bpm", "position": 5700, "name": "CBPM_SFEL02.02", "labelReverse": [90, -350, 150]},
+					{"type": "flsc", "position": 5921, "name": "MSCR_SFEL02.02", "labelReverse": [90, -350, 250]},
 					{"type": "blm", "position": 5921, "name": "BLM_MSCR_SFEL02.02", "labelReverse": [90, -250, 250]},
 					{"type": "EOS", "position": 6935, "name": "EOS_SFEL02.01", "labelReverse": [90, -250, 250]},
-					{"type": "vlv", "position": 8000, "name": "VLV_SFEL02.02", "labelReverse": [90, -250, 250]},
-					{"type": "bpm", "position": 8404, "name": "CBPM_SFEL02.03", "labelReverse": [90, -250, 250]},
+					{"type": "sip", "position": 7700, "name": "SIP150_SFEL02.01","offset2d": [30, -40], "labelReverse": [90, -390, 150]},
+					{"type": "vlv", "position": 8000, "name": "VLV_SFEL02.02", "labelReverse": [90, -350, 150]},
+					{"type": "bpm", "position": 8404, "name": "CBPM_SFEL02.03", "labelReverse": [90, -350, 150]},
 					{"type": "SFEL02", "position": 8675, "name": "SFEL02", "labelReverse": [90, -250, 250]},
 					{"type": "UND", "position": 8675, "name": "UND_F02", "labelReverse": [90, -250, 250]},
-					{"type": "undulator", "position": 10285, "name": "ID_FEL02.01  (MOD02.01)", "labelReverse": [90, -250, 250]},
-					{"type": "W", "position": 12443, "name": "W_FEL02.01", "labelReverse": [90, -250, 250]},
-					{"type": "sip", "position": 11808, "name": "SIP55_FEL02.01","name2": "SIP55_FEL02.02","offset2d": [30, -40], "labelReverse": [90, -290, 200]},
-					{"type": "bpm", "position": 12068, "name": "CBPM_FEL02.01", "labelReverse": [90, -250, 250]},
-					{"type": "quadrupolefermi", "position": 12579, "name": "Q_FEL02.01", "labelReverse": [90, -250, 250]},
-					{"type": "sip", "position": 12979, "name": "SIP55_FEL02.01","offset2d": [30, -40], "labelReverse": [90, -290, 200]},
-					{"type": "correctorfermi", "position": 13200, "ps": ["PSCH_FEL02.01","PSCV_FEL02.01"], "name": "CHV_FEL02.01", "labelReverse": [90, -250, 250]},
-					{"type": "flsc", "position": 13556, "name": "MSCR_FEL02.01", "labelReverse": [90, -450, 250]},
-					{"type": "undulator", "position": 15103, "name": "ID_FEL02.02  (RAD02.01)", "labelReverse": [90, -250, 250]},
-					{"type": "PHSH", "position": 16454, "name": "PHSH_IUFEL02.01", "labelReverse": [90, -250, 250]},
-					{"type": "bpm", "position": 16708, "name": "CBPM_IUFEL02.01", "labelReverse": [90, -250, 250]},
-					{"type": "quadrupolefermi", "position": 17219, "name": "Q_IUFEL02.01", "labelReverse": [90, -250, 250]},
-					{"type": "sip", "position": 17559, "name": "SIP55_IUFEL02.01","offset2d": [30, -40], "labelReverse": [90, -290, 200]},
-					{"type": "correctorfermi", "position": 17788, "ps": ["PSCH_IUFEL02.01","PSCV_IUFEL02.01"], "name": "CHV_IUFEL02.01", "labelReverse": [90, -250, 250]},
-					{"type": "flsc", "position": 18096, "name": "MSCR_IUFEL02.01", "labelReverse": [90, -450, 250]},
-					{"type": "undulator", "position": 18818, "name": "ID_FEL02.03  (RAD02.02)", "labelReverse": [90, -250, 250]},
-					{"type": "PHSH", "position": 20169, "name": "PHSH_IUFEL02.02", "labelReverse": [90, -250, 250]},
-					{"type": "bpm", "position": 20423, "name": "CBPM_IUFEL02.02", "labelReverse": [90, -250, 250]},
-					{"type": "quadrupolefermi", "position": 20834, "name": "Q_IUFEL02.02", "labelReverse": [90, -250, 250]},
-					{"type": "sip", "position": 21193, "name": "SIP55_IUFEL02.02","offset2d": [30, -40], "labelReverse": [90, -290, 200]},
-					{"type": "correctorfermi", "position": 21393, "ps": ["PSCH_IUFEL02.02","PSCV_IUFEL02.02"], "name": "CHV_IUFEL02.02", "labelReverse": [90, -250, 250]},
-					{"type": "flsc", "position": 21711, "name": "MSCR_IUFEL02.02", "labelReverse": [90, -450, 250]},
-					{"type": "undulator", "position": 22533, "name": "ID_FEL02.04  (RAD02.03)", "labelReverse": [90, -250, 250]},
-					{"type": "bpm", "position": 23951, "name": "CBPM_FEL02.02", "labelReverse": [90, -250, 250]},
-					{"type": "quadrupolefermi", "position": 24161, "name": "Q_FEL02.02", "labelReverse": [90, -250, 250]},
-					{"type": "correctorfermi", "position": 24421, "ps": ["PSCH_FEL02.02","PSCV_FEL02.02"], "name": "CHV_FEL02.02", "labelReverse": [90, -250, 250]}
+					{"type": "undulator", "position": 10285, "name": "ID_FEL02.01  (MOD02.01)", "labelReverse": [90, -650, 450]},
+					{"type": "W", "position": 11443, "name": "W_FEL02.01", "labelReverse": [90, -320, 250]},
+					{"type": "bpm", "position": 12008, "name": "CBPM_FEL02.01", "labelReverse": [90, -350, 150]},
+					{"type": "quadrupolefermi", "position": 12379, "name": "Q_FEL02.01", "labelReverse": [90, -350, 200]},
+					{"type": "correctorfermi", "position": 12879, "ps": ["PSCH_FEL02.01","PSCV_FEL02.01"], "name": "CHV_FEL02.01", "labelReverse": [90, -350, 200]},
+					{"type": "sip", "position": 13350, "name": "SIP55_FEL02.02","offset2d": [30, -40], "labelReverse": [90, -390, 150]},
+					{"type": "undulator", "position": 15103, "name": "ID_FEL02.02  (RAD02.01)", "labelReverse": [90, -650, 450]},
+					{"type": "PHSH", "position": 16254, "name": "PHSH_IUFEL02.01", "labelReverse": [90, -350, 120]},
+					{"type": "bpm", "position": 16608, "name": "CBPM_IUFEL02.01", "labelReverse": [90, -350, 150]},
+					{"type": "quadrupolefermi", "position": 17019, "name": "Q_IUFEL02.01", "labelReverse": [90, -350, 200]},
+					{"type": "correctorfermi", "position": 17459, "ps": ["PSCH_IUFEL02.01","PSCV_IUFEL02.01"], "name": "CHV_IUFEL02.01", "labelReverse": [90, -350, 200]},
+					{"type": "sip", "position": 17780, "name": "SIP55_IUFEL02.01","offset2d": [30, -40], "labelReverse": [90, -390, 150]},
+					{"type": "undulator", "position": 18818, "name": "ID_FEL02.03  (RAD02.02)", "labelReverse": [90, -650, 450]},
+					{"type": "PHSH", "position": 19969, "name": "PHSH_IUFEL02.02", "labelReverse": [90, -350, 120]},
+					{"type": "bpm", "position": 20423, "name": "CBPM_IUFEL02.02", "labelReverse": [90, -350, 150]},
+					{"type": "quadrupolefermi", "position": 20834, "name": "Q_IUFEL02.02", "labelReverse": [90, -350, 200]},
+					{"type": "correctorfermi", "position": 21150, "ps": ["PSCH_IUFEL02.02","PSCV_IUFEL02.02"], "name": "CHV_IUFEL02.02", "labelReverse": [90, -350, 200]},
+					{"type": "sip", "position": 21453, "name": "SIP55_IUFEL02.02","offset2d": [30, -40], "labelReverse": [90, -350, 200]},
+					{"type": "flsc", "position": 21711, "name": "MSCR_IUFEL02.02", "labelReverse": [90, -350, 250]},
+					{"type": "undulator", "position": 22533, "name": "ID_FEL02.04  (RAD02.03)", "labelReverse": [90, -650, 450]},
+					{"type": "bpm", "position": 23851, "name": "CBPM_FEL02.02", "labelReverse": [90, -350, 150]},
+					{"type": "quadrupolefermi", "position": 24061, "name": "Q_FEL02.02", "labelReverse": [90, -350, 200]},
+					{"type": "correctorfermi", "position": 24321, "ps": ["PSCH_FEL02.02","PSCV_FEL02.02"], "name": "CHV_FEL02.02", "labelReverse": [90, -350, 200]}
 				]
 			},
 			{
 				"start": {"x": 45868, "z": -6811},
-				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "-PI/2", "length": 320, "name": "B_FEL02.01", "labelReverse": [90, -250, 0]},
+				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "-PI/2", "length": 320, "name": "B_FEL02.01", "labelReverse": [90, -350, 0]},
 				"chamber": {"type": "chamber"},
 				"components": [
 				]
 			},
 			{
 				"start": {"x": 46328, "z": -6811},
-				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI", "length": 320, "name": "B_FEL02.02", "labelReverse": [90, -250, 0]},
+				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI", "length": 320, "name": "B_FEL02.02", "labelReverse": [90, -350, 0]},
 				"chamber": {"type": "chamber"},
 				"components": [
+				{"type": "flsc", "position": 250, "name": "EEHG_FEL2.0", "labelReverse": [90, -350, 250]}
+						
 				]
 			},
 			{
-				"start": {"x": 46788, "z": -6811},
-				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI", "length": 320, "name": "B_FEL02.03", "labelReverse": [90, -250, 0]},
+				"start": {"x": 47188, "z": -6811},
+				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI", "length": 320, "name": "B_FEL02.03", "labelReverse": [90, -350, 0]},
 				"chamber": {"type": "chamber"},
 				"components": [
 				]
 			},
 			{
-				"start": {"x": 47248, "z": -6811},
-				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI", "length": 320, "name": "B_FEL02.04", "labelReverse": [90, -250, 0]},
+				"start": {"x": 47648, "z": -6811},
+				"bending": {"type": "dipolefermi", "label": "show", "rotateY": "PI", "length": 320, "name": "B_FEL02.04", "labelReverse": [90, -350, 0]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "bpm", "position": 356, "name": "CBPM_FEL02.03", "labelReverse": true},
-					{"type": "quadrupolefermi", "position": 766, "name": "Q_FEL02.03", "labelReverse": true},
-					{"type": "sip", "position": 1066, "name": "SIP55_FEL02.03","name2": "SIP55_FEL02.04","offset2d": [30, -40], "labelReverse": [90, -290, 200]},
-					{"type": "correctorfermi", "position": 1366, "ps": ["PSCH_FEL02.03","PSCV_FEL02.03"], "name": "CHV_FEL02.03", "labelReverse": true},
-					{"type": "flsc", "position": 1643, "name": "MSCR_FEL02.02", "labelReverse": [90, -450, 250]},
-					{"type": "undulator", "position": 2472, "name": "ID_FEL02.05  (MOD02.02)", "labelReverse": true},
-					{"type": "W", "position": 4248, "name": "W_FEL02.02", "labelReverse": true},
-					{"type": "vlv", "position": 4400, "name": "VLV_FEL02.01", "labelReverse": true},
-					{"type": "sip", "position": 4600, "name": "SIP55_FEL02.05","offset2d": [30, -40], "labelReverse": [90, -290, 200]},
-					{"type": "bpm", "position": 4873, "name": "CBPM_FEL02.04", "labelReverse": true},
-					{"type": "quadrupolefermi", "position": 5184, "name": "Q_FEL02.04", "labelReverse": true},
-					{"type": "sip", "position": 5504, "name": "SIP55_FEL02.06","offset2d": [30, -40], "labelReverse": [90, -290, 200]},
-					{"type": "correctorfermi", "position": 5793, "ps": ["PSCH_FEL02.04","PSCV_FEL02.04"], "name": "CHV_FEL02.04", "labelReverse": true},
-					{"type": "flsc", "position": 6061, "name": "MSCR_FEL02.03", "labelReverse": [90, -450, 250]},
-					{"type": "undulator", "position": 6886, "name": "ID_FEL02.06  (RAD02.04)", "labelReverse": true},
-					{"type": "PHSH", "position": 8251, "name": "PHSH_IUFEL02.03", "labelReverse": true},
-					{"type": "bpm", "position": 8492, "name": "CBPM_IUFEL02.03", "labelReverse": true},
-					{"type": "quadrupolefermi", "position": 8802, "name": "Q_IUFEL02.03", "labelReverse": true},
-					{"type": "sip", "position": 9162, "name": "SIP55_IUFEL02.03","offset2d": [30, -40], "labelReverse": [90, -290, 200]},
-					{"type": "correctorfermi", "position": 9462, "ps": ["PSCH_IUFEL02.03","PSCV_IUFEL02.03"], "name": "CHV_IUFEL02.03", "labelReverse": true},
-					{"type": "flsc", "position": 9780, "name": "MSCR_IUFEL02.03", "labelReverse": [90, -450, 250]},
-					{"type": "undulator", "position": 10602, "name": "ID_FEL02.07  (RAD02.05)", "labelReverse": true},
+					{"type": "bpm", "position": 556, "name": "CBPM_FEL02.03", "labelReverse": [90, -350, 150]},
+					{"type": "quadrupolefermi", "position": 766, "name": "Q_FEL02.03", "labelReverse": [90, -350, 200]},
+					{"type": "correctorfermi", "position": 1066, "ps": ["PSCH_FEL02.03","PSCV_FEL02.03"], "name": "CHV_FEL02.03", "labelReverse": [90, -350, 200]},
+					{"type": "sip", "position": 1400, "name": "SIP55_FEL02.04", "offset2d": [30, -40], "labelReverse": [90, -390, 150], "embedded": ["SIP55_FEL02.04"]},
+					{"type": "flsc", "position": 1643, "name": "MSCR_FEL02.02", "labelReverse": [90, -350, 250]},
+					{"type": "undulator", "position": 2472, "name": "ID_FEL02.05  (MOD02.02)",  "labelReverse": [90, -650, 450]},
+					{"type": "vlv", "position": 3748, "name": "VLV_FEL02.01", "labelReverse": [90, -350, 150]},
+					{"type": "W", "position": 4200, "name": "W_FEL02.02", "labelReverse": [90, -350, 250]},
+					{"type": "bpm", "position": 4873, "name": "CBPM_FEL02.04", "labelReverse": [90, -350, 150]},
+					{"type": "quadrupolefermi", "position": 5184, "name": "Q_FEL02.04", "labelReverse": [90, -350, 200]},
+					{"type": "correctorfermi", "position": 5504, "ps": ["PSCH_FEL02.04","PSCV_FEL02.04"], "name": "CHV_FEL02.04", "labelReverse": [90, -350, 200]},
+					{"type": "sip", "position": 5854, "name": "SIP55_FEL02.06","offset2d": [30, -40], "labelReverse": [90, -390, 150]},
+					{"type": "flsc", "position": 6061, "name": "MSCR_FEL02.03", "labelReverse": [90, -350, 250]},
+					{"type": "undulator", "position": 6886, "name": "ID_FEL02.06  (RAD02.04)", "labelReverse": [90, -650, 450]},
+					{"type": "PHSH", "position": 8051, "name": "PHSH_IUFEL02.03", "labelReverse": [90, -350, 120]},
+					{"type": "bpm", "position": 8492, "name": "CBPM_IUFEL02.03", "labelReverse": [90, -350, 150]},
+					{"type": "quadrupolefermi", "position": 8802, "name": "Q_IUFEL02.03", "labelReverse": [90, -350, 200]},
+					{"type": "correctorfermi", "position": 9162, "ps": ["PSCH_IUFEL02.03","PSCV_IUFEL02.03"], "name": "CHV_IUFEL02.03", "labelReverse": [90, -350, 200]},
+					{"type": "sip", "position": 9500, "name": "SIP55_IUFEL02.03","offset2d": [30, -40], "labelReverse": [90, -390, 150]},
+					{"type": "flsc", "position": 9780, "name": "MSCR_IUFEL02.03", "labelReverse": [90, -350, 250]},
+					{"type": "undulator", "position": 10602, "name": "ID_FEL02.07  (RAD02.05)", "labelReverse": [90, -650, 450]},
 					{"type": "blm", "position": 10602, "name": "BLM_ID_FEL02.07", "labelReverse": true},
-					{"type": "PHSH", "position": 11966, "name": "PHSH_IUFEL02.04", "labelReverse": true},
-					{"type": "bpm", "position": 12207, "name": "CBPM_IUFEL02.04", "labelReverse": true},
-					{"type": "quadrupolefermi", "position": 12618, "name": "Q_IUFEL02.04", "labelReverse": true},
-					{"type": "sip", "position": 12977, "name": "SIP55_IUFEL02.04","offset2d": [30, -40], "labelReverse": [90, -290, 200]},
-					{"type": "correctorfermi", "position": 13277, "ps": ["PSCH_IUFEL02.04","PSCV_IUFEL02.04"], "name": "CHV_IUFEL02.04", "labelReverse": true},
-					{"type": "flsc", "position": 13596, "name": "MSCR_IUFEL02.04", "labelReverse": [90, -450, 250]},
-					{"type": "undulator", "position": 14317, "name": "ID_FEL02.08  (RAD02.06)", "labelReverse": true},
-					{"type": "PHSH", "position": 15681, "name": "PHSH_IUFEL02.05", "labelReverse": true},
-					{"type": "bpm", "position": 15922, "name": "CBPM_IUFEL02.05", "labelReverse": true},
-					{"type": "quadrupolefermi", "position": 16333, "name": "Q_IUFEL02.05", "labelReverse": true},
-					{"type": "sip", "position": 16633, "name": "SIP55_IUFEL02.05","offset2d": [30, -40], "labelReverse": [90, -290, 200]},
-					{"type": "correctorfermi", "position": 16942, "ps": ["PSCH_IUFEL02.05","PSCV_IUFEL02.05"], "name": "CHV_IUFEL02.05", "labelReverse": true},
-					{"type": "flsc", "position": 17211, "name": "MSCR_IUFEL02.05", "labelReverse": [90, -450, 250]},
-					{"type": "undulator", "position": 18032, "name": "ID_FEL02.09  (RAD02.07)", "labelReverse": true},
-					{"type": "PHSH", "position": 19396, "name": "PHSH_IUFEL02.06", "labelReverse": true},
-					{"type": "bpm", "position": 19637, "name": "CBPM_IUFEL02.06", "labelReverse": true},
-					{"type": "quadrupolefermi", "position": 19948, "name": "Q_IUFEL02.06", "labelReverse": true},
-					{"type": "correctorfermi", "position": 20259, "ps": ["PSCH_IUFEL02.06","PSCV_IUFEL02.06"], "name": "CHV_IUFEL02.06", "labelReverse": true},
-					{"type": "vlv", "position": 20550, "name": "VLV_IUFEL02.01", "labelReverse": true},
-					{"type": "sip", "position": 20730, "name": "SIP55_IUFEL02.06","offset2d": [30, -40], "labelReverse": [90, -290, 200]},
-					{"type": "flsc", "position": 20926, "name": "MSCR_IUFEL02.06", "labelReverse": [90, -450, 250]},
-					{"type": "undulator", "position": 21747, "name": "ID_FEL02.10  (RAD02.08)", "labelReverse": true},
-					{"type": "PHSH", "position": 23111, "name": "PHSH_IUFEL02.07", "labelReverse": true},
-					{"type": "bpm", "position": 23352, "name": "CBPM_IUFEL02.07", "labelReverse": true},
-					{"type": "quadrupolefermi", "position": 23763, "name": "Q_IUFEL02.07", "labelReverse": true},
-					{"type": "sip", "position": 24092, "name": "SIP55_IUFEL02.07","offset2d": [30, -40], "labelReverse": [90, -290, 200]},
-					{"type": "correctorfermi", "position": 24392, "ps": ["PSCH_IUFEL02.07","PSCV_IUFEL02.07"], "name": "CHV_IUFEL02.07", "labelReverse": true},
-					{"type": "flsc", "position": 24641, "name": "MSCR_IUFEL02.07", "labelReverse": [90, -450, 250]},
-					{"type": "undulator", "position": 25462, "name": "ID_FEL02.11  (RAD02.09)", "labelReverse": true},
+					{"type": "PHSH", "position": 11766, "name": "PHSH_IUFEL02.04", "labelReverse": [90, -350, 120]},
+					{"type": "bpm", "position": 12207, "name": "CBPM_IUFEL02.04", "labelReverse": [90, -350, 150]},
+					{"type": "quadrupolefermi", "position": 12618, "name": "Q_IUFEL02.04", "labelReverse": [90, -350, 200]},
+					{"type": "correctorfermi", "position": 12977, "ps": ["PSCH_IUFEL02.04","PSCV_IUFEL02.04"], "name": "CHV_IUFEL02.04", "labelReverse": [90, -350, 200]},
+					{"type": "sip", "position": 13290, "name": "SIP55_IUFEL02.04","offset2d": [30, -40], "labelReverse": [90, -390, 150]},
+					{"type": "undulator", "position": 14317, "name": "ID_FEL02.08  (RAD02.06)", "labelReverse": [90, -650, 450]},
+					{"type": "PHSH", "position": 15481, "name": "PHSH_IUFEL02.05", "labelReverse": [90, -350, 120]},
+					{"type": "bpm", "position": 15922, "name": "CBPM_IUFEL02.05", "labelReverse": [90, -350, 150]},
+					{"type": "quadrupolefermi", "position": 16233, "name": "Q_IUFEL02.05", "labelReverse": [90, -350, 200]},
+					{"type": "correctorfermi", "position": 16633, "ps": ["PSCH_IUFEL02.05","PSCV_IUFEL02.05"], "name": "CHV_IUFEL02.05", "labelReverse": [90, -350, 200]},
+					{"type": "sip", "position": 17000, "name": "SIP55_IUFEL02.05","offset2d": [30, -40], "labelReverse": [90, -390, 150]},
+					{"type": "flsc", "position": 17211, "name": "MSCR_IUFEL02.05", "labelReverse": [90, -350, 250]},
+					{"type": "undulator", "position": 18032, "name": "ID_FEL02.09  (RAD02.07)", "labelReverse": [90, -650, 450]},
+					{"type": "PHSH", "position": 19196, "name": "PHSH_IUFEL02.06", "labelReverse": [90, -350, 120]},
+					{"type": "bpm", "position": 19537, "name": "CBPM_IUFEL02.06", "labelReverse": [90, -350, 150]},
+					{"type": "quadrupolefermi", "position": 19848, "name": "Q_IUFEL02.06", "labelReverse": [90, -350, 200]},
+					{"type": "correctorfermi", "position": 20159, "ps": ["PSCH_IUFEL02.06","PSCV_IUFEL02.06"], "name": "CHV_IUFEL02.06", "labelReverse": [90, -350, 200]},
+					{"type": "vlv", "position": 20490, "name": "VLV_IUFEL02.01", "labelReverse": [90, -350, 150]},
+					{"type": "sip", "position": 20730, "name": "SIP55_IUFEL02.06","offset2d": [30, -40], "labelReverse": [90, -390, 150]},
+					{"type": "undulator", "position": 21747, "name": "ID_FEL02.10  (RAD02.08)", "labelReverse": [90, -650, 450]},
+					{"type": "PHSH", "position": 22911, "name": "PHSH_IUFEL02.07", "labelReverse": [90, -350, 120]},
+					{"type": "bpm", "position": 23352, "name": "CBPM_IUFEL02.07", "labelReverse": [90, -350, 150]},
+					{"type": "quadrupolefermi", "position": 23763, "name": "Q_IUFEL02.07", "labelReverse": [90, -350, 200]},
+					{"type": "correctorfermi", "position": 24092, "ps": ["PSCH_IUFEL02.07","PSCV_IUFEL02.07"], "name": "CHV_IUFEL02.07", "labelReverse": [90, -350, 200]},
+					{"type": "sip", "position": 24452, "name": "SIP55_IUFEL02.07","offset2d": [30, -40], "labelReverse": [90, -390, 150]},
+					{"type": "flsc", "position": 24641, "name": "MSCR_IUFEL02.07", "labelReverse": [90, -350, 250]},
+					{"type": "undulator", "position": 25462, "name": "ID_FEL02.11  (RAD02.09)", "labelReverse": [90, -650, 450]},
 					{"type": "blm", "position": 25462, "name": "BLM_ID_FEL02.11", "labelReverse": true},
-					{"type": "PHSH", "position": 26829, "name": "PHSH_IUFEL02.08", "labelReverse": true},
-					{"type": "bpm", "position": 27067, "name": "CBPM_IUFEL02.08", "labelReverse": true},
-					{"type": "quadrupolefermi", "position": 27478, "name": "Q_IUFEL02.08", "labelReverse": true},
-					{"type": "sip", "position": 27778, "name": "SIP55_IUFEL02.08","offset2d": [30, -40], "labelReverse": [90, -290, 200]},
-					{"type": "correctorfermi", "position": 28137, "ps": ["PSCH_IUFEL02.08","PSCV_IUFEL02.08"], "name": "CHV_IUFEL02.08", "labelReverse": true},
-					{"type": "flsc", "position": 28356, "name": "MSCR_IUFEL02.08", "labelReverse": [90, -450, 250]},
-					{"type": "undulator", "position": 29177, "name": "ID_FEL02.12  (RAD02.10)", "labelReverse": true},
-					{"type": "PHSH", "position": 30491, "name": "PHSH_IUFEL02.09", "labelReverse": true},
-					{"type": "bpm", "position": 30681, "name": "RTBPM_IUFEL02.01", "labelReverse": true},
-					{"type": "quadrupolefermi", "position": 31093, "name": "Q_IUFEL02.09", "labelReverse": true},
-					{"type": "sip", "position": 31493, "name": "SIP55_IUFEL02.09","offset2d": [30, -40], "labelReverse": [90, -290, 200]},
-					{"type": "correctorfermi", "position": 31763, "ps": ["PSCH_IUFEL02.09","PSCV_IUFEL02.09"], "name": "CHV_IUFEL02.09", "labelReverse": true},
-					{"type": "flsc", "position": 32024, "name": "MSCR_IUFEL02.09", "labelReverse": [90, -450, 250]},
-					{"type": "undulator", "position": 32931, "name": "ID_FEL02.13  (RAD02.11)", "labelReverse": true},
-					{"type": "bpm", "position": 34507, "name": "CBPM_IUFEL02.10", "labelReverse": true},
-					{"type": "quadrupolefermi", "position": 34908, "name": "Q_IUFEL02.10", "labelReverse": true},
-					{"type": "correctorfermi", "position": 35300, "ps": ["PSCH_IUFEL02.10","PSCV_IUFEL02.10"], "name": "CHV_IUFEL02.10", "labelReverse": true},
+					{"type": "bpm", "position": 27067, "name": "CBPM_IUFEL02.08", "labelReverse": [90, -350, 150]},
+					{"type": "quadrupolefermi", "position": 27478, "name": "Q_IUFEL02.08", "labelReverse": [90, -350, 200]},
+					{"type": "correctorfermi", "position": 27778, "ps": ["PSCH_IUFEL02.08","PSCV_IUFEL02.08"], "name": "CHV_IUFEL02.08", "labelReverse": [90, -350, 200]},
+					{"type": "sip", "position": 28150, "name": "SIP55_IUFEL02.08","offset2d": [30, -40], "labelReverse": [90, -390, 150]},
+					{"type": "flsc", "position": 28356, "name": "MSCR_IUFEL02.08", "labelReverse": [90, -350, 250]},
+					{"type": "bpm", "position": 30681, "name": "RTBPM_IUFEL02.01", "labelReverse": [90, -350, 150]},
+					{"type": "quadrupolefermi", "position": 31093, "name": "Q_IUFEL02.09", "labelReverse": [90, -350, 200]},
+					{"type": "correctorfermi", "position": 31493, "ps": ["PSCH_IUFEL02.09","PSCV_IUFEL02.09"], "name": "CHV_IUFEL02.09", "labelReverse": [90, -350, 200]},
+					{"type": "sip", "position": 31903, "name": "SIP55_IUFEL02.09","offset2d": [30, -40], "labelReverse": [90, -390, 150]},
+					{"type": "quadrupolefermi", "position": 34908, "name": "Q_IUFEL02.10", "labelReverse": [90, -350, 200]},
+					{"type": "correctorfermi", "position": 35300, "ps": ["PSCH_IUFEL02.10","PSCV_IUFEL02.10"], "name": "CHV_IUFEL02.10", "labelReverse": [90, -350, 200]},
 					{"type": "blm", "position": 35400, "name": "BLM_CHV_IUFEL02.10", "labelReverse": true},
 					{"type": "FEL02", "position": 35579, "name": "FEL02", "labelReverse": true},
 					{"type": "MBD", "position": 35579, "name": "MBD_FEL02", "labelReverse": true},
 					{"type": "cm", "position": 35629, "name": "CM_MBD_FEL02.01", "labelReverse": true},
-					{"type": "vlv", "position": 35900, "name": "VLV_MBD_FEL02.01", "labelReverse": true},
-					{"type": "sip", "position": 36150, "name": "SIP55_MBDFEL02.01","offset2d": [30, -40], "labelReverse": [90, -290, 200]},
-					{"type": "quadrupolefermi", "position": 36459, "name": "Q_MBD_FEL02.01", "labelReverse": true},
+					{"type": "vlv", "position": 35900, "name": "VLV_MBD_FEL02.01", "labelReverse": [90, -350, 150]},
+					{"type": "quadrupolefermi", "position": 36209, "name": "Q_MBD_FEL02.01", "labelReverse": [90, -350, 200]},
+					{"type": "sip", "position": 36519, "name": "SIP55_MBDFEL02.01","offset2d": [30, -40], "labelReverse": [90, -390, 150]},
 					{"type": "blm", "position": 36259, "name": "BLM_Q_MBD_FEL02.01", "labelReverse": true},
-					{"type": "vlv", "position": 36850, "name": "FVLV_MBD_FEL02.01", "labelReverse": true},
-					{"type": "quadrupolefermi", "position": 37244, "name": "Q_MBD_FEL02.02", "labelReverse": true},
+					{"type": "vlv", "position": 36850, "name": "FVLV_MBD_FEL02.01", "labelReverse": [90, -350, 150]},
+					{"type": "quadrupolefermi", "position": 37244, "name": "Q_MBD_FEL02.02", "labelReverse": [90, -350, 200]},
 					{"type": "blm", "position": 37244, "name": "BLM_Q_MBD_FEL02.02", "labelReverse": true},
 					{"type": "FBMSCR", "position": 37348, "name": "FBMSCR_FEL02.01", "labelReverse": true},
-					{"type": "correctorfermi", "position": 37658, "ps": ["PSCH_MBD_FEL02.01","PSCV_MBD_FEL02.01"], "name": "CHV_MBD_FEL02.01", "labelReverse": true},
-					{"type": "sip", "position": 37958, "name": "SIP55_MBDFEL02.02","name2": "SIP55_MBDFEL02.03","offset2d": [30, -40], "labelReverse": [90, -290, 200]},
-					{"type": "bpm", "position": 38303, "name": "RTBPM_MBD_FEL02.01", "labelReverse": true},
-					{"type": "flsc", "position": 40033, "name": "MBSCR_MBD_FEL02.01", "labelReverse": [90, -450, 250]},
-					{"type": "flsc", "position": 40633, "name": "MSCR_MBD_FEL02.01", "labelReverse": [90, -450, 250]},
-					{"type": "bpm", "position": 42039, "name": "RTBPM_MBD_FEL02.02", "labelReverse": true},
-					{"type": "correctorfermi", "position": 42808, "ps": ["PSCH_MBD_FEL02.02","PSCV_MBD_FEL02.02"], "name": "CHV_MBD_FEL02.02", "labelReverse": true},
+					{"type": "correctorfermi", "position": 37658, "ps": ["PSCH_MBD_FEL02.01","PSCV_MBD_FEL02.01"], "name": "CHV_MBD_FEL02.01", "labelReverse": [90, -350, 200]},
+					{"type": "sip", "position": 37958, "name": "SIP55_MBDFEL02.02", "offset2d": [30, -40], "labelReverse": [90, -390, 150], "embedded": ["SIP55_MBDFEL02.03"]},
+					{"type": "bpm", "position": 38303, "name": "RTBPM_MBD_FEL02.01", "labelReverse": [90, -350, 150]},
+					{"type": "flsc", "position": 40633, "name": "MSCR_MBD_FEL02.01", "labelReverse": [90, -350, 250]},
+					{"type": "sip", "position": 40939, "name": "SIP55_MBDFEL02.03", "offset2d": [30, -40], "labelReverse": [90, -390, 150], "embedded": ["SIP55_MBDFEL02.03"]},
+					{"type": "bpm", "position": 42039, "name": "RTBPM_MBD_FEL02.02", "labelReverse": [90, -350, 150]},
+					{"type": "correctorfermi", "position": 42808, "ps": ["PSCH_MBD_FEL02.02","PSCV_MBD_FEL02.02"], "name": "CHV_MBD_FEL02.02", "labelReverse": [90, -350, 200]},
 					{"type": "blm", "position": 42808, "name": "BLM_CHV_MBD_FEL02.02", "labelReverse": true},
-					{"type": "quadrupolefermi", "position": 43108, "name": "Q_MBD_FEL02.03", "labelReverse": true},
+					{"type": "quadrupolefermi", "position": 43108, "name": "Q_MBD_FEL02.03", "labelReverse": [90, -350, 200]},
 					{"type": "blm", "position": 43108, "name": "BLM_Q_MBD_FEL02.03", "labelReverse": true},
-					{"type": "vlv", "position": 43499, "name": "VLV_MBD_FEL02.02", "labelReverse": true},
-					{"type": "sip", "position": 43799, "name": "SIP55_MBDFEL02.04","offset2d": [30, -40], "labelReverse": [90, -290, 200]},
-					{"type": "quadrupolefermi", "position": 44128, "name": "Q_MBD_FEL02.04", "labelReverse": true},
+					{"type": "vlv", "position": 43499, "name": "VLV_MBD_FEL02.02", "labelReverse": [90, -350, 150]},
+					{"type": "quadrupolefermi", "position": 43799, "name": "Q_MBD_FEL02.04", "labelReverse": [90, -350, 200]},
+					{"type": "sip", "position": 44128, "name": "SIP55_MBDFEL02.04","offset2d": [30, -40], "labelReverse": [90, -390, 150]},
 					{"type": "blm", "position": 44128, "name": "BLM_Q_MBD_FEL02.04_L", "labelReverse": true},
 					{"type": "blm", "position": 44128, "name": "BLM_Q_MBD_FEL02.04_R", "labelReverse": true},
-					{"type": "sip", "position": 45228, "name": "SIP55_MBDFEL02.05","offset2d": [30, 0], "labelReverse": [90, -290, 200]},
+					{"type": "sip", "position": 45228, "name": "SIP55_MBDFEL02.05","offset2d": [30, 0], "labelReverse": [90, -390, 150]},
 					
-					{"type": "plc", "position": 47915, "name": "SPIN-FEUH.02", "offset3d": [0, -700, 0], "offset2d": [0, -200], "labelReverse": [180, 1800, 50]}
+					{"type": "plc", "position": 47915, "name": "SPIN-FEUH.02", "offset3d": [0, -700, 0], "offset2d": [0, -200], "labelReverse": [180, 1200, 20]}
 				]
 			},
 			{
 				"start": {"x": 92100, "z": -6811},
-				"bending": {"type": "dipolefermi", "label": "show", "length": 1122, "name": "B_MBD_FEL02.01", "labelReverse": true},
+				"bending": {"type": "dipolefermi", "label": "show", "length": 1122, "name": "B_MBD_FEL02.01", "labelReverse": [90, 1250, 0]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "blm", "position": 100, "name": "BLM_B_MBD_FEL02.01_L"},
@@ -1248,21 +1256,23 @@
 			{
 				"start": {"x": 88866, "z": -7809},
 				"components": [
-					{"type": "vlv", "position": 11000, "name": "VLV_PFE_F01.01"},
-					{"type": "vlv", "position": 12000, "name": "SH_PFE_F01.01"},
-					{"type": "vlv", "position": 13000, "name": "VLV_PFE_F01.02"},
-					{"type": "vlv", "position": 14000, "name": "VLV_PFE_F01.03"},
-					{"type": "vlv", "position": 15000, "name": "VLV_PFE_F01.04"},
-					{"type": "vlv", "position": 16000, "name": "VLV_PFE_F01.05"},
-					{"type": "bst", "position": 16333, "name": "BST_PFE_F01.01"},
-					{"type": "bst", "position": 16666, "name": "BST_PFE_F01.02"},
-					{"type": "vlv", "position": 17000, "name": "VLV_PFE_F01.06"},
-					{"type": "vlv", "position": 18000, "name": "VLV_PFE_F01.07"},
-					{"type": "vlv", "position": 19000, "name": "VLV_PFE_F01.08"},
-					{"type": "vlv", "position": 20000, "name": "VLV_PFE_F01.09"},
-					{"type": "vlv", "position": 21000, "name": "VLV_PFE_F01.10"},
-					{"type": "vlv", "position": 22000, "name": "VLV_POS_F01.01"},
-					{"type": "vlv", "position": 23000, "name": "VLV_POS_F01.02"}
+					{"type": "vlv", "position": 11000, "name": "VLV_PFE_F01.01", "labelReverse": [90, 1200, 150]},
+					{"type": "vlv", "position": 12000, "name": "SH_PFE_F01.01", "labelReverse": [90, 1200, 150]},
+					{"type": "vlv", "position": 13000, "name": "VLV_PFE_F01.02", "labelReverse": [90, 1200, 150]},
+					{"type": "sip", "position": 13300, "name": "SIP300_PFE_F01.01","offset2d": [30, -40], "labelReverse": [90, 1300, 150]},
+					{"type": "sip", "position": 13600, "name": "SIP300_PFE_F01.01","offset2d": [30, -40], "labelReverse": [90, 1300, 150]},					
+					{"type": "vlv", "position": 14000, "name": "VLV_PFE_F01.03", "labelReverse": [90, 1200, 150]},
+					{"type": "vlv", "position": 15000, "name": "VLV_PFE_F01.04", "labelReverse": [90, 1200, 150]},
+					{"type": "vlv", "position": 16000, "name": "VLV_PFE_F01.05", "labelReverse": [90, 1200, 150]},
+					{"type": "bst", "position": 16333, "name": "BST_PFE_F01.01", "labelReverse": [90, 1200, 150]},
+					{"type": "bst", "position": 16666, "name": "BST_PFE_F01.02", "labelReverse": [90, 1200, 150]},
+					{"type": "vlv", "position": 17000, "name": "VLV_PFE_F01.06", "labelReverse": [90, 1200, 150]},
+					{"type": "vlv", "position": 18000, "name": "VLV_PFE_F01.07", "labelReverse": [90, 1200, 150]},
+					{"type": "vlv", "position": 19000, "name": "VLV_PFE_F01.08", "labelReverse": [90, 1200, 150]},
+					{"type": "vlv", "position": 20000, "name": "VLV_PFE_F01.09", "labelReverse": [90, 1200, 150]},
+					{"type": "vlv", "position": 21000, "name": "VLV_PFE_F01.10", "labelReverse": [90, 1200, 150]},
+					{"type": "vlv", "position": 22000, "name": "VLV_POS_F01.01", "labelReverse": [90, 1200, 150]},
+					{"type": "vlv", "position": 23000, "name": "VLV_POS_F01.02", "labelReverse": [90, 1200, 150]}
 				]
 			},
 			{
@@ -1533,19 +1543,21 @@
 			{
 				"start": {"x": 92100, "z": -6773},
 				"components": [
-					{"type": "vlv", "position": 11000, "name": "VLV_PFE_F02.01", "labelReverse": [90, -150, 200]},
-					{"type": "vlv", "position": 12000, "name": "SH_PFE_F02.01", "labelReverse": [90, -150, 200]},
-					{"type": "vlv", "position": 13000, "name": "VLV_PFE_F02.02", "labelReverse": [90, -150, 200]},
-					{"type": "vlv", "position": 14000, "name": "VLV_PFE_F02.03", "labelReverse": [90, -150, 200]},
-					{"type": "vlv", "position": 15000, "name": "VLV_PFE_F02.04", "labelReverse": [90, -150, 200]},
-					{"type": "vlv", "position": 16000, "name": "VLV_PFE_F02.05", "labelReverse": [90, -150, 200]},
-					{"type": "bst", "position": 16333, "name": "BST_PFE_F02.01", "labelReverse": [90, -250, 200]},
-					{"type": "bst", "position": 16666, "name": "BST_PFE_F02.02", "labelReverse": [90, -250, 200]},
-					{"type": "vlv", "position": 17000, "name": "VLV_PFE_F02.06", "labelReverse": [90, -150, 200]},
-					{"type": "vlv", "position": 18000, "name": "VLV_PFE_F02.07", "labelReverse": [90, -150, 200]},
-					{"type": "vlv", "position": 19000, "name": "VLV_PFE_F02.08", "labelReverse": [90, -150, 200]},
-					{"type": "vlv", "position": 20000, "name": "VLV_PFE_F02.09", "labelReverse": [90, -150, 200]},
-					{"type": "vlv", "position": 21000, "name": "VLV_PFE_F02.10", "labelReverse": [90, -150, 200]}
+					{"type": "vlv", "position": 11000, "name": "VLV_PFE_F02.01", "labelReverse": [90, -350, 150]},
+					{"type": "vlv", "position": 12000, "name": "SH_PFE_F02.01", "labelReverse": [90, -350, 150]},
+					{"type": "vlv", "position": 13000, "name": "VLV_PFE_F02.02", "labelReverse": [90, -350, 150]},
+					{"type": "sip", "position": 13300, "name": "SIP300_PFE_F02.01","offset2d": [30, -40], "labelReverse": [90, -380, 150]},
+					{"type": "sip", "position": 13600, "name": "SIP300_PFE_F02.01","offset2d": [30, -40], "labelReverse": [90, -380, 150]},
+					{"type": "vlv", "position": 14000, "name": "VLV_PFE_F02.03", "labelReverse": [90, -350, 150]},
+					{"type": "vlv", "position": 15000, "name": "VLV_PFE_F02.04", "labelReverse": [90, -350, 150]},
+					{"type": "vlv", "position": 16000, "name": "VLV_PFE_F02.05", "labelReverse": [90, -350, 150]},
+					{"type": "bst", "position": 16333, "name": "BST_PFE_F02.01", "labelReverse": [90, -350, 150]},
+					{"type": "bst", "position": 16666, "name": "BST_PFE_F02.02", "labelReverse": [90, -350, 150]},
+					{"type": "vlv", "position": 17000, "name": "VLV_PFE_F02.06", "labelReverse": [90, -350, 150]},
+					{"type": "vlv", "position": 18000, "name": "VLV_PFE_F02.07", "labelReverse": [90, -350, 150]},
+					{"type": "vlv", "position": 19000, "name": "VLV_PFE_F02.08", "labelReverse": [90, -350, 150]},
+					{"type": "vlv", "position": 20000, "name": "VLV_PFE_F02.09", "labelReverse": [90, -350, 150]},
+					{"type": "vlv", "position": 21000, "name": "VLV_PFE_F02.10", "labelReverse": [90, -350, 150]}
 				]
 			},
 			{
@@ -1721,7 +1733,7 @@
 					{"type": "klystronx", "position": 56600, "name": "TKLY_KGXS.01"},
 					{"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", "embedded": [
+					{"type": "rar2", "position": 60300, "name": "RAR2_KGXS.01", "alias": ["RAR2_KG05.02"], "embedded": [
 						"PSSIP_KXS.01", "PSSIP_KXS.10",
 						"PSSIP_KXS.02", "PSSIP_KXS.11",
 						"PSSIP_KXS.03", "PSSIP_KXS.12",
@@ -1911,6 +1923,15 @@
 				"components": [
 				]
 			},
+			{
+				"start": {"x": -122000, "y": 4000, "z": -8000},
+				"components": [
+					{"type": "rar3", "position": 0, "name": "RAR3_KGXS.01", "labelReverse": [-90, 2800, -500]}
+				]
+			},
+			{
+				"start": {"x": -122000, "y": 4000, "z": -10000}
+			},
 			{
 				"start": {"x": -178800, "y": 4000, "z": -8000},
 				"components": [
@@ -2133,7 +2154,7 @@
 					{"type": "rps", "position": 3400, "name": "RPS_KG15.02", "embedded":[
 						"PSQ_DBD.01", "PSQ_DBD.02", "PSQ_DBD.03", "PSQ_DBD.04", "PSQ_DBD.05"
 					]},
-					{"type": "rpsb", "position": 4000, "name": "RPSB_KG15.03", "width": 1000, "height": 2100, "depth": 1000, "embedded":["PSB_DBD"]}
+					{"type": "rpsb", "position": 4000, "name": "RPSB_KG15.03","width": 1000, "height": 2100, "depth": 1000, "offset3d": [900, 0, 0], "embedded":["PSB_DBD"]}
 				]
 			},
 			{
@@ -2157,7 +2178,7 @@
 			{
 				"start": {"x": -8100, "y": 4000, "z": -9011},
 				"components": [
-					{"type": "rack2", "position": 0, "name": "RAR1_KG15.02", "labelReverse": [90, -1100, 100]}
+					{"type": "rar1", "position": 0, "name": "RAR1_KG15.02", "offset2d": [0, -300, 0], "offset3d": [-1100, 0, -1500], "reverse": false, "labelReverse": [90, -100, -100]}
 				]
 			},
 			{
@@ -2168,7 +2189,7 @@
 			{
 				"start": {"x": -8400, "y": 4000, "z": -8411},
 				"components": [
-					{"type": "rack2", "position": 0, "name": "HVPS_KG16.02", "labelReverse": [-90, 2500, -200]}
+					{"type": "donatello", "position": -300, "name": "HVPS_KG16.02", "offset2d": [100, -500, 0], "offset3d": [-200, 0, -2300], "labelReverse": [-90, 2700, -200]}
 				]
 			},
 			{
@@ -2379,10 +2400,10 @@
 			{
 				"start": {"x": 108000, "y": 100, "z": -1600},
 				"components": [
-					{"type": "rpsb", "position": 1000, "name": "RPS_ESA.02", "width": 800, "height": 2000, "depth": 800, "labelReverse": [90, 950, 300], "embedded":[
+					{"type": "rpsb", "position": 1000, "name": "RPS_ESA.02", "width": 800, "height": 2000, "depth": 800,"offset2d": [0, -300, 0], "labelReverse": [90, 950, 300], "embedded":[
 						"PSB_MBDFEL01.01"
 					]},
-					{"type": "rpsb", "position": 2000, "name": "RPS_ESA.03", "width": 800, "height": 2000, "depth": 800, "labelReverse": [90, 950, 300], "embedded":[
+					{"type": "rpsb", "position": 2000, "name": "RPS_ESA.03", "width": 800, "height": 2000, "depth": 800, "offset2d": [0, -500, 0], "labelReverse": [90, 950, 300], "embedded":[
 						"PSB_MBDFEL02.01"
 					]},					
 					{"type": "rps", "position": 2300, "name": "RPS_ESA.04", "labelReverse": [90, 950, 300], "embedded":[