From 032598b81d9cc45dfe78bfa3ece9b5278e096647 Mon Sep 17 00:00:00 2001
From: Lucio Zambon <lucio.zambon@elettra.eu>
Date: Thu, 2 Jan 2025 01:37:40 +0000
Subject: [PATCH] Update fermi_lattice.json

---
 fermi_lattice.json | 531 +++++++++++++++++++++++----------------------
 1 file changed, 273 insertions(+), 258 deletions(-)

diff --git a/fermi_lattice.json b/fermi_lattice.json
index 615a5e6..b1eb46d 100644
--- a/fermi_lattice.json
+++ b/fermi_lattice.json
@@ -36,22 +36,23 @@
 					{"type": "SOL", "position": 30, "name": "SOL_INJ.01"},
 					{"type": "sip", "position": 30, "name": "SIP150_INJ.01", "offset2d": [30, -40], "labelReverse": [90, -220, 150], "embedded": ["SIP75_INJ.01", "SIP75_INJ.02"]},
 					{"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": "sip", "position": 270, "name": "SIP55_INJ.01", "offset2d": [30, -40], "labelReverse": [90, -220, 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": "cm", "position": 550, "name": "CM_INJ.01", "labelReverse": [90, -200, 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": 1890, "name": "BPM_INJ.01"},
+					{"type": "bpm", "position": 1890, "name": "BPM_INJ.01", "labelReverse": [90, 920, 130]},
 					{"type": "correctorfermi", "position": 2051, "ps": ["PSCH_INJ.02","PSCV_INJ.02"], "name": "CHV_INJ.02"},
 					{"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": "sip", "position": 2550, "name": "SIP75_L00.01", "offset2d": [30, -40], "labelReverse": [90, -400, 150], "embedded": ["SIP75_L00.02", "SIP20_L00.01"]},
 					{"type": "cavitylinac", "position": 2702, "length": 1700, "name": "ACCT_L00.01 (K2)"},
 					{"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": "bpm", "position": 4868, "name": "BPM_L00.01", "labelReverse": [90, 1060, 130]},
+					{"type": "sip", "position": 4700, "name": "SIP55_L00.01", "offset2d": [30, -40], "labelReverse": [90, -400, 150], "embedded": ["SIP55_L00.02"]},
+					{"type": "bpm", "position": 4868, "name": "BPM_L00.01", "labelReverse": [90, 920, 130]},
 					{"type": "quadrupolefermi", "position": 5049, "name": "Q_L00.01"},
 					{"type": "blm", "position": 5149, "name": "BLM_Q_L00.01"},
 					{"type": "quadrupolefermi", "position": 5439, "name": "Q_L00.02"},
@@ -59,7 +60,7 @@
 					{"type": "flsc", "position": 5841, "name": "MSCR_L00.01"},
 					{"type": "blm", "position": 5841, "name": "BLM_MSCR_L00.01"},
 					{"type": "SOL", "position": 6100, "name": "SOL_L00.02"},
-					{"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": "sip", "position": 6200, "name": "SIP75_L00.01", "offset2d": [30, -40], "labelReverse": [90, -400, 150], "embedded": ["SIP75_L00.02", "SIP20_L00.03", "SIP20_L00.04"]},
 					{"type": "ACCT0", "position": 5598, "name": "ACCT0_L00.02"},
 					{"type": "cavitylinac", "position": 6402, "length": 1700, "name": "ACCT_L00.02 (K2)"},
 					{"type": "ACCT", "position": 7491, "name": "ACCT_L00.02"},
@@ -67,14 +68,15 @@
 					{"type": "ACCT0", "position": 9207, "name": "ACCT0_L00.02"},
 					{"type": "L00", "position": 9207, "name": "L00"},
 					{"type": "LH", "position": 9207, "name": "LH_01"},
+					{"type": "sip", "position": 8750, "name": "SIP55_L00.03", "offset2d": [30, -40], "labelReverse": [90, -400, 150], "embedded": ["SIP55_L00.04"]},
 					{"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": "sip", "position": 9775, "name": "SIP55_LH.01", "offset2d": [30, -40], "labelReverse": [90, -400, 150]},
 					{"type": "quadrupolefermi", "position": 10111, "name": "Q_LH.02"},
 					{"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": "sip", "position": 10811, "name": "SIP55_L00.01", "offset2d": [30, -40], "labelReverse": [90, -400, 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"},
@@ -82,10 +84,10 @@
 					{"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": 12736, "name": "BPM_LH.01", "labelReverse": [90, 1060, 130]},
-					{"type": "SOL", "position": 12980, "name": "BAM_LH.01", "labelReverse": [90, 1060, 130]},
-					{"type": "bpm", "position": 13200, "name": "BPM_LH.02", "labelReverse": [90, 1060, 130]},
-					{"type": "sip", "position": 13600, "name": "SIP55_LH.02", "offset2d": [30, -40], "labelReverse": [90, -450, 150]},
+					{"type": "bpm", "position": 12736, "name": "BPM_LH.01", "labelReverse": [90, 900, 130]},
+					{"type": "SOL", "position": 12980, "name": "BAM_LH.01", "labelReverse": [90, 900, 130]},
+					{"type": "bpm", "position": 13200, "name": "BPM_LH.02", "labelReverse": [90, 900, 130]},
+					{"type": "sip", "position": 13600, "name": "SIP55_LH.02", "offset2d": [30, -40], "labelReverse": [90, -400, 150]},
 					
 					{"type": "LS", "position": 14096, "name": "LS_CHICANE"}
 				]
@@ -102,13 +104,13 @@
 				]
 			},
 			{
-				"bending": {"type": "bending", "label": "show", "rotateY": "-PI", "length": 200, "name": "B_SPINJ.01", "labelReverse": [63.5, 900, 0]},
+				"bending": {"type": "bending", "label": "show", "rotateY": "-PI", "length": 200, "name": "B_SPINJ.01", "labelReverse": [63.5, 400, 100, 0]},
 				"start": {"x": -172609, "z": -5908},
 				"components": [
-					{"type": "cbpm", "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]}
+					{"type": "cbpm", "position": 350, "name": "BPM_SPINJ.01", "labelReverse": [90, -300, 100]},
+					{"type": "quadrupolefermi", "position": 530, "name": "Q_SPINJ.01", "labelReverse": [90, -300, 200]},
+					{"type": "FC", "position": 631, "name": "FC_SPINJ.01", "labelReverse": [90, -300, 300]},
+					{"type": "flsc", "position": 700, "name": "YSCR_SPINJ.01", "labelReverse": [90, -270, 300]}
 				]
 			},
 			{
@@ -119,29 +121,29 @@
 			},
 			{
 				"start": {"x": -159733, "z": -5908},
-				"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 200, "name": "B_LH.01", "labelReverse": [90, 780, 0]},
+				"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 200, "name": "B_LH.01", "labelReverse": [270, 400, 100, 0]},
 				"components": [
 					{"type": "blm", "position": 100, "name": "BLM_B_LH.01"}
 				]
 			},
 			{
 				"start": {"x": -159233, "z": -6008},
-				"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 200, "name": "B_LH.02", "labelReverse": [90, 780, 0]},
+				"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 200, "name": "B_LH.02", "labelReverse": [90, 400, 0, 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, 800, 800]},
-					{"type": "sip", "position": 1600, "name": "SIP55_LH.03", "offset2d": [30, -40], "labelReverse": [90, -450, 150]},
+					{"type": "sip", "position": 1600, "name": "SIP55_LH.03", "offset2d": [30, -40], "labelReverse": [90, -400, 150]},
 					{"type": "flsc", "position": 1990, "name": "MSCR_LH.03"},
 					{"type": "blm", "position": 1990, "name": "BLM_MSCR_LH.03"},
-					{"type": "bpm", "position": 2476, "name": "BPM_LH.03", "labelReverse": [90, 1060, 130]}
+					{"type": "bpm", "position": 2476, "name": "BPM_LH.03", "labelReverse": [90, 900, 130]}
 				]
 			},
 			{
 				"start": {"x": -156205, "z": -6008},
-				"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 200, "name": "B_LH.03", "labelReverse": [270, 880, 100]},
+				"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 200, "name": "B_LH.03", "labelReverse": [90, 400, 0, 0]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "blm", "position": 100, "name": "BLM_B_LH.03"}
@@ -149,29 +151,29 @@
 			},
 			{
 				"start": {"x": -155706, "z": -5908},
-				"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 200, "name": "B_LH.04", "labelReverse": [270, 880, 100]},
+				"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 200, "name": "B_LH.04", "labelReverse": [90, 400, 0, 0]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "LS", "position": 100, "name": "LS_CHICANE"},
-					{"type": "correctorfermi", "position": 300, "ps": ["PSCH_LH.03","PSCV_LH.03"], "name": "CHV_LH.03", "labelReverse": [90, 1050, 200]},
-					{"type": "bpm", "position": 710, "name": "BPM_LH.04", "labelReverse": [90, 1200, 130]},
-					{"type": "quadrupolefermi", "position": 925, "name": "Q_LH.05", "labelReverse": [90, 950, 200]},
+					{"type": "correctorfermi", "position": 300, "ps": ["PSCH_LH.03","PSCV_LH.03"], "name": "CHV_LH.03", "labelReverse": [90, 890, 200]},
+					{"type": "bpm", "position": 710, "name": "BPM_LH.04", "labelReverse": [90, 900, 130]},
+					{"type": "quadrupolefermi", "position": 925, "name": "Q_LH.05", "labelReverse": [90, 760, 200]},
 					{"type": "blm", "position": 925, "name": "BLM_Q_LH.05"},
-					{"type": "sip", "position": 1200, "name": "SIP55_SPLH.01", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP55_SPLH.02"]},
+					{"type": "sip", "position": 1200, "name": "SIP55_SPLH.01", "offset2d": [30, -40], "labelReverse": [90, -400, 150], "embedded": ["SIP55_SPLH.02"]},
 					{"type": "LH", "position": 1250, "name": "LH_01"},
 					{"type": "SPLH", "position": 1250, "name": "SPLH"}
 				]
 			},
 			{
 				"start": {"x": -153969, "z": -5908},
-				"bending": {"type": "bending", "label": "show", "rotateY": "PI/2", "length": 1000, "name": "B_SPLH.01", "labelReverse": [-69, -300, 100]},
+				"bending": {"type": "bending", "label": "show", "rotateY": "PI/2", "length": 1000, "name": "B_SPLH.01", "labelReverse": [-75, 350, 0, 0]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "blm", "position": 100, "name": "BLM_B_SPLH.01_R"},
 					{"type": "blm", "position": 100, "name": "BLM_B_SPLH.01_L"},
-					{"type": "cbpm", "position": 689, "name": "BPM_SPLH.01"},
-					{"type": "cm", "position": 1393, "name": "CM_SPLH.01"},
-					{"type": "flsc", "position": 2293, "name": "MSCR_SPLH.01", "labelReverse": [270, -440, -120]},
+					{"type": "cbpm", "position": 689, "name": "BPM_SPLH.01", "labelReverse": [270, -430, -80]},
+					{"type": "cm", "position": 1393, "name": "CM_SPLH.01", "labelReverse": [270, -440, -120]},
+					{"type": "flsc", "position": 2293, "name": "MSCR_SPLH.01", "labelReverse": [270, -390, -120]},
 					{"type": "blm", "position": 2293, "name": "BLM_MSCR_SPLH.01"},
 					{"type": "BD", "position": 2435, "name": "BD_SPLH.01"},
 					{"type": "SPLH", "position": 2635, "name": "SPLH"}
@@ -189,122 +191,122 @@
 				"components": [
 					{"type": "LH", "position": 496, "name": "LH_02"},
 					
-					{"type": "sip", "position": 250, "name": "SIP55_L00.03", "offset2d": [30, -40], "labelReverse": [90, -350, 150], "embedded": ["SIP55_L00.04"]},
+					{"type": "sip", "position": 250, "name": "SIP55_LH.03", "offset2d": [30, -40], "labelReverse": [90, -400, 150], "embedded": ["SIP55_L00.04"]},
 					{"type": "bpm", "position": 506, "name": "BPM_LH.05", "labelReverse": [90, -350, 150]},
-					{"type": "flsc", "position": 736, "name": "MSCR_LH.04", "labelReverse": [90, -350, 270]},
+					{"type": "flsc", "position": 736, "name": "MSCR_LH.04", "labelReverse": [90, -350, 220]},
 					{"type": "blm", "position": 736, "name": "BLM_MSCR_LH.04"},
 					{"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, -250, 150]},
+					{"type": "vlv", "position": 1430, "name": "VLV_L01.01", "labelReverse": [90, -350, 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": "sip", "position": 2300, "name": "SIP300_L01.01", "offset2d": [30, -40], "labelReverse": [90, -400, 150], "embedded": ["SIP75_L01.04"]},
 					{"type": "LH", "position": 2011, "name": "LH_02"},
 					{"type": "L01", "position": 2011, "name": "L01"},
 					{"type": "cavitylinac", "position": 2611, "length": 3400, "name": "ACCT_L01.01 (K3)"},
 					{"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": 6400, "name": "SIP300_L01.02", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L01.04"]},
-					{"type": "bpm", "position": 6736, "name": "BPM_L01.01", "labelReverse": [90, 1070, 130]},
-					{"type": "quadrupolefermi", "position": 7023, "name": "Q_L01.01"},
+					{"type": "sip", "position": 6400, "name": "SIP300_L01.02", "offset2d": [30, -40], "labelReverse": [90, -400, 150], "embedded": ["SIP75_L01.04"]},
+					{"type": "bpm", "position": 6736, "name": "BPM_L01.01", "labelReverse": [90, 900, 130]},
+					{"type": "quadrupolefermi", "position": 7023, "name": "Q_L01.01","labelReverse": [90, 760, 200]},
 					{"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": "sip", "position": 7755, "name": "SIP300_L01.03", "offset2d": [30, -40], "labelReverse": [90, -450, 150]},
+					{"type": "correctorfermi", "position": 7414, "ps": ["PSCH_L01.01","PSCV_L01.01"], "name": "CHV_L01.01","labelReverse": [90, 890, 200]},
+					{"type": "sip", "position": 7755, "name": "SIP300_L01.03", "offset2d": [30, -40], "labelReverse": [90, -400, 150]},
 					{"type": "cavitylinac", "position": 7905, "length": 3400, "name": "ACCT_L01.02 (K3)"},
 					{"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": "bpm", "position": 11800, "name": "BPM_L01.02", "labelReverse": [90, 1070, 130]},				
-					{"type": "sip", "position": 12050, "name": "SIP300_L01.04", "offset2d": [30, -40], "labelReverse": [90, -450, 150]},
+					{"type": "bpm", "position": 11800, "name": "BPM_L01.02", "labelReverse": [90, 930, 130]},				
+					{"type": "sip", "position": 12050, "name": "SIP300_L01.04", "offset2d": [30, -40], "labelReverse": [90, -400, 150]},
 					{"type": "vlv", "position": 12250, "name": "VLV_XBL01.01", "labelReverse": [90, 1040, 130]},
 					{"type": "quadrupolefermi", "position": 12400, "name": "Q_L01.02"},
-					{"type": "blm", "position": 12509, "name": "BLM_Q_L01.02", "labelReverse": [90, 1070, 130]},
+					{"type": "blm", "position": 12509, "name": "BLM_Q_L01.02", "labelReverse": [90, 930, 130]},
 					{"type": "correctorfermi", "position": 12609, "ps": ["PSCH_L01.02","PSCV_L01.02"], "name": "CHV_L01.02"},{"type": "cavitylinac", "position": 12841, "length": 1000,"name": "ACCH_L01.01"},
-					{"type": "bpm", "position": 13737, "name": "BPM_L01.03", "labelReverse": [90, 1070, 130]},
-					{"type": "vlv", "position": 13930, "name": "VLV_L01.02", "labelReverse": [90, 920, 130]},
-					{"type": "sip", "position": 14060, "name": "SIP300_L01.05", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L01.05", "SIP75_L01.06", "SIP300_L01.06"]},
+					{"type": "bpm", "position": 13737, "name": "BPM_L01.03", "labelReverse": [90, 930, 130]},
+					{"type": "vlv", "position": 13930, "name": "VLV_L01.02", "labelReverse": [90, 900, 130]},
+					{"type": "sip", "position": 14060, "name": "SIP300_L01.05", "offset2d": [30, -40], "labelReverse": [90, -400, 150], "embedded": ["SIP75_L01.05", "SIP75_L01.06"]},
 					{"type": "cavitylinac", "position": 14225, "length": 3400,"name": "ACCT_L01.03 (K5)"},
 					{"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": 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": "BPM_L01.04", "labelReverse": [90, 1070, 130]},
-					{"type": "quadrupolefermi", "position": 18936, "name": "Q_L01.03"},
+					{"type": "sip", "position": 18200, "name": "SIP300_L01.06", "offset2d": [30, -40], "labelReverse": [90, -400, 150], "embedded": ["SIP75_L01.07", "SIP75_L01.08", "SIP300_L01.08"]},
+					{"type": "bpm", "position": 18628, "name": "BPM_L01.04", "labelReverse": [90, 930, 130]},
+					{"type": "quadrupolefermi", "position": 18936, "name": "Q_L01.03", "labelReverse": [90, 790, 200]},
 					{"type": "blm", "position": 19036, "name": "BLM_Q_L01.03"},
 					{"type": "flsc", "position": 19360, "name": "MSCR_L01.01"},
 					{"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": "sip", "position": 19996, "name": "SIP300_L01.07", "offset2d": [30, -40], "labelReverse": [90, -400, 150]},
 					{"type": "cavitylinac", "position": 20196, "length": 3400, "name": "ACCT_L01.04 (K5)"},
 					{"type": "ACCT", "position": 22106, "name": "ACCT_L01.04"},
 					{"type": "ACCT", "position": 24494, "name": "ACCT_L01.04"},
-					{"type": "sip", "position": 24100, "name": "SIP300_L01.08", "offset2d": [30, -40], "labelReverse": [90, -450, 150]},
-					{"type": "bpm", "position": 24424, "name": "BPM_L01.05", "labelReverse": [90, 1070, 130]},
+					{"type": "sip", "position": 24100, "name": "SIP300_L01.08", "offset2d": [30, -40], "labelReverse": [90, -400, 150]},
+					{"type": "bpm", "position": 24424, "name": "BPM_L01.05", "labelReverse": [90, 930, 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": 25350, "name": "VLV_BC01.01", "labelReverse": [90, 1000, 130]},
+					{"type": "vlv", "position": 25450, "name": "VLV_BC01.01", "labelReverse": [90, 1000, 130]},
 					{"type": "L01", "position": 25667, "name": "L01"},
 					{"type": "BC01", "position": 25667, "name": "BC01_01"}
 				]
 			},
 			{
 				"start": {"x": -128103, "z": -5815},
-				"bending": {"type": "bending", "label": "show", "rotateY": "PI/2", "length": 400, "name": "B_BC01.01", "labelReverse": [270, 900, 50]},
+				"bending": {"type": "bending", "label": "show", "rotateY": "PI/2", "length": 400, "name": "B_BC01.01", "labelReverse": [270, 400, 70, 0]},
 				"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, 900, 200]},
 					{"type": "blm", "position": 602, "name": "BLM_Q_BC01.01"},
-					{"type": "sip", "position": 902, "name": "SIP150_BC01.01","offset2d": [30, -40], "labelReverse": [90, -450, 200]}
+					{"type": "sip", "position": 902, "name": "SIP150_BC01.01","offset2d": [30, -40], "labelReverse": [90, -400, 200]}
 				]
 			},
 			{
 				"start": {"x": -125125, "z": -6060},
-				"bending": {"type": "bending", "label": "show", "rotateY": "PI/2", "length": 400, "name": "B_BC01.02", "labelReverse": [90, 890, 10]},
+				"bending": {"type": "bending", "label": "show", "rotateY": "PI/2", "length": 400, "name": "B_BC01.02", "labelReverse": [90, 400, 0, 0]},
 				"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": 324, "name": "SCRPH_BC01.01", "labelReverse": [90, 1200, 130]},
 					{"type": "bpm", "position": 575, "name": "BPM_BC01.01", "labelReverse": [90, 1070, 130]},
-					{"type": "flsc", "position": 767, "name": "MSCR_BC01.01"}
+					{"type": "flsc", "position": 767, "name": "MSCR_BC01.01", "labelReverse": [90, 1140, 190]}
 				]
 			},
 			{
 				"start": {"x": -123631, "z": -6060},
-				"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 400, "name": "B_BC01.03", "labelReverse": [90, 890, 10]},
+				"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 400, "name": "B_BC01.03", "labelReverse": [90, 400, 0, 0]},
 				"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": 2000, "name": "SIP150_BC01.02","offset2d": [30, -40], "labelReverse": [90, -450, 150]},
+					{"type": "sip", "position": 2000, "name": "SIP150_BC01.02","offset2d": [30, -40], "labelReverse": [90, -400, 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": "bending", "label": "show", "rotateY": "PI/2", "length": 400, "name": "B_BC01.04", "labelReverse": [270, 920, 10]},
+				"bending": {"type": "bending", "label": "show", "rotateY": "PI/2", "length": 400, "name": "B_BC01.04", "labelReverse": [270, 400, 80, 0]},
 				"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": "sip", "position": 1245, "name": "SIP55_BC01.01","offset2d": [30, -40], "labelReverse": [90, -450, 150]},
+					{"type": "sip", "position": 1245, "name": "SIP55_BC01.01","offset2d": [30, -40], "labelReverse": [90, -400, 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": "SOL", "position": 1830, "name": "BAM_BC01.01", "labelReverse": [90, 1110, 150]},
-					{"type": "bpm", "position": 1998, "name": "BPM_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": "bpm", "position": 2100, "name": "BPM_BC01.02", "labelReverse": [90, 1110, 130]},
+					{"type": "vlv", "position": 2300, "name": "VLV_BC01.02", "labelReverse": [90, 1090, 150]},
+					{"type": "sip", "position": 2500, "name": "SIP55_BC01.02","offset2d": [30, -40], "labelReverse": [90, -400, 150]},
+					{"type": "DCAV", "position": 3022, "name": "DCAV_BC01.01","offset2d": [-190, 0],"offset3d": [-200, 0,0], "labelReverse": [90, 1190, 130]},
 					{"type": "blm", "position": 3022, "name": "BLM_DCAV_BC01.01"},
 					{"type": "vlv", "position": 3100, "name": "VLV_BC01.03", "labelReverse": [90, 1110, 150]},
 					{"type": "quadrupolefermi", "position": 3492, "name": "Q_BC01.03", "labelReverse": [90, 1010, 200]},
@@ -314,10 +316,10 @@
 					{"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": 4852, "name": "SIP55_BC01.02","offset2d": [30, -40], "labelReverse": [90, -450, 150]},
+					{"type": "sip", "position": 4852, "name": "SIP55_BC01.02","offset2d": [30, -40], "labelReverse": [90, -400, 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": "BPM_BC01.03", "labelReverse": [90, 1270, 130]},
+					{"type": "bpm", "position": 5423, "name": "BPM_BC01.03", "labelReverse": [90, 1145, 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, 1140, 200]},
@@ -325,25 +327,25 @@
 					{"type": "GCOL", "position": 6667, "name": "GCOL_BC01.01", "labelReverse": [90, 1210, 200]},
 					{"type": "blm", "position": 6667, "name": "BLM_GCOL_BC01.01"},
 					{"type": "sip", "position": 6667, "name": "SIP300_BC01.01","offset2d": [30, -40], "offset3d": [0, -300, 0], "labelReverse": [90, -450, 150]},
-					{"type": "flsc", "position": 7269, "name": "MSCR_BC01.02", "labelReverse": [90, 1250, 300]},
+					{"type": "flsc", "position": 7269, "name": "MSCR_BC01.02", "labelReverse": [90, 1200, 180]},
 					{"type": "blm", "position": 7269, "name": "BLM_MSCR_BC01.02"},
-					{"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": "sip", "position": 10300, "name": "SIP55_BC01.03","offset2d": [30, -40], "labelReverse": [90, -400, 150]},
+					{"type": "flsc", "position": 12350, "name": "MSCR_BC01.03", "labelReverse": [90, 1200, 180]},
+					{"type": "correctorfermi", "position": 12728, "ps": ["PSCH_BC01.04","PSCV_BC01.04"], "name": "CHV_BC01.04", "labelReverse": [90, 1110, 200]},
+					{"type": "quadrupolefermi", "position": 13144, "name": "Q_BC01.08", "labelReverse": [90, 960, 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": "correctorfermi", "position": 13643, "ps": ["PSCH_BC01.05","PSCV_BC01.05"], "name": "CHV_BC01.05", "labelReverse": [90, 1110, 200]},
+					{"type": "quadrupolefermi", "position": 14278, "name": "Q_BC01.09", "labelReverse": [90, 960, 200]},
 					{"type": "blm", "position": 14278, "name": "BLM_Q_BC01.09"},
-					{"type": "bpm", "position": 14568, "name": "BPM_BC01.04", "labelReverse": [90, 1250, 130]},
+					{"type": "bpm", "position": 14568, "name": "BPM_BC01.04", "labelReverse": [90, 1100, 130]},
 					{"type": "BC01", "position": 15259, "name": "BC01_01"},
 					{"type": "SPBC01", "position": 15259, "name": "SPBC01"}
 				]
 			},
 			{
 				"start": {"x": -105230, "z": -5828},
-				"bending": {"type": "bending", "label": "show", "rotateY": "PI/2", "length": 320, "name": "B_SPBC01.01", "labelReverse": [-72, -300, 100]},
+				"bending": {"type": "bending", "label": "show", "rotateY": "PI/2", "length": 320, "name": "B_SPBC01.01", "labelReverse": [-72, 400, -100, 0]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "cbpm", "position": 589, "name": "BPM_SPBC01.01"},
@@ -370,12 +372,12 @@
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "BC01", "position": 850, "name": "BC01_02"},
-					{"type": "bpm", "position": 446, "name": "BPM_BC01.05", "labelReverse": [90, -450, 150]},
+					{"type": "bpm", "position": 446, "name": "BPM_BC01.05", "labelReverse": [90, -350, 150]},
 					{"type": "blm", "position": 846, "name": "BLM_BPM_BC01.05"},
 					{"type": "GCOL", "position": 1471, "name": "GCOL_BC01.02", "labelReverse": [90, 1010, 250]},
 					{"type": "blm", "position": 1471, "name": "BLM_GCOL_BC01.02"},
 					{"type": "sip", "position": 1471, "name": "SIP300_BC01.02","offset2d": [30, -40], "offset3d": [0, -300, 0], "labelReverse": [90, -450, 150]},
-					{"type": "flsc", "position": 2027, "name": "MSCR_BC01.04", "labelReverse": [90, -450, 300]},
+					{"type": "flsc", "position": 2027, "name": "MSCR_BC01.04", "labelReverse": [90, -400, 200]},
 					{"type": "blm", "position": 2127, "name": "BLM_MSCR_BC01.04"},
 					{"type": "quadrupolefermi", "position": 2442, "name": "Q_BC01.10"},
 					{"type": "blm", "position": 2442, "name": "BLM_Q_BC01.10"},
@@ -383,51 +385,52 @@
 					{"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, 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": "vlv", "position": 3710, "name": "VLV_L02.01", "labelReverse": [90, 920, 150]},
+					{"type": "sip", "position": 3910, "name": "SIP300_L02.01", "offset2d": [30, -40], "labelReverse": [90, -400, 150], "embedded": ["SIP75_L02.01", "SIP75_L02.02"]},
 					{"type": "BC01", "position": 3910, "name": "BC01_02"},
 					{"type": "L02", "position": 3910, "name": "L02"},
 					{"type": "cavitylinac", "position": 4110, "length": 3400, "name": "ACCT_L02.01 (K6)"},
 					{"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": 7928, "name": "SIP300_L02.03","offset2d": [30, -40], "labelReverse": [90, -450, 150]},
-					{"type": "bpm", "position": 8278, "name": "BPM_L02.01", "labelReverse": [90, 1080, 130]},
+					{"type": "sip", "position": 7928, "name": "SIP300_L02.02","offset2d": [30, -40], "labelReverse": [90, -400, 150]},
+					{"type": "bpm", "position": 8278, "name": "BPM_L02.01", "labelReverse": [90, 940, 130]},
 					{"type": "quadrupolefermi", "position": 8603, "name": "Q_L02.01"},
 					{"type": "blm", "position": 8953, "name": "BLM_Q_L02.01"},
+					{"type": "vlv", "position": 8873, "name": "VLVM_L02.01", "labelReverse": [90, 990, 120]},
 					{"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": "sip", "position": 9393, "name": "SIP300_L02.03", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L02.03", "SIP75_L02.04"]},
 					{"type": "cavitylinac", "position": 9606, "length": 3400, "name": "ACCT_L02.02 (K6)"},
 					{"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": "sip", "position": 13434, "name": "SIP300_L02.04","offset2d": [30, -40], "labelReverse": [90, -450, 150]},
-					{"type": "bpm", "position": 13834, "name": "BPM_L02.02", "labelReverse": [90, 1080, 130]},
+					{"type": "bpm", "position": 13834, "name": "BPM_L02.02", "labelReverse": [90, 940, 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": "vlv", "position": 14800, "name": "VLV_L02.02", "labelReverse": [90, 920, 150]},
+					{"type": "sip", "position": 15050, "name": "SIP300_L02.05", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L02.05", "SIP75_L02.06"]},
 					{"type": "cavitylinac", "position": 15302, "length": 3400, "name": "ACCT_L02.03 (K7)"},
 					{"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": 19250, "name": "SIP300_L02.06","offset2d": [30, -40], "labelReverse": [90, -450, 150]},
-					{"type": "bpm", "position": 19630, "name": "BPM_L02.03", "labelReverse": [90, 1080, 130]},
+					{"type": "bpm", "position": 19630, "name": "BPM_L02.03", "labelReverse": [90, 940, 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": "sip", "position": 20626, "name": "SIP300_L02.07","offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L02.07","SIP75_L02.08"]},
 					{"type": "cavitylinac", "position": 20826, "name": "ACCT_L02.04 (K7)"},
 					{"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": "BPM_L02.04", "labelReverse": [90, 1080, 130]},
+					{"type": "sip", "position": 24540, "name": "SIP300_L02.08", "offset2d": [30, -40], "labelReverse": [90, -450, 150]},
+					{"type": "bpm", "position": 24846, "name": "BPM_L02.04", "labelReverse": [90, 940, 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": "vlv", "position": 25850, "name": "VLV_L03.01", "labelReverse": [90, 920, 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"},
@@ -435,9 +438,10 @@
 					{"type": "ACCBT", "position": 27931, "name": "ACCBT_L03.01"},
 					{"type": "ACCBT", "position": 31133, "name": "ACCBT_L03.01"},
 					{"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": "BPM_L03.01", "labelReverse": [90, 1080, 130]},
+					{"type": "bpm", "position": 30703, "name": "BPM_L03.01", "labelReverse": [90, 940, 130]},
 					{"type": "quadrupolefermi", "position": 31071, "name": "Q_L03.01"},
 					{"type": "blm", "position": 31071, "name": "BLM_Q_L03.01"},
+					{"type": "vlv", "position": 31401, "name": "VLVM_L03.01", "labelReverse": [90, 980, 150]},
 					{"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, "length": 3400, "name": "ACCBT_L03.02 (K9)"},
@@ -446,7 +450,7 @@
 					{"type": "ACCBT", "position": 38365, "name": "ACCBT_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": "BPM_L03.02", "labelReverse": [90, 1080, 130]},
+					{"type": "bpm", "position": 37100, "name": "BPM_L03.02", "labelReverse": [90, 940, 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"},
@@ -459,31 +463,32 @@
 			
 			{
 				"start": {"x": -65603, "z": -5811},
-				"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 400, "name": "B_BC02.01", "labelReverse": [90, 890, 50]},
+				"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 400, "name": "B_BC02.01", "labelReverse": [270, 400, 80, 0]},
 				"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.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"}
+					{"type": "quadrupolefermi", "position": 500, "name": "Q_BC02.01", "labelReverse": [90, 900, 200]},	
+					{"type": "blm", "position": 500, "name": "BLM_Q_BC02.01"},					
+					{"type": "sip", "position": 800, "name": "SIP150_BC02.01","offset2d": [30, -40], "labelReverse": [90, -450, 150]}
+
 				]
 			},
 			{
 				"start": {"x": -62626, "z": -6060},
-				"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 400, "name": "B_BC02.02", "labelReverse": [90, 890, 50]},
+				"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 400, "name": "B_BC02.02", "labelReverse": [90, 400, 0, 0]},
 				"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": 354, "name": "SCRPH_BC02.01"},
-					{"type": "bpm", "position": 625, "name": "BPM_BC02.01", "labelReverse": [90, 1070, 130]},
+					{"type": "bpm", "position": 625, "name": "BPM_BC02.01", "labelReverse": [90, 1030, 130]},
 					{"type": "flsc", "position": 797, "name": "MSCR_BC02.01"}
 				]
 			},
 			{
 				"start": {"x": -61131, "z": -6060},
-				"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 400, "name": "B_BC02.03", "labelReverse": [90, 890, 50]},
+				"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 400, "name": "B_BC02.03", "labelReverse": [90, 400, 0, 0]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "blm", "position": 100, "name": "BLM_B_BC02.03_L"},
@@ -495,7 +500,7 @@
 			},
 			{
 				"start": {"x": -58148, "z": -5811},
-				"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 400, "name": "B_BC02.04", "labelReverse": [90, 890, 50]},
+				"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 400, "name": "B_BC02.04", "labelReverse": [90, 400, 0, 0]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "blm", "position": 100, "name": "BLM_B_BC02.04_L"},
@@ -503,106 +508,108 @@
 					{"type": "CBLM", "position": 331, "name": "CBLM_BC02.01"},
 					{"type": "GBLM", "position": 979, "name": "GBLM_BC02.01"},
 					{"type": "SOL", "position": 501, "name": "BAM_BC02.01", "labelReverse": [90, 1030, 150]},
-					{"type": "bpm", "position": 701, "name": "BPM_BC02.02", "labelReverse": [90, 1160, 130]},
+					{"type": "bpm", "position": 701, "name": "BPM_BC02.02", "labelReverse": [90, 1030, 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", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP300_L04.02"]},
+					{"type": "vlv", "position": 1717, "name": "VLV_L04.01", "labelReverse": [90, 910, 120]},
+					{"type": "sip", "position": 1847, "name": "SIP300_L04.01", "offset2d": [30, -40], "labelReverse": [90, -400, 150]},
 					{"type": "BC02", "position": 1817, "name": "BC02"},
 					{"type": "L04", "position": 1817, "name": "L04"},
 					{"type": "cavitylinac", "position": 1997, "length": 3400, "name": "ACCBT_L04.01 (K10)"},
 					{"type": "ACCBT", "position": 5048, "name": "ACCBT_L04.01"},
 					{"type": "ACCBT", "position": 8250, "name": "ACCBT_L04.01"},
-					{"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": "BPM_L04.01", "labelReverse": [90, 1100, 130]},
+					{"type": "sip", "position": 5900, "name": "SIP300_L04.02", "offset2d": [30, -40], "labelReverse": [90, -400, 150], "embedded": ["SIP75_L04.01", "SIP75_L04.02", "SIP75_L04.03", "SIP75_L04.04"]},
+					{"type": "bpm", "position": 6780, "name": "BPM_L04.01", "labelReverse": [90, 940, 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": "sip", "position": 9100, "name": "SIP300_L04.03", "offset2d": [30, -40], "labelReverse": [90, -400, 150]},
 					{"type": "cavitylinac", "position": 9250, "length": 3400, "name": "ACCBT_L04.02 (K11)"},
 					{"type": "ACCBT", "position": 12281, "name": "ACCBT_L04.02"},
 					{"type": "ACCBT", "position": 15482, "name": "ACCBT_L04.02"},
-					{"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": "BPM_L04.02", "labelReverse": [90, 1100, 130]},
+					{"type": "sip", "position": 13062, "name": "SIP300_L04.04", "offset2d": [30, -40], "labelReverse": [90, -400, 150], "embedded": ["SIP75_L04.05", "SIP75_L04.06", "SIP75_L04.07", "SIP75_L04.08"]},
+					{"type": "bpm", "position": 14000, "name": "BPM_L04.02", "labelReverse": [90, 940, 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": "vlv", "position": 16000, "name": "VLV_L04.02", "labelReverse": [90, 920, 120]},
+					{"type": "sip", "position": 16350, "name": "SIP300_L04.05", "offset2d": [30, -40], "labelReverse": [90, -400, 150]},
 					{"type": "cavitylinac", "position": 16582, "length": 3400, "name": "ACCBT_L04.03 (K12) "},
 					{"type": "ACCBT", "position": 19513, "name": "ACCBT_L04.03"},
 					{"type": "ACCBT", "position": 22715, "name": "ACCBT_L04.03"},
-					{"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": "BPM_L04.03", "labelReverse": [90, 1100, 130]},
+					{"type": "sip", "position": 20400, "name": "SIP300_L04.06", "offset2d": [30, -40], "labelReverse": [90, -400, 150], "embedded": ["SIP75_L04.09", "SIP75_L04.10", "SIP75_L04.11", "SIP75_L04.12"]},
+					{"type": "bpm", "position": 21150, "name": "BPM_L04.03", "labelReverse": [90, 940, 130]},
 					{"type": "quadrupolefermi", "position": 21945, "name": "Q_L04.03"},
 					{"type": "blm", "position": 21945, "name": "BLM_Q_L04.03"},
+					{"type": "vlv", "position": 22445, "name": "VLVM_L04.01", "labelReverse": [90, 990, 120]},
 					{"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": "sip", "position": 23440, "name": "SIP300_L04.07", "offset2d": [30, -40], "labelReverse": [90, -400, 150]},
 					{"type": "cavitylinac", "position": 23615, "length": 3400, "name": "ACCBT_L04.04 (K13)"},
 					{"type": "ACCBT", "position": 26746, "name": "ACCBT_L04.04"},
 					{"type": "ACCBT", "position": 29947, "name": "ACCBT_L04.04"},
-					{"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": "BPM_L04.04", "labelReverse": [90, 1100, 130]},
+					{"type": "sip", "position": 27600, "name": "SIP300_L04.08", "offset2d": [30, -40], "labelReverse": [90, -400, 150], "embedded": ["SIP75_L04.13", "SIP75_L04.14", "SIP75_L04.15", "SIP75_L04.16"]},
+					{"type": "bpm", "position": 28217, "name": "BPM_L04.04", "labelReverse": [90, 940, 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": "vlv", "position": 30400, "name": "VLV_L04.03", "labelReverse": [90, 920, 120]},
+					{"type": "sip", "position": 30800, "name": "SIP300_L04.09","offset2d": [30, -40], "labelReverse": [90, -400, 150]},
 					{"type": "cavitylinac", "position": 30947, "length": 3400, "name": "ACCBT_L04.05 (K14)"},
 					{"type": "ACCBT", "position": 33978, "name": "ACCBT_L04.05"},
 					{"type": "ACCBT", "position": 37180, "name": "ACCBT_L04.05"},
-					{"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": "BPM_L04.05", "labelReverse": [90, 1100, 130]},
+					{"type": "sip", "position": 34800, "name": "SIP75_L04.17", "offset2d": [30, -40], "labelReverse": [90, -400, 150], "embedded": ["SIP75_L04.18", "SIP75_L04.19", "SIP75_L04.20"]},
+					{"type": "bpm", "position": 35610, "name": "BPM_L04.05", "labelReverse": [90, 940, 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": "sip", "position": 38100, "name": "SIP55_L04.03", "offset2d": [30, -40], "labelReverse": [90, -400, 150], "embedded": ["SIP55_L04.04"]},
 					{"type": "cavitylinac", "position": 39090, "length": 1700, "name": "ACCBT_L04.06 (K15)"},
 					{"type": "ACCT", "position": 39660, "name": "ACCT_L04.06"},
-					
-					{"type": "bpm", "position": 41760, "name": "BPM_L04.06", "labelReverse": [90, 1100, 130]},
+					{"type": "sip", "position": 41500, "name": "SIP75_L04.01", "offset2d": [30, -40], "labelReverse": [90, -400, 150], "embedded": ["SIP75_L04.02"]},
+					{"type": "bpm", "position": 41760, "name": "BPM_L04.06", "labelReverse": [90, 940, 130]},
 					{"type": "correctorfermi", "position": 42200, "ps": ["PSCH_L04.06","PSCV_L04.06"], "name": "CHV_L04.06"},
 					{"type": "blm", "position": 42217, "name": "BLM_CHV_L04.06"},
 					{"type": "blm", "position": 42400, "name": "BLM_Q_L04.06"},
-					{"type": "quadrupolefermi", "position": 42800, "name": "Q_L04.06"},					
+					{"type": "quadrupolefermi", "position": 42800, "name": "Q_L04.06"},
+					{"type": "sip", "position": 43200, "name": "SIP75_L04.26", "offset2d": [30, -40], "labelReverse": [90, -400, 150], "embedded": ["SIP75_L04.28", "SIP75_L04.29", "SIP75_L04.30"]},
 					{"type": "cavitylinac", "position": 43500, "length": 1700, "name": "ACCBT_L04.07 (K15)"},
 					{"type": "ACCT", "position": 43597, "name": "ACCT_L04.07"},
-
-					{"type": "sip", "position": 45550, "name": "SIP75_L04.26", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L04.28", "SIP75_L04.29", "SIP75_L04.30"]},
 					{"type": "quadrupolefermi", "position": 45933, "name": "Q_L04.07"},
 					{"type": "blm", "position": 45933, "name": "BLM_Q_L04.07"},
-					{"type": "bpm", "position": 46472, "name": "BPM_L04.07", "labelReverse": [90, 1100, 130]},
+					{"type": "bpm", "position": 46472, "name": "BPM_L04.07", "labelReverse": [90, 940, 130]},
+					{"type": "vlv", "position": 46678, "name": "VLVM_L04.03", "labelReverse": [90, 990, 120]},
 					{"type": "correctorfermi", "position": 46828, "ps": ["PSCH_L04.07","PSCV_L04.07"], "name": "CHV_L04.07"},
 					{"type": "blm", "position": 46928, "name": "BLM_CHV_L04.07"},
-					{"type": "sip", "position": 47328, "name": "SIP75_L04.27","offset2d": [30, -40], "labelReverse": [90, -450, 150]},
+					{"type": "sip", "position": 47328, "name": "SIP75_L04.27","offset2d": [30, -40], "labelReverse": [90, -400, 150]},
 					{"type": "cavitylinac", "position": 47628, "length": 1700, "name": "HERFDY (K16)"},
 					{"type": "blm", "position": 48230, "name": "BLM_DCAV_L04.01"},
 					{"type": "L04", "position": 49980, "name": "L04"},
 
 					{"type": "TLS", "position": 49680, "name": "TLS_01"},
+					{"type": "sip", "position": 49780, "name": "SIP75_L04.30","offset2d": [30, -40], "labelReverse": [90, -450, 150]},
 					{"type": "quadrupolefermi", "position": 50055, "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": "vlv", "position": 51300, "name": "VLV_TLS.01", "labelReverse": [90, 920, 120]},
 					{"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": 51810, "name": "BPM_TLS.01", "labelReverse": [90, 1100, 130]},
+					{"type": "bpm", "position": 51810, "name": "BPM_TLS.01", "labelReverse": [90, 940, 130]},
 					{"type": "flsc", "position": 52100, "name": "MSCR_TLS.01"},
 					{"type": "blm", "position": 52495, "name": "BLM_MSCR_TLS.01"},
 					{"type": "GCOL", "position": 52315, "name": "GCOL_TLS.01"},
 					{"type": "sip", "position": 52315, "name": "SIP300_TLS.01","offset2d": [30, -40], "offset3d": [0, -300, 0], "labelReverse": [90, -450, 150]},
 					{"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": 52710, "name": "Q_TLS.03"},
+					{"type": "quadrupolefermi", "position": 52710, "name": "Q_TLS.03"},
 					{"type": "blm", "position": 51910, "name": "BLM_Q_TLS.03"},
+					{"type": "correctorfermi", "position": 52950, "name": "CV_NO NAME"},
 					{"type": "quadrupolefermi", "position": 53210, "name": "Q_TLS.04"},
 					{"type": "blm", "position": 52710, "name": "BLM_Q_TLS.04"},
 					{"type": "TLS", "position": 53223, "name": "TLS_01"},
@@ -611,7 +618,7 @@
 			},
 			{
 				"start": {"x": -3722, "z": -5645},
-				"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 2400, "name": "B_DBD.01" , "labelReverse": [90, -450, 150]},
+				"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 2400, "name": "B_DBD.01" , "labelReverse": [90, 400, 270, 0]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "blm", "position": 100, "name": "BLM_B_DBD.01_L"},
@@ -628,7 +635,7 @@
 			},
 			{
 				"start": {"x": 902, "z": -2823},
-				"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 2400, "name": "B_DBD.02"},
+				"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 2400, "name": "B_DBD.02", "labelReverse": [90, 400, 270, 0]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "blm", "position": 100, "name": "BLM_B_DBD.02_L"},
@@ -677,9 +684,9 @@
 				"start": {"x": -3112, "z": -5645},
 				"components": [
 					{"type": "flsc", "position": 400, "name": "MSCR_TLS.02"},
-					{"type": "sip", "position": 600, "name": "SIP55_TLS.02","offset2d": [30, -40], "labelReverse": [90, 1000, 130]},
+					{"type": "sip", "position": 600, "name": "SIP55_TLS.01","offset2d": [30, -40], "labelReverse": [90, 980, 130]},
   					{"type": "correctorfermi", "position": 800, "ps": ["PSCH_TLS.02","PSCV_TLS.02"], "name": "CHV_TLS.02"},
-					{"type": "bpm", "position": 1699, "name": "BPM_TLS.02", "labelReverse": [90, 1100, 150]},
+					{"type": "bpm", "position": 1699, "name": "BPM_TLS.02", "labelReverse": [90, 950, 130]},
 					{"type": "GCOL", "position": 1999, "name": "GCOL_TLS.02"},
 					{"type": "sip", "position": 1999, "name": "SIP300_TLS.02","offset2d": [30, -40], "offset3d": [0, -300, 0], "labelReverse": [125, -250, 150]},
 					{"type": "blm", "position": 2149, "name": "RTBLM_TLS.02"},
@@ -689,34 +696,34 @@
 					{"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": "BLM_TLS.03"},
-					{"type": "bpm", "position": 3899, "name": "BPM_TLS.03", "labelReverse": [90, 1200, 150]},
+					{"type": "bpm", "position": 3899, "name": "BPM_TLS.03", "labelReverse": [90, 950, 150]},
 					{"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": 5014, "name": "SIP75_TLS.01","offset2d": [30, -40], "labelReverse": [90, 970, 130]},
+  					{"type": "vlv", "position": 6100, "name": "VLV_SCL.01", "labelReverse": [90, 930, 130]},
 					{"type": "quadrupolefermi", "position": 9500, "name": "Q_SCL.01", "labelReverse": [90, 900, 190]}
 					
 				]
 			},
 			{
 				"start": {"x": 7140, "z": -5645},
-				"bending": {"type": "bending", "label": "show", "rotateY": "PI/2", "length": 250, "name": "B_SCL.01", "labelReverse": [270, 920, 10]},
+				"bending": {"type": "bending", "label": "show", "rotateY": "PI/2", "length": 250, "name": "B_SCL.01", "labelReverse": [270, 450, 100, 0]},
 				"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, 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": 1199, "name": "SIP55_SCL.01","offset2d": [30, -40], "labelReverse": [90, 1030, 130]},
+					{"type": "sip", "position": 1199, "name": "SIP55_SCL.01","offset2d": [30, -40], "labelReverse": [90, 1060, 130]},
 					{"type": "quadrupolefermi", "position": 1449, "name": "Q_SCL.03", "labelReverse": [90, 920, 200]},
 					{"type": "blm", "position": 1449, "name": "BLM_Q_SCL.03"},
-					{"type": "bpm", "position": 1849, "name": "BPM_SCL.01", "labelReverse": [90, 1200, 150]},
+					{"type": "bpm", "position": 1849, "name": "BPM_SCL.01", "labelReverse": [90, 1070, 150]},
 					{"type": "GCOL", "position": 2200, "name": "ECOL_SCL.01", "labelReverse": [90, 1120, 200]},
 					{"type": "sip", "position": 2200, "name": "SIP300_SCL.01","offset2d": [30, -40], "offset3d": [0, -300, 0], "labelReverse": [90, -450, 150]},
 					{"type": "blm", "position": 2644, "name": "BLM_ECOL_SCL.01"},
 					{"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, 1050, 200]},
+					{"type": "flsc", "position": 3119, "name": "MSCR_SCL.01", "labelReverse": [90, 1110, 200]},
 					{"type": "blm", "position": 3119, "name": "BLM_MSCR_SCL.01"},
 					{"type": "quadrupolefermi", "position": 3414, "name": "Q_SCL.05", "labelReverse": [90, 920, 200]},
 					{"type": "blm", "position": 3514, "name": "BLM_Q_SCL.05"},
@@ -725,11 +732,11 @@
 			},
 			{
 				"start": {"x": 11440, "z": -6064},
-				"bending": {"type": "bending", "label": "show", "rotateY": "-PI", "length": 250, "name": "B_SCL.02", "labelReverse": [270, 900, 50]},
+				"bending": {"type": "bending", "label": "show", "rotateY": "-PI", "length": 250, "name": "B_SCL.02", "labelReverse": [270, 450, 100, 0]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "blm", "position": 100, "name": "BLM_B_SCL.02"},
-					{"type": "bpm", "position": 315, "name": "BPM_SCL.02", "labelReverse": [90, 1200, 150]},
+					{"type": "bpm", "position": 315, "name": "BPM_SCL.02", "labelReverse": [90, 1070, 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, 1050, 200]},
@@ -748,38 +755,39 @@
 					{"type": "quadrupolefermi", "position": 6015, "name": "Q_SFEL01.01", "labelReverse": [90, 1050, 200]},
 					{"type": "blm", "position": 6015, "name": "BLM_Q_SFEL01.01"},
 					{"type": "sip", "position": 7060, "name": "SIP55_SFEL01.01","offset2d": [30, -40], "labelReverse": [90, 1100, 150]},
+					{"type": "tent", "position": 9100, "name": "","offset2d": [200, -780]},
 					{"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": "BPM_SFEL01.01", "labelReverse": [90, 1250, 150]},
+					{"type": "bpm", "position": 10490, "name": "BPM_SFEL01.01", "labelReverse": [90, 1100, 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": 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, -700, 0], "offset2d": [0, 300], "labelReverse": [185,50,80]},
 					{"type": "plc", "position": 13215, "name": "SP_SLU_UH.03", "offset3d": [0, -700, 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]}
+					{"type": "sip", "position": 13615, "name": "SIP55_SFEL01.03","offset2d": [30, -40], "labelReverse": [90, 1180, 150]}
 					
 				]
 			},
 			{
 				"start": {"x": 25655, "z": -7555},
-				"bending": {"type": "bending", "label": "show", "rotateY": "-PI", "length": 250, "name": "B_SFEL01.01", "labelReverse": [90, 1000, 50]},
+				"bending": {"type": "bending", "label": "show", "rotateY": "-PI", "length": 250, "name": "B_SFEL01.01", "labelReverse": [90, 370, 0, 0]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "blm", "position": 100, "name": "BLM_B_SFEL01.01"},
-					{"type": "bpm", "position": 457, "name": "BPM_SFEL01.02", "labelReverse": [90, 1290, 150]},
+					{"type": "bpm", "position": 457, "name": "BPM_SFEL01.02", "labelReverse": [90, 1150, 150]},
 					{"type": "quadrupolefermi", "position": 837, "name": "Q_SFEL01.04", "labelReverse": [90, 1000, 200]},
 					{"type": "plc", "position": 837, "name": "SP_LSU_EOS.02", "offset3d": [0, -700, 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, 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": 2200, "name": "BPM_SFEL01.03", "labelReverse": [90, 1290, 150]},
+					{"type": "bpm", "position": 2200, "name": "BPM_SFEL01.03", "labelReverse": [90, 1150, 150]},
 					{"type": "GCOL", "position": 2500, "name": "ECOL_SFEL01.01", "labelReverse": [90, 1210, 400]},
 					{"type": "sip", "position": 2500, "name": "SIP300_SFEL01.01","offset2d": [30, -40], "labelReverse": [90, 1220, 150]},
+					{"type": "tent", "position": 3000, "name": "","offset2d": [0, -780]},
 					{"type": "sip", "position": 3050, "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]},
@@ -789,32 +797,34 @@
 			},
 			{
 				"start": {"x": 30485, "z": -7808},
-				"bending": {"type": "bending", "label": "show", "rotateY": "-PI", "length": 250, "name": "B_SFEL01.02", "labelReverse": [90, 1050, 50]},
+				"bending": {"type": "bending", "label": "show", "rotateY": "-PI", "length": 250, "name": "B_SFEL01.02", "labelReverse": [90, 410, 0, 0]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "plc", "position": 0, "name": "SPIN-UH.03", "offset3d": [0, -700, 0], "offset2d": [-200, 350], "labelReverse": [180,1050,80]},
 					{"type": "blm", "position": 100, "name": "BLM_B_SFEL01.02"},
+					{"type": "sip", "position": 400, "name": "SIP55_SFEL01.04","offset2d": [30, -40], "labelReverse": [90, 1210, 150]},				
 					{"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, 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": "BPM_SFEL01.04", "labelReverse": [90, 1350, 130]},
+					{"type": "bpm", "position": 1885, "name": "BPM_SFEL01.04", "labelReverse": [90, 1210, 130]},
 					{"type": "blm", "position": 1775, "name": "BLM_BPM_SFEL01.04"},
 					{"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, 1070, 200]},
+					{"type": "sip", "position": 3527, "name": "SIP55_SFEL01.05","offset2d": [30, -40], "labelReverse": [90, 1210, 150]},	
 					{"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": "cbpm", "position": 4400, "name": "CBPM_SFEL01.01", "labelReverse": [90, 1300, 130]},
 					{"type": "cm", "position": 4750, "name": "CM_SFEL01.01", "labelReverse": [90, 1150, 170]},
-					{"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": "tent", "position": 5800, "name": "","offset2d": [0, -780]},
+					{"type": "sip", "position": 5650, "name": "SIP55_SFEL01.06","offset2d": [30, -40], "labelReverse": [90, 1260, 150]},
 					{"type": "SOL", "position": 6000, "name": "BAM_SFEL01.01", "labelReverse": [90, 1250, 150]},
-					{"type": "cbpm", "position": 6350, "name": "CBPM_SFEL01.02", "labelReverse": [90, 1300, 130]},
+					{"type": "cbpm", "position": 6550, "name": "CBPM_SFEL01.02", "labelReverse": [90, 1300, 130]},
 					{"type": "EOS", "position": 6935, "name": "EOS_SFEL01.01"},
-					{"type": "sip", "position": 7804, "name": "SIP150_SFEL01.02", "offset2d": [30, -40], "labelReverse": [90, 1280, 150], "embedded": ["SIP55_SFEL01.06"]},
+					{"type": "sip", "position": 7004, "name": "SIP150_SFEL01.01", "offset2d": [30, -40], "labelReverse": [90, 1290, 150], "embedded": ["SIP55_SFEL01.06"]},
 					{"type": "vlv", "position": 8230, "name": "VLV_SFEL01.02", "labelReverse": [90, 1200, 150]},
 					{"type": "cbpm", "position": 8604, "name": "CBPM_SFEL01.03", "labelReverse": [90, 1300, 130]},
 					{"type": "SFEL01", "position": 8675, "name": "SFEL01"},
@@ -824,58 +834,62 @@
 					{"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]}
+					{"type": "flsc", "position": 12602, "name": "MSCR_FEL01.01", "labelReverse": [90, 1270, 250]}
 				]
 			},
 			{
-				"start": {"x": 43690, "z": -7809},
-				"bending": {"type": "bending", "label": "show", "rotateY": "-PI/2", "length": 413, "name": "B_EEHG_FEL01.01", "labelReverse": [90, 1400, 50]},
+				"start": {"x": 43990, "z": -7809},
+				"bending": {"type": "bending", "label": "show", "rotateY": "-PI/2", "length": 413, "name": "B_EEHG_FEL01.01", "labelReverse": [90, 450, 0, 0]},
 				"chamber": {"type": "chamber"},
 				"components": [
+					{"type": "tent", "position": 720, "name": "","offset2d": [0, -780]}
 				]
 			},
 			{
 				"start": {"x": 45099, "z": -7809},
-				"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 412, "name": "B_EEHG_FEL01.02", "labelReverse": [90, 1400, 50]},
+				"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 412, "name": "B_EEHG_FEL01.02", "labelReverse": [90, 450, 0, 0]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "flsc", "position": 370, "name": "MSCR_EEHG_FEL01.01", "labelReverse": [90, 1650, 250], "offset2d": [-220, 0]}
+					
+					{"type": "flsc", "position": 370, "name": "MSCR_EEHG_FEL01.01", "labelReverse": [90, 1590, 250], "offset2d": [-220, 0]}
+					
 				]
 			},
 			{
 				"start": {"x": 45779, "z": -7809},
-				"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 412, "name": "B_EEHG_FEL01.03", "labelReverse": [90, 1400, 50]},
+				"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 412, "name": "B_EEHG_FEL01.03", "labelReverse": [90, 450, 50, 0]},
 				"chamber": {"type": "chamber"},
 				"components": [
+					
 				]
 			},
 			{
-				"start": {"x": 47188, "z": -7809},
-				"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 412, "name": "B_EEHG_FEL01.04", "labelReverse": [90, 1400, 50]},
+				"start": {"x": 46788, "z": -7809},
+				"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 412, "name": "B_EEHG_FEL01.04", "labelReverse": [90, 450, 0, 0]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "cbpm", "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_FEL01.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": "correctorfermi", "position": 1000, "ps": ["PSCH_FEL01.02","PSCV_FEL01.02"], "name": "CHV_FEL01.02", "labelReverse": [90, 1220, 200]},
+					{"type": "sip", "position": 1250, "name": "SIP55_FEL01.02","offset2d": [30, -40], "labelReverse": [90, 1250, 150]},
+					{"type": "flsc", "position": 1437, "name": "MSCR_FEL01.02", "labelReverse": [90, 1300, 200]},
 					{"type": "blm", "position": 1437, "name": "BLM_MSCR_FEL01.02"},
 					{"type": "BAM", "position": 1283, "name": "BAM_FEL01.01"},
-					{"type": "undulator", "position": 2142, "name": "ID_IUFEL01.03  (MOD01.02)", "labelReverse": [90, 1990, 450]},
+					{"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": "cbpm", "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": "sip", "position": 5050, "name": "SIP55_FEL01.03","offset2d": [30, -40], "labelReverse": [90, 1110, 150]},
 					{"type": "flsc", "position": 5523, "name": "MSCR_IUFEL01.02", "labelReverse": [90, 1300, 250]},
-					{"type": "undulator", "position": 6340, "name": "ID_IUFEL01.04  (RAD01.03)", "labelReverse": [90, 1990, 450]},
+					{"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": "cbpm", "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_IUFEL01.05  (RAD01.04)", "labelReverse": [90, 1990, 450]},
+					{"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": 11203, "name": "PHSH_IUFEL01.04", "labelReverse": [90, 1300, 100]},
 					{"type": "cbpm", "position": 11651, "name": "CBPM_IUFEL01.04", "labelReverse": [90, 1300, 130]},
@@ -883,28 +897,27 @@
 					{"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_IUFEL01.06  (RAD01.05)", "labelReverse": [90, 1990, 450]},
+					{"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": "cbpm", "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": "flsc", "position": 16755, "name": "MSCR_IUFEL01.05", "labelReverse": [90, 1300, 250]},
-					{"type": "undulator", "position": 17484, "name": "ID_IUFEL01.07  (RAD01.06)", "labelReverse": [90, 1990, 450]},
+					{"type": "vlv", "position": 16405, "name": "VLVM_IUFEL01.02", "labelReverse": [90, 1265, 150]},
+					{"type": "sip", "position": 16655, "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": "cbpm", "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_IUFEL01.08  (RAD01.07)", "labelReverse": [90, 1990, 450]},
+					{"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": "cbpm", "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": "flsc", "position": 24206, "name": "MSCR_IUFEL01.07", "labelReverse": [90, 1300, 250]},
-					{"type": "undulator", "position": 24904, "name": "ID_IUFEL01.09  (RAD01.08)", "labelReverse": [90, 1990, 450]},
+					{"type": "undulator", "position": 24904, "name": "ID_FEL01.09  (RAD01.08)", "labelReverse": [90, 1990, 450]},
 					{"type": "blm", "position": 24904, "name": "BLM_ID_FEL01.09"},
 					{"type": "cbpm", "position": 26532, "name": "CBPM_IUFEL01.08", "labelReverse": [90, 1300, 130]},
 					{"type": "quadrupolefermi", "position": 27021, "name": "Q_IUFEL01.08", "labelReverse": [90, 1070, 200]},
@@ -923,27 +936,30 @@
 					{"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", "offset2d": [30, -40], "labelReverse": [90, 1310, 150], "embedded": ["SIP75_MBDFEL01.03"]},
+					{"type": "sip", "position": 33411, "name": "SIP75_MBDFEL01.03", "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", "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": "sip", "position": 36186, "name": "SIP55_MBDFEL01.04","offset2d": [30, -40], "labelReverse": [90, 1310, 150]},
+					{"type": "bpm", "position": 37886, "name": "BPM_MBD_FEL01.02", "labelReverse": [90, 1350, 120]},
 					{"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, 1310, 150]},
+					{"type": "sip", "position": 39476, "name": "SIP55_MBDFEL01.05","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, 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, -700, 0], "offset2d": [0, -200]}
+					{"type": "xxx", "position": 42596, "name": "RPB_MBD_FEL01.01"},
+					{"type": "xxx", "position": 42996, "name": "HSCR_MBD_FEL01.01"},
+     				{"type": "sip", "position": 45300, "name": "SIP55_MBDFEL01.07","offset2d": [30, -40], "labelReverse": [90, 1310, 150]},
+     				{"type": "plc", "position": 45496, "name": "SPIN-FE.01", "offset3d": [0, -700, 0], "offset2d": [0, -200]},
+					{"type": "sip", "position": 47296, "name": "SIP55_MBDFEL01.08","offset2d": [30, -40], "labelReverse": [90, 1310, 150]}
 				]
 			},
 			{
 				"start": {"x": 88710, "z": -7809},
-				"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 1122, "name": "B_MBD_FEL01.01"},
+				"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 1122, "name": "B_MBD_FEL01.01", "labelReverse": [90, 450, 0, 0]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "blm", "position": 100, "name": "BLM_B_MBD_FEL01.01_L"},
@@ -967,7 +983,7 @@
 			},
 			{
 				"start": {"x": 95500, "z": -5774},
-				"bending": {"type": "bending", "label": "show", "rotateY": "PI/2", "length": 2400, "name": "B_MBD.01", "labelReverse": [90, 950, 50]},
+				"bending": {"type": "bending", "label": "show", "rotateY": "PI/2", "length": 2400, "name": "B_MBD.01", "labelReverse": [90, 400, 300, 0]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "blm", "position": 100, "name": "BLM_B_MBD.01_L"},
@@ -989,8 +1005,8 @@
 					{"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, 1050, 200]},
-     				{"type": "cm", "position": 4445, "name": "CM_MBD.01"},
+					{"type": "cm", "position": 4245, "name": "CM_MBD.01"},
+					{"type": "sip", "position": 4745, "name": "SIP150_MBD.02","offset2d": [30, -40], "labelReverse": [90, 1050, 200]},
 					{"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"},
@@ -1030,7 +1046,7 @@
 			},
 			{
 				"start": {"x": 16179, "z": -6559},
-				"bending": {"type": "bending", "label": "show", "rotateY": "-PI/2", "length": 250, "name": "B_SFEL02.01", "labelReverse": [90, 1050, 50]},
+				"bending": {"type": "bending", "label": "show", "rotateY": "-PI/2", "length": 250, "name": "B_SFEL02.01", "labelReverse": [90, -1290, 50, 0]},
 				"components": [
 					{"type": "blm", "position": 100, "name": "BLM_B_SFEL02.01", "labelReverse": true},
 					{"type": "quadrupolefermi", "position": 800, "name": "Q_SFEL02.01", "labelReverse": [90, -350, 200]},
@@ -1051,7 +1067,7 @@
 			},
 			{
 				"start": {"x": 20972, "z": -6810},
-				"bending": {"type": "bending", "label": "show", "rotateY": "-PI", "length": 250, "name": "B_SFEL02.02", "labelReverse": [90, -380, 0]},
+				"bending": {"type": "bending", "label": "show", "rotateY": "-PI", "length": 250, "name": "B_SFEL02.02", "labelReverse": [90, -1310, 40, 0]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "blm", "position": 100, "name": "BLM_B_SFEL02.02", "labelReverse": [90, -250, 250]},
@@ -1077,6 +1093,7 @@
 					{"type": "cbpm", "position": 5750, "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": "tent", "position": 6335, "name": "","offset2d": [0, -40]},
 					{"type": "EOS", "position": 6935, "name": "EOS_SFEL02.01", "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]},
@@ -1103,7 +1120,6 @@
 					{"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": "cbpm", "position": 23851, "name": "CBPM_FEL02.02", "labelReverse": [90, -350, 150]},
 					{"type": "quadrupolefermi", "position": 24061, "name": "Q_FEL02.02", "labelReverse": [90, -350, 200]},
@@ -1112,14 +1128,14 @@
 			},
 			{
 				"start": {"x": 45868, "z": -6811},
-				"bending": {"type": "bending", "label": "show", "rotateY": "-PI/2", "length": 320, "name": "B_FEL02.01", "labelReverse": [90, -350, 0]},
+				"bending": {"type": "bending", "label": "show", "rotateY": "-PI/2", "length": 320, "name": "B_FEL02.01", "labelReverse": [90, -1190, 40, 0]},
 				"chamber": {"type": "chamber"},
 				"components": [
 				]
 			},
 			{
 				"start": {"x": 46328, "z": -6811},
-				"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 320, "name": "B_FEL02.02", "labelReverse": [90, -350, 0]},
+				"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 320, "name": "B_FEL02.02", "labelReverse": [90, -1190, 40, 0]},
 				"chamber": {"type": "chamber"},
 				"components": [
 				{"type": "flsc", "position": 250, "name": "EEHG_FEL2.0", "offset3d": [200, 0, 0], "labelReverse": [90, -350, 250]}
@@ -1128,14 +1144,14 @@
 			},
 			{
 				"start": {"x": 47188, "z": -6811},
-				"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 320, "name": "B_FEL02.03", "labelReverse": [90, -350, 0]},
+				"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 320, "name": "B_FEL02.03", "labelReverse": [90, -1190, 40, 0]},
 				"chamber": {"type": "chamber"},
 				"components": [
 				]
 			},
 			{
 				"start": {"x": 47648, "z": -6811},
-				"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 320, "name": "B_FEL02.04", "labelReverse": [90, -350, 0]},
+				"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 320, "name": "B_FEL02.04", "labelReverse": [90, -1190, 40, 0]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "cbpm", "position": 556, "name": "CBPM_FEL02.03", "labelReverse": [90, -350, 150]},
@@ -1198,7 +1214,6 @@
 					{"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": "flsc", "position": 32203, "name": "MSCR_IUFEL02.09", "labelReverse": [90, -350, 250]},
 					{"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},
@@ -1235,7 +1250,7 @@
 			},
 			{
 				"start": {"x": 92100, "z": -6811},
-				"bending": {"type": "bending", "label": "show", "length": 1122, "name": "B_MBD_FEL02.01", "labelReverse": [90, 1250, 0]},
+				"bending": {"type": "bending", "label": "show", "length": 1122, "name": "B_MBD_FEL02.01", "labelReverse": [90, 350, 200, 0]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "blm", "position": 100, "name": "BLM_B_MBD_FEL02.01_L"},
@@ -1340,12 +1355,12 @@
 				"bending": {"type": "mrc", "label": "show", "name": "MRC_POS_TMR.05", "labelReverse": [0, -300, -100]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "vlv", "position": 590, "name": "VLV_POS_TMR.09", "labelReverse": [90, 1900, 180]}
+					{"type": "vlv", "position": 590, "name": "VLV_POS_TMR.09", "labelReverse": [90, 10, 180, 0]}
 				]
 			},
 			{
 				"start": {"x": 155000, "z": -10750},
-				"bending": {"type": "exp", "label": "show", "name": "TIMER", "labelReverse": [90, 800, 50]},
+				"bending": {"type": "exp", "label": "show", "name": "TIMER"},
 				"chamber": {"type": "chamber"}
 			},
 			{
@@ -1365,10 +1380,10 @@
 			},
 			{
 				"start": {"x": 154100, "z": -11750},
-				"bending": {"type": "mrc", "label": "show", "name": "MRC_POS_TMRA.03", "labelReverse": [90, 2200, 100]},
+				"bending": {"type": "mrc", "label": "show", "name": "MRC_POS_TMRA.03"},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "vlv", "position": 820, "name": "VLV_POS_TMRA.06", "labelReverse": [90, 1950, 210]}
+					{"type": "vlv", "position": 820, "name": "VLV_POS_TMRA.06", "labelReverse": [90, 1050, 250]}
 				]
 			},
 			{
@@ -1380,7 +1395,7 @@
 			},
 			{
 				"start": {"x": 151200, "z": -10930},
-				"bending": {"type": "mrc", "label": "show", "name": "MRC_POS_TMRA.01", "labelReverse": [95, 2200, 100]},
+				"bending": {"type": "mrc", "label": "show", "name": "MRC_POS_TMRA.01"},
 				"components": [
 					{"type": "vlv", "position": 400, "name": "VLV_POS_TMRA.02", "labelReverse": [85, 2000, 200]}
 				]
@@ -1394,7 +1409,7 @@
 			},
 			{
 				"start": {"x": 152100, "z": -11200},
-				"bending": {"type": "mrc", "label": "show", "name": "MRC_POS_TMRA.02", "labelReverse": [90, 2200, 100]},
+				"bending": {"type": "mrc", "label": "show", "name": "MRC_POS_TMRA.02"},
 				"components": [
 					{"type": "vlv", "position": 400, "name": "VLV_POS_TMRA.03", "labelReverse": [80, 2000, 200]}
 				]
@@ -1406,7 +1421,7 @@
 			{
 				"start": {"x": 153900, "z": -11690},
 				"components": [
-					{"type": "vlv", "position": 700, "name": "VLV_POS_TMRA.05", "labelReverse": [95, 2050, 150]}
+					{"type": "vlv", "position": 700, "name": "VLV_POS_TMRA.05", "labelReverse": [95, 1150, 150]}
 				]
 			},
 			{
@@ -1436,7 +1451,7 @@
 				"bending": {"type": "mrc", "label": "show", "name": "MRC_POS_TMRB.03", "labelReverse": [25, 2000, 300]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "vlv", "position": 300, "name": "VLV_POS_TMRB.07", "labelReverse": [235, 2050, 0]}
+					{"type": "vlv", "position": 300, "name": "VLV_POS_TMRB.07", "labelReverse": [235, 1150, 0]}
 				]
 			},
 			{
@@ -1446,7 +1461,7 @@
 			{
 				"start": {"x": 154200, "z": -9740},
 				"components": [
-					{"type": "vlv", "position": 650, "name": "VLV_POS_TMRB.06", "labelReverse": [226, 2050, 0]}
+					{"type": "vlv", "position": 650, "name": "VLV_POS_TMRB.06", "labelReverse": [226, 1150, 0]}
 				]
 			},
 			{
@@ -1501,29 +1516,29 @@
 			},
 			{
 				"start": {"x": 157500, "z": -8650},
-				"bending": {"type": "mrc", "label": "show", "name": "MRC_POS_TMX.01", "labelReverse": [-90, 2000, 150]},
+				"bending": {"type": "mrc", "label": "show", "name": "MRC_POS_TMX.01", "labelReverse": [5, 0, 600, 0]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "vlv", "position": 600, "name": "VLV_POS_TMX.03", "labelReverse": [90, 1800, 200]}
+					{"type": "vlv", "position": 600, "name": "VLV_POS_TMX.03", "labelReverse": [95, 1800, 200]}
 				]
 			},
 			{
 				"start": {"x": 158800, "z": -8950},
-				"bending": {"type": "exp", "label": "show", "name": "TIMEX"},
+				"bending": {"type": "exp", "label": "show", "name": "TIMEX", "labelReverse": [95, 200, 250, 0]},
 				"chamber": {"type": "chamber"}
 			},
 
 			{
 				"start": {"x": 142700, "z": -7550},
 				"components": [
-					{"type": "vlv", "position": 4000, "name": "VLV_POS_DPI.01", "labelReverse": [180, 1900, 200]},
-					{"type": "vlv", "position": 10000, "name": "VLV_POS_DPI.02", "labelReverse": [180, 1800, 200]},
-					{"type": "vlv", "position": 20000, "name": "VLV_POS_DPI.03", "labelReverse": [195, 1800, 200]}
+					{"type": "vlv", "position": 4000, "name": "VLV_POS_DPI.01", "labelReverse": [180, 100, 200, 0]},
+					{"type": "vlv", "position": 10000, "name": "VLV_POS_DPI.02", "labelReverse": [180, 100, 200, 0]},
+					{"type": "vlv", "position": 20000, "name": "VLV_POS_DPI.03", "labelReverse": [170, 100, 600, 0]}
 				]
 			},
 			{
 				"start": {"x": 164400, "z": -7550},
-				"bending": {"type": "mrc", "label": "show", "name": "MRC_POS_DPI.03", "labelReverse": [15, 1800, 300]},
+				"bending": {"type": "mrc", "label": "show", "name": "MRC_POS_DPI.03", "labelReverse": [5, 100, 600, 0]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "vlv", "position": 500, "name": "VLV_POS_DPI.04", "labelReverse": [90, 1800, 200]}
@@ -1544,10 +1559,10 @@
 			},
 			{
 				"start": {"x": 161100, "z": -6250},
-				"bending": {"type": "mrc", "label": "show", "name": "MRC_POS_LDM.03", "labelReverse": true},
+				"bending": {"type": "mrc", "label": "show", "name": "MRC_POS_LDM.03", "labelReverse": [185, 50, 600, 0]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "vlv", "position": 500, "name": "VLV_POS_LDM.03", "labelReverse": [90, -150, 200]}
+					{"type": "vlv", "position": 500, "name": "VLV_POS_LDM.03", "labelReverse": [185, 50, 250, 0]}
 				]
 			},
 			{
@@ -2299,22 +2314,22 @@
 			{
 				"start": {"x": 63500, "y": 4000, "z": -7000},
 				"components": [
-					{"type": "rps", "position": 30300, "name": "RPS_USA.01", "embedded":[
+					{"type": "rps", "position": 30300, "name": "RPS_USA.01","reverse2d" : true , "embedded":[
 						"PSTRMCW_FEL01.01","PSTRMCW_FEL01.02","PSCV_FEL01.01","PSCH_FEL01.01", "PSQ_FEL01.01","PSCID_FEL01.01","PSCID_FEL01.02","PSCID_FEL01.03","PSCID_FEL01.04", "PSCID_FEL01.05","PSCID_FEL01.06","PSCID_FEL01.07","PSCID_FEL01.08", "PSCID_FEL01.09","PSCID_FEL01.10","PSCID_FEL01.11","PSCID_FEL01.12","PSBDS_FEL01.01"
 					]},
-					{"type": "rps", "position": 29700, "name": "RPS_USA.02", "embedded":[
+					{"type": "rps", "position": 29700, "name": "RPS_USA.02","reverse2d" : true, "embedded":[
 						"PSTRMCB_FEL01.01","PSTRMCB_FEL01.02","PSTRMCB_FEL01.03","PSTRMCB_FEL01.04","PSCID_FEL01.13","PSCID_FEL01.14","PSCID_FEL01.15","PSCID_FEL01.16", "PSCID_FEL01.17","PSCID_FEL01.18","PSCID_FEL01.19","PSCID_FEL01.20", "PSCID_FEL01.21","PSCID_FEL01.22","PSCID_FEL01.23","PSCID_FEL01.24", "PSCID_FEL01.25","PSCID_FEL01.26","PSCID_FEL01.27","PSCID_FEL01.28","PSBDS_FEL01.02"
 					]},
-					{"type": "rps", "position": 29100, "name": "RPS_USA.03", "embedded":[
+					{"type": "rps", "position": 29100, "name": "RPS_USA.03","reverse2d" : true, "embedded":[
 						"PSCV_IUFEL01.01","PSCH_IUFEL01.01","PSCV_IUFEL01.02","PSCH_IUFEL01.02", "PSCV_IUFEL01.03","PSCH_IUFEL01.03","PSCV_IUFEL01.04","PSCH_IUFEL01.04", "PSQ_IUFEL01.01","PSQ_IUFEL01.02","PSQ_IUFEL01.03","PSQ_IUFEL01.04", "PSQ_IUFEL01.05","PSQ_IUFEL01.06","PSQ_IUFEL01.07","PSQ_IUFEL01.08", "PSQ_FEL02.01","PSQ_FEL02.02","PSQ_FEL02.03","PSQ_FEL02.04"
 					]},
-					{"type": "rps", "position": 28500, "name": "RPS_USA.04", "embedded":[
+					{"type": "rps", "position": 28500, "name": "RPS_USA.04","reverse2d" : true, "embedded":[
 						"PSCV_IUFEL01.05","PSCH_IUFEL01.05","PSCV_IUFEL01.06","PSCH_IUFEL01.06", "PSCV_IUFEL01.07","PSCH_IUFEL01.07","PSCV_IUFEL01.08","PSCH_IUFEL01.08", "PSTRMCB_FEL02.01","PSTRMCB_FEL02.01","PSTRMCB_FEL02.03","PSTRMCB_FEL02.04", "PSTRMCW_FEL02.01","PSTRMCW_FEL02.02","PSCV_FEL02.01","PSCH_FEL02.01", "PSCV_FEL02.02","PSCH_FEL02.02","PSCV_FEL02.03","PSCH_FEL02.03"
 					]},
-					{"type": "rps", "position": 27900, "name": "RPS_USA.05", "embedded":[
+					{"type": "rps", "position": 27900, "name": "RPS_USA.05","reverse2d" : true, "embedded":[
 						"PSCV_FEL02.04","PSCH_FEL02.04","PSTRMCW_FEL02.03","PSTRMCW_FEL02.04", "PSCID_FEL02.01","PSCID_FEL02.02","PSCID_FEL02.03","PSCID_FEL02.04","PSCID_FEL02.05","PSCID_FEL02.06","PSCID_FEL02.07","PSCID_FEL02.08"
 					]},
-					{"type": "rv", "position": 27100, "name": "RV_USA.01", "embedded":[
+					{"type": "rv", "position": 27100, "name": "RV_USA.01","reverse2d" : true, "embedded":[
 						"PSSIP_USA.01","PSSIP55_FEL01.01","PSSIP55_IUFEL01.02","PSSIP55_IUFEL01.05","PSSIP55_IUFEL01.08",
 						"PSSIP_USA.02","GIP500_FEL01.01","PSSIP55_IUFEL01.03","PSSIP55_IUFEL01.06",
 						"PSSIP_USA.03","PSSIP55_FEL01.02","PSSIP55_IUFEL01.04","PSSIP55_IUFEL01.07",
@@ -2322,29 +2337,29 @@
 						"TPG_USA.02","VGPE_IUFEL01.02","VGPI_IUFEL01.02","VGPE_IUFEL01.03"
 				
 					]},
-					{"type": "rc", "position": 26500, "name": "RC_USA.01", "embedded":["EC-PS-USA-01","USA YAMS 02","USA YAMS 07","SPIN_USA_01"]},
+					{"type": "rc", "position": 26500, "name": "RC_USA.01","reverse2d" : true, "embedded":["EC-PS-USA-01","USA YAMS 02","USA YAMS 07","SPIN_USA_01"]},
 					
-					{"type": "rid", "position": 25900, "name": "RID_USA.01", "embedded":["ID_FEL02.01"]},
-					{"type": "rid", "position": 25300, "name": "RID_USA.02", "embedded":["ID_FEL02.02"]},
-					{"type": "rid", "position": 24700, "name": "RID_USA.03", "embedded":["ID_FEL02.03"]},
-					{"type": "rid", "position": 24100, "name": "RID_USA.04", "embedded":["ID_FEL01.01"]},
-					{"type": "rid", "position": 23500, "name": "RID_USA.05", "embedded":["ID_FEL02.04"]},
+					{"type": "rid", "position": 25900, "name": "RID_USA.01","reverse2d" : true, "embedded":["ID_FEL02.01"]},
+					{"type": "rid", "position": 25300, "name": "RID_USA.02","reverse2d" : true, "embedded":["ID_FEL02.02"]},
+					{"type": "rid", "position": 24700, "name": "RID_USA.03","reverse2d" : true, "embedded":["ID_FEL02.03"]},
+					{"type": "rid", "position": 24100, "name": "RID_USA.04","reverse2d" : true, "embedded":["ID_FEL01.01"]},
+					{"type": "rid", "position": 23500, "name": "RID_USA.05","reverse2d" : true, "embedded":["ID_FEL02.04"]},
 						
 
-					{"type": "rc", "position": 21500, "name": "RPHOM_USA.01"}, 
-					{"type": "rid", "position": 20900, "name": "RID_USA.07", "embedded":["ID_FEL02.05"]},
-					{"type": "rid", "position": 20300, "name": "RID_USA.08", "embedded":["ID_FEL01.03"]},
-					{"type": "rid", "position": 19700, "name": "RID_USA.09", "embedded":["ID_FEL02.06"]},
-					{"type": "rid", "position": 19100, "name": "RID_USA.10", "embedded":["ID_FEL01.04"]},
-					{"type": "rid", "position": 18500, "name": "RID_USA.11", "embedded":["ID_FEL02.07"]},
-					{"type": "rid", "position": 17900, "name": "RID_USA.12", "embedded":["ID_FEL01.05"]},
-					{"type": "rid", "position": 17300, "name": "RID_USA.13", "embedded":["ID_FEL02.08"]},
-					{"type": "rid", "position": 16700, "name": "RID_USA.14", "embedded":["ID_FEL01.06"]},
-					{"type": "rd", "position": 16100, "name": "RD_USA.01", "embedded":[
+					{"type": "rc", "position": 21500, "name": "RPHOM_USA.01","reverse2d" : true}, 
+					{"type": "rid", "position": 20900, "name": "RID_USA.07","reverse2d" : true, "embedded":["ID_FEL02.05"]},
+					{"type": "rid", "position": 20300, "name": "RID_USA.08","reverse2d" : true, "embedded":["ID_FEL01.03"]},
+					{"type": "rid", "position": 19700, "name": "RID_USA.09","reverse2d" : true, "embedded":["ID_FEL02.06"]},
+					{"type": "rid", "position": 19100, "name": "RID_USA.10","reverse2d" : true, "embedded":["ID_FEL01.04"]},
+					{"type": "rid", "position": 18500, "name": "RID_USA.11","reverse2d" : true, "embedded":["ID_FEL02.07"]},
+					{"type": "rid", "position": 17900, "name": "RID_USA.12","reverse2d" : true, "embedded":["ID_FEL01.05"]},
+					{"type": "rid", "position": 17300, "name": "RID_USA.13","reverse2d" : true, "embedded":["ID_FEL02.08"]},
+					{"type": "rid", "position": 16700, "name": "RID_USA.14","reverse2d" : true, "embedded":["ID_FEL01.06"]},
+					{"type": "rd", "position": 16100, "name": "RD_USA.01","reverse2d" : true, "embedded":[
 						"BAM_SFEL01.01","PSBPM_FEL01.01","PSBPM_FEL01.02","PSBPM_IUFEL01.02","EC-CBPM-USA-01"
 					]},
-					{"type": "rc", "position": 15500, "name": "RC_USA.02", "embedded":["EC-MPS-USA-01","MAST MPS_USA_01"]},
-					{"type": "rv", "position": 14700, "name": "RV_USA.02", "embedded":[
+					{"type": "rc", "position": 15500, "name": "RC_USA.02","reverse2d" : true, "embedded":["EC-MPS-USA-01","MAST MPS_USA_01"]},
+					{"type": "rv", "position": 14700, "name": "RV_USA.02","reverse2d" : true, "embedded":[
 						"PSSIP_USA.04","PSSIP55_FEL02.01","PSSIP55_IUFEL02.01","PSSIP55_FEL02.03","PSSIP55_FEL02.05",
 						"PSSIP_USA.05","PSSIP55_FEL02.02","PSSIP55_IUFEL02.02","PSSIP55_FEL02.04","PSSIP55_FEL02.06",
 						"PSSIP_USA.06","PSSIP55_IUFEL02.03","PSSIP55_IUFEL02.05","PSSIP55_IUFEL02.07","PSSIP55_IUFEL02.09",
@@ -2355,16 +2370,16 @@
 						"sds-vac-usa-02"
 					]},
 
-					{"type": "rid", "position": 12700, "name": "RID_USA.15", "embedded":["ID_FEL02.09"]},
-					{"type": "rid", "position": 12100, "name": "RID_USA.16", "embedded":["ID_FEL01.07"]},
-					{"type": "rid", "position": 11500, "name": "RID_USA.17", "embedded":["ID_FEL02.10"]},
+					{"type": "rid", "position": 12700, "name": "RID_USA.15","reverse2d" : true, "embedded":["ID_FEL02.09"]},
+					{"type": "rid", "position": 12100, "name": "RID_USA.16","reverse2d" : true, "embedded":["ID_FEL01.07"]},
+					{"type": "rid", "position": 11500, "name": "RID_USA.17","reverse2d" : true, "embedded":["ID_FEL02.10"]},
 					
-					{"type": "rid", "position": 10300, "name": "RID_USA.19", "embedded":["ID_FEL02.11"]},
-					{"type": "rc", "position": 9700, "name": "RPHOM_USA. 02"},
-					{"type": "rd", "position": 9100, "name": "RD_USA.02", "embedded":[
+					{"type": "rid", "position": 10300, "name": "RID_USA.19","reverse2d" : true, "embedded":["ID_FEL02.11"]},
+					{"type": "rc", "position": 9700, "name": "RPHOM_USA. 02","reverse2d" : true},
+					{"type": "rd", "position": 9100, "name": "RD_USA.02","reverse2d" : true, "embedded":[
 						"PSBPM_IUFEL01.03","PSBPM_IUFEL01.04","PSBPM_IUFEL01.05","EC-IUFEL-USA-02"]},
-					{"type": "rc", "position": 8500, "name": "RC_USA.03", "embedded":["EC-ID-USA-01","MASTIN_USA.01"]},
-					{"type": "rv", "position": 7700, "name": "RV_USA.03", "embedded":[
+					{"type": "rc", "position": 8500, "name": "RC_USA.03","reverse2d" : true, "embedded":["EC-ID-USA-01","MASTIN_USA.01"]},
+					{"type": "rv", "position": 7700, "name": "RV_USA.03","reverse2d" : true, "embedded":[
 						"PSSIP_USA.14","PSSIP75_MBD_FEL01.01","PSSIP55_MBD_FEL01.05",
 						"PSSIP_USA.15","PSSIP55_MBD_FEL01.02","PSSIP55_MBD_FEL01.06",
 						"PSSIP_USA.16","PSSIP55_MBD_FEL01.03","PSSIP55_MBD_FEL01.07",
@@ -2379,27 +2394,27 @@
 						"MASTIN_USA.01" 
 					]},
 					
-					{"type": "rid", "position": 6500, "name": "RID_USA.21", "embedded":["ID_FEL01.08"]},
-					{"type": "rid", "position": 5900, "name": "RID_USA.22", "embedded":["ID_FEL01.09"]},
+					{"type": "rid", "position": 6500, "name": "RID_USA.21","reverse2d" : true, "embedded":["ID_FEL01.08"]},
+					{"type": "rid", "position": 5900, "name": "RID_USA.22","reverse2d" : true, "embedded":["ID_FEL01.09"]},
 
-					{"type": "rd", "position": 4300, "name": "RD_USA.03", "embedded":[
+					{"type": "rd", "position": 4300, "name": "RD_USA.03","reverse2d" : true, "embedded":[
 						"PSMSCR_FEL01.01","PSMSCR_EEHG_FEL01.01","PSMSCR_FEL01.02","PSMSCR_IUFEL01.02","PSMSCR_IUFEL01.03","PSMSCR_IUFEL01.04","PSMSCR_IUFEL01.06","PSMSCR_IUFEL01.08","PSMSCR_FEL02.01","PSMSCR_IUFEL02.02","PSMSCR_FEL02.02","PSMSCR_FEL02.03","PSMSCR_IUFEL02.03","PSMSCR_IUFEL02.05","PSMSCR_IUFEL02.07","PSMSCR_IUFEL02.08","PSMSCR_IUFEL02.09","EC-SE-USA-01","CMM-IUFEL-USA-01"
 					]},
-					{"type": "rc", "position": 3700, "name": "RC_USA.04", "embedded":["EC-PS-USA-02","PDU-RC-USA-04"]},
-					{"type": "rps", "position": 3100, "name": "RPS_USA.06", "embedded":[
+					{"type": "rc", "position": 3700, "name": "RC_USA.04","reverse2d" : true, "embedded":["EC-PS-USA-02","PDU-RC-USA-04"]},
+					{"type": "rps", "position": 3100, "name": "RPS_USA.06","reverse2d" : true, "embedded":[
 						"PSCID_FEL02.13","PSCID_FEL02.14","PSCID_FEL02.15","PSCID_FEL02.16", "PSCID_FEL02.17","PSCID_FEL02.18","PSCID_FEL02.19","PSCID_FEL02.20", "PSCID_FEL02.21","PSCID_FEL02.22","PSCID_FEL02.23","PSCID_FEL02.24", "PSCID_FEL02.25","PSCID_FEL02.26","PSCID_FEL02.27","PSCID_FEL02.28", "PSCID_FEL02.29","PSCID_FEL02.30","PSCID_FEL02.31","PSCID_FEL02.32", "PSCID_FEL02.33","PSCID_FEL02.34","PSCID_FEL02.35","PSCID_FEL02.36"
 					]},
-					{"type": "rps", "position": 2500, "name": "RPS_USA.07", "embedded":[
+					{"type": "rps", "position": 2500, "name": "RPS_USA.07","reverse2d" : true, "embedded":[
 						"PSCID_FEL02.37","PSCID_FEL02.38","PSCID_FEL02.39","PSCID_FEL02.40", "PSCID_FEL02.41","PSCID_FEL02.42","PSCID_FEL02.43","PSCID_FEL02.44", "PSCV_IUFEL02.01","PSCH_IUFEL02.01","PSCV_IUFEL02.02","PSCH_IUFEL02.02", "PSCV_IUFEL02.03","PSCH_IUFEL02.03","PSCV_IUFEL02.04","PSCH_IUFEL02.04"
 					]},
-					{"type": "rps", "position": 1900, "name": "RPS_USA.08", "embedded":[
+					{"type": "rps", "position": 1900, "name": "RPS_USA.08","reverse2d" : true, "embedded":[
 						"PSCV_IUFEL02.05","PSCH_IUFEL02.05","PSCV_IUFEL02.06","PSCH_IUFEL02.06", "PSCV_IUFEL02.07","PSCH_IUFEL02.07","PSCV_IUFEL02.08","PSCH_IUFEL02.08", "PSCV_IUFEL02.09","PSCH_IUFEL02.09","PSCV_IUFEL02.10","PSCH_IUFEL02.10", "PSQ_IUFEL02.01","PSQ_IUFEL02.02","PSQ_IUFEL02.03","PSQ_IUFEL02.04", "PSQ_IUFEL02.05","PSQ_IUFEL02.06","PSQ_IUFEL02.07","PSQ_IUFEL02.08", "PSQ_IUFEL02.09","PSQ_IUFEL02.10"
 					]},
-					{"type": "rd", "position": 1300, "name": "RD_USA.04", "embedded":[
+					{"type": "rd", "position": 1300, "name": "RD_USA.04","reverse2d" : true, "embedded":[
 						"PSBPM_IUFEL01.06","PSBPM_IUFEL01.07","PSBPM_IUFEL01.08","EC-CBPM-USA-02"
 					]},
-					{"type": "rc", "position": 700, "name": "RC_USA.05", "embedded":["EC-VAC-USA-01","SPIN_USA.02"]},
-					{"type": "rv", "position": -100, "name": "RV_USA.04", "embedded":[
+					{"type": "rc", "position": 700, "name": "RC_USA.05","reverse2d" : true, "embedded":["EC-VAC-USA-01","SPIN_USA.02"]},
+					{"type": "rv", "position": -100, "name": "RV_USA.04","reverse2d" : true, "embedded":[
 						"PSSIP_USA.21","PSSIP75_MBD.01","PSSIP150_MBD.02",
 						"PSSIP_USA.22","PSSIP150_MBD.01",
 						"TPG_USA.10","VGPE_MBD.01","VGPI_MBD.01","VGPE_MBD.02",
-- 
GitLab