diff --git a/elettra2_lattice.json b/elettra2_lattice.json
index 157612b03cfaaa60a1d2c3ed7d2ec73bbe25cca3..8c18aacbf039e14eeb641608aba36dc5acf84322 100644
--- a/elettra2_lattice.json
+++ b/elettra2_lattice.json
@@ -3515,11 +3515,11 @@
 				"chamber": {"type": "wall"}
 			},
 			{
-				"start": {"x": 28500, "z": -6200},
+				"start": {"x": 28500, "z": -6150},
 				"chamber": {"type": "wall"}
 			},
 			{
-				"start": {"x": 28780, "z": -4540}
+				"start": {"x": 28780, "z": -4720}
 			},
 			{
 				"start": {"x": 29060, "z": -3360},
@@ -3577,11 +3577,11 @@
 				"chamber": {"type": "wall"}
 			},
 			{
-				"start": {"x": -8920, "z": 27720},
+				"start": {"x": -9050, "z": 27720},
 				"chamber": {"type": "wall"}
 			},
 			{
-				"start": {"x": -10660, "z": 27250}
+				"start": {"x": -10360, "z": 27250}
 			},
 			{
 				"start": {"x": -11600, "z": 26840},
@@ -3619,11 +3619,11 @@
 				"chamber": {"type": "wall"}
 			},
 			{
-				"start": {"x": -28460, "z": 6060},
+				"start": {"x": -28460, "z": 5960},
 				"chamber": {"type": "wall"}
 			},
 			{
-				"start": {"x": -28780, "z": 4380}
+				"start": {"x": -28750, "z": 4580}
 			},
 			{
 				"start": {"x": -29020, "z": 3140},
@@ -3650,11 +3650,11 @@
 				"chamber": {"type": "wall"}
 			},
 			{
-				"start": {"x": -19540, "z": -21700},
+				"start": {"x": -19340, "z": -21830},
 				"chamber": {"type": "wall"}
 			},
 			{
-				"start": {"x": -18220, "z": -22800}
+				"start": {"x": -18270, "z": -22750}
 			},
 			{
 				"start": {"x": -17320, "z": -23600},
@@ -3681,11 +3681,11 @@
 				"chamber": {"type": "wall"}
 			},
 			{
-				"start": {"x": 8900, "z": -27780},
+				"start": {"x": 8990, "z": -27750},
 				"chamber": {"type": "wall"}
 			},
 			{
-				"start": {"x": 10540, "z": -27220}
+				"start": {"x": 10350, "z": -27280}
 			},
 			{
 				"start": {"x": 14400, "z": -25450},
@@ -4038,16 +4038,16 @@
 			{
 				"start": {"x": 15258, "y": -300, "z": 19510},
 				"components": [
-					{"type": "door", "position": 0, "name": "Door Preinj"}
+					{"type": "door", "position": 0, "name": "Door 1"}
 				]
 			},
 			{
 				"start": {"x": 11735, "y": -300, "z": 19153}
 			},
 			{
-				"start": {"x": 27528, "y": -300, "z": -5880},
+				"start": {"x": 27128, "y": -300, "z": -5980},
 				"components": [
-					{"type": "door", "position": 0, "name": "Door srA"}
+					{"type": "doorpss", "position": 0, "name": "DR A12.1"}
 				]
 			},
 			{
@@ -4063,18 +4063,18 @@
 				"start": {"x": 25935, "y": -300, "z": 29253}
 			},
 			{
-				"start": {"x": -8848, "y": -300, "z": 26700},
+				"start": {"x": -8508, "y": -300, "z": 26400},
 				"components": [
-					{"type": "door", "position": 0, "name": "Door srC"}
+					{"type": "doorpss", "position": 0, "name": "DR A4.1"}
 				]
 			},
 			{
 				"start": {"x": -9535, "y": -300, "z": 29253}
 			},
 			{
-				"start": {"x": -27500, "y": -300, "z": 5780},
+				"start": {"x": -27100, "y": -300, "z": 5780},
 				"components": [
-					{"type": "door", "position": 0, "name": "Door srD"}
+					{"type": "doorpss", "position": 0, "name": "DR A6.1"}
 				]
 			},
 			{
@@ -4082,18 +4082,18 @@
 			},
 
 			{
-				"start": {"x": -18820, "y": -300, "z": -21000},
+				"start": {"x": -18520, "y": -300, "z": -20700},
 				"components": [
-					{"type": "door", "position": 0, "name": "Door srE"}
+					{"type": "doorpss", "position": 0, "name": "DR A8.1"}
 				]
 			},
 			{
 				"start": {"x": -27640, "y": -300, "z": -31680}
 			},
 			{
-				"start": {"x": 8750, "y": -300, "z": -26780},
+				"start": {"x": 8450, "y": -300, "z": -26480},
 				"components": [
-					{"type": "door", "position": 0, "name": "Door srE"}
+					{"type": "doorpss", "position": 0, "name": "DR A10.1"}
 				]
 			},
 			{
@@ -4109,18 +4109,18 @@
 				"start": {"x": -17620, "y": -300, "z": 33040}
 			},
 			{
-				"start": {"x": 9080, "y": -300, "z": 2320},
+				"start": {"x": 9300, "y":  -300, "z": 1920},
 				"components": [
-					{"type": "door", "position": 0, "name": "Door srBooster2"}
+					{"type": "doorpss", "position": 0, "name": "DR_BSA4.1"}
 				]
 			},
 			{
-				"start": {"x": 8800, "y": -300, "z": 5520}
+				"start": {"x": 8800, "y": -300, "z": 7520}
 			},
 			{
-				"start": {"x": -14100, "y": -300, "z": 17230},
+				"start": {"x": -13800, "y": -300, "z": 16930},
 				"components": [
-					{"type": "door", "position": 0, "name": "Door BoosterExt"}
+					{"type": "doorpss", "position": 0, "name": "DR_A5.1"}
 				]
 			},
 			{
@@ -4129,7 +4129,7 @@
 			{
 				"start": {"x": -12780, "y": -300, "z": -700},
 				"components": [
-					{"type": "doorpss", "position": 0, "name": "Door Chiostrina"}
+					{"type": "doorpss", "position": 0, "name": "DR_BSA1.1"}
 				]
 			},
 			{
@@ -4138,7 +4138,7 @@
 			{
 				"start": {"x": 13360, "y": -300, "z": 23540},
 				"components": [
-					{"type": "doorpss", "position": 0, "name": "Door LatoSX"}
+					{"type": "doorpss", "position": 0, "name": "DR_CS4.2"}
 				]
 			},
 			{
@@ -4147,7 +4147,7 @@
 			{
 				"start": {"x": 22200, "y": -300, "z": 17320},
 				"components": [
-					{"type": "doorpss", "position": 0, "name": "Door LatoDX"}
+					{"type": "doorpss", "position": 0, "name": "DR_CS4.1"}
 				]
 			},
 			{
@@ -4156,7 +4156,7 @@
 			{
 				"start": {"x": 13330, "y": -300, "z": 14980},
 				"components": [
-					{"type": "doorpss", "position": 0, "name": "DoorPSSPrenj"}
+					{"type": "doorpss", "position": 0, "name": "A0"}
 				]
 			},
 			{
@@ -4165,7 +4165,7 @@
 			{
 				"start": {"x": 37850, "y": -300, "z": 8380},
 				"components": [
-					{"type": "doorpss", "position": 0, "name": "DoorPSSE5"}
+					{"type": "doorpss", "position": 0, "name": "E5"}
 				]
 			},
 			{
@@ -4174,7 +4174,7 @@
 			{
 				"start": {"x": -8420, "y": -300, "z": 37820},
 				"components": [
-					{"type": "doorpss", "position": 0, "name": "DoorPSSA2"}
+					{"type": "doorpss", "position": 0, "name": "A2"}
 				]
 			},
 			{
@@ -4183,7 +4183,7 @@
 			{
 				"start": {"x": -37890, "y": -300, "z": -8510},
 				"components": [
-					{"type": "doorpss", "position": 0, "name": "DoorPSSE4"}
+					{"type": "doorpss", "position": 0, "name": "E4"}
 				]
 			},
 			{
@@ -4192,7 +4192,7 @@
 			{
 				"start": {"x": 8440, "y": -300, "z": -37950},
 				"components": [
-					{"type": "doorpss", "position": 0, "name": "DoorPSSE3"}
+					{"type": "doorpss", "position": 0, "name": "A3"}
 				]
 			},
 			{
@@ -4886,224 +4886,224 @@
 				
 			},
 			{
-				"start": {"x": 15960, "z": 24350},
+				"start": {"x": 15960, "y": 2500, "z": 24350},
 				"chamber": {"type": "wall"}
 			},	
 			{
-				"start": {"x": 19160, "z": 16390}
+				"start": {"x": 19160, "y": 2500, "z": 16390}
 			},			
 			{
-				"start": {"x": 19880, "z": 17100},
+				"start": {"x": 19880, "y": 2500, "z": 17100},
 				"chamber": {"type": "wall"}
 			},
 			{
-				"start": {"x": -12360, "z": 23100}
+				"start": {"x": -12360, "y": 2500, "z": 23100}
 			},			
 			{
-				"start": {"x": -16060, "z": 20220},
+				"start": {"x": -16060, "y": 2500, "z": 20220},
 				"chamber": {"type": "wall"}
 			},			
 			{
-				"start": {"x": 21100, "z": 18190}
+				"start": {"x": 21100, "y": 2500, "z": 18190}
 				
 			},
 			{
-				"start": {"x": 22050, "z": 19040},
+				"start": {"x": 22050, "y": 2500, "z": 19040},
 				"chamber": {"type": "wall"}
 			},
 			
 			{
-				"start": {"x": -24700, "z": 29360}
+				"start": {"x": -24700, "y": 2500, "z": 29360}
 				
 			},			
 	 	    {
-	 	       "start": {"x": -18280, "z": 22560},
+	 	       "start": {"x": -18280, "y": 2500, "z": 22560},
 	 	       "chamber": {"type": "wall"}
 	 	    },
 	 	    {
-	           "start": {"x": -16140, "z": 24340},
+	           "start": {"x": -16140, "y": 2500, "z": 24340},
 	           "chamber": {"type": "wall"}
 			},
 			{
-				"start": {"x": -14060, "z": 25400},
+				"start": {"x": -14060, "y": 2500, "z": 25400},
 				"chamber": {"type": "wall"}
 			},
 			{
-				"start": {"x": -10780, "z": 21120},
+				"start": {"x": -10780, "y": 2500, "z": 21120},
 				"chamber": {"type": "wall"}
 			},
 			{
-				"start": {"x": -14640, "z": 18080},
+				"start": {"x": -14640, "y": 2500, "z": 18080},
 				"chamber": {"type": "wall"}
 	        },
 			{
-				"start": {"x": -16240, "z": 16820}
+				"start": {"x": -16240, "y": 2500, "z": 16820}
 				
 			},			
 	 	    {
-	 	        "start": {"x": -18180, "z": 15280},
+	 	        "start": {"x": -18180, "y": 2500, "z": 15280},
 	 	        "chamber": {"type": "wall"}
 	 	    },
 			{
-				"start": {"x": -21590, "z": 19320},
+				"start": {"x": -21590, "y": 2500, "z": 19320},
 				"chamber": {"type": "wall"}
 			},
 			{
-				"start": {"x": -19920, "z": 21140},
+				"start": {"x": -19920, "y": 2500, "z": 21140},
 				"chamber": {"type": "wall"}
 			},
 			{
-				"start": {"x": -26400, "z": 27980},
+				"start": {"x": -26400, "y": 2500, "z": 27980},
 				"chamber": {"type": "wall"}
 			},
 			{
-				"start": {"x": -15440, "z": 17460}
+				"start": {"x": -15440, "y": 2500, "z": 17460}
 				
 			},
 	 	    {
-	 	        "start": {"x": -16240, "z": 16820},
+	 	        "start": {"x": -16240, "y": 2500, "z": 16820},
 	 	        "chamber": {"type": "wall"}
 	 	    },				
 	 	    {
-	 	        "start": {"x": -15040, "z": 14920},
+	 	        "start": {"x": -15040, "y": 2500, "z": 14920},
 	 	        "chamber": {"type": "wall"}
 	 	    },			
 	 	    {
-	 	        "start": {"x": -13800, "z": 1200},
+	 	        "start": {"x": -13800, "y": 2500, "z": 1200},
 	 	        "chamber": {"type": "wall"}
 	 	    },
 
 			{
-				"start": {"x": -11771, "z":2840}
+				"start": {"x": -11771, "y": 2500, "z":2840}
 			},				
 			
 	 	    {
-	 	        "start": {"x": -13000, "z": 16480},
+	 	        "start": {"x": -13000, "y": 2500, "z": 16480},
 	 	        "chamber": {"type": "wall"}
 	 	    },
 	 	    {
-	 	        "start": {"x": -14160, "z": 18380},
+	 	        "start": {"x": -14160, "y": 2500, "z": 18380},
 	 	        "chamber": {"type": "wall"}
 	 	    },
 			{
-				"start": {"x": -11771, "z":2840}
+				"start": {"x": -11771, "y": 2500, "z":2840}
 			},	
 	 	    {
-	 	        "start": {"x": 11160, "z": 4860},
+	 	        "start": {"x": 11160, "y": 2500, "z": 4860},
 	 	        "chamber": {"type": "wall"}
 	 	    },
 	 	    {
-	 	        "start": {"x": 16180, "z": -220},
+	 	        "start": {"x": 16180, "y": 2500, "z": -220},
 	 	        "chamber": {"type": "wall"}
 	 	    },
 	 	    {
-	 	        "start": {"x": 16520, "z": -4580},
+	 	        "start": {"x": 16520, "y": 2500, "z": -4580},
 	 	        "chamber": {"type": "wall"}
 	 	    },
 	 	    {
-	 	        "start": {"x": 19980, "z": -8520},
+	 	        "start": {"x": 19980, "y": 2500, "z": -8520},
 	 	        "chamber": {"type": "wall"}
 	 	    },
 	 	    {
-	 	        "start": {"x": 24880, "z": -11380},
+	 	        "start": {"x": 24880, "y": 2500, "z": -11380},
 	 	        "chamber": {"type": "wall"}
 	 	    },
 	 	    {
-	 	        "start": {"x": 26300, "z": -7980},
+	 	        "start": {"x": 26300, "y": 2500, "z": -7980},
 	 	        "chamber": {"type": "wall"}
 	 	    },
 	 	    {
-	 	        "start": {"x": 27200, "z": -3360},
+	 	        "start": {"x": 27200, "y": 2500, "z": -3360},
 	 	        "chamber": {"type": "wall"}
 	 	    },
 	 	    {
-	 	        "start": {"x": 27260, "z": -2420},
+	 	        "start": {"x": 27260, "y": 2500, "z": -2420},
 	 	        "chamber": {"type": "wall"}
 	 	    },
 	 	    {
-	 	        "start": {"x": 25840, "z": -2300},
+	 	        "start": {"x": 25840, "y": 2500, "z": -2300},
 	 	        "chamber": {"type": "wall"}
 	 	    },
 	 	    {
-	 	        "start": {"x": 25740, "z": 400},
+	 	        "start": {"x": 25740, "y": 2500, "z": 400},
 	 	        "chamber": {"type": "wall"}
 	 	    },
 	 	    {
-	 	        "start": {"x": 27100, "z": 460},
+	 	        "start": {"x": 27100, "y": 2500, "z": 460},
 	 	        "chamber": {"type": "wall"}
 	 	    },
 	 	    {
-	 	        "start": {"x": 27160, "z": -1120},
+	 	        "start": {"x": 27160, "y": 2500, "z": -1120},
 	 	        "chamber": {"type": "wall"}
 	 	    },
 	 	    {
-	 	        "start": {"x": 28890, "z": -1100},
+	 	        "start": {"x": 28890, "y": 2500, "z": -1100},
 	 	        "chamber": {"type": "wall"}
 	 	    },
 	 	    {
-	 	        "start": {"x": 28880, "z": -3380},
+	 	        "start": {"x": 28880, "y": 2500, "z": -3380},
 	 	        "chamber": {"type": "wall"}
 	 	    },
 	 	    {
-	 	        "start": {"x": 27980, "z": -8160},
+	 	        "start": {"x": 27980, "y": 2500, "z": -8160},
 	 	        "chamber": {"type": "wall"}
 	 	    },
 	 	    {
-	 	        "start": {"x": 25750, "z": -13500},
+	 	        "start": {"x": 25750, "y": 2500, "z": -13500},
 	 	        "chamber": {"type": "wall"}
 	 	    },
 	 	    {
-	 	        "start": {"x": 24060, "z": -12550},
+	 	        "start": {"x": 24060, "y": 2500, "z": -12550},
 	 	        "chamber": {"type": "wall"}
 	 	    },
 	 	    {
-	 	        "start": {"x": 22340, "z": -15380},
+	 	        "start": {"x": 22340, "y": 2500, "z": -15380},
 	 	        "chamber": {"type": "wall"}
 	 	    },
 	 	    {
-	 	        "start": {"x": 21200, "z": -14740},
+	 	        "start": {"x": 21200, "y": 2500, "z": -14740},
 	 	        "chamber": {"type": "wall"}
 	 	    },
 	 	    {
-	 	        "start": {"x": 21020, "z": -15040},
+	 	        "start": {"x": 21020, "y": 2500, "z": -15040},
 	 	        "chamber": {"type": "wall"}
 	 	    },			
 			{
-				"start": {"x": 20220, "z": -16320}
+				"start": {"x": 20220, "y": 2500, "z": -16320}
 			},	
 	 	    {
-	 	        "start": {"x": 18900, "z": -15520},
+	 	        "start": {"x": 18900, "y": 2500, "z": -15520},
 	 	        "chamber": {"type": "wall"}
 	 	    },
 	 	    {
-	 	        "start": {"x": 21600, "z": -11200},
+	 	        "start": {"x": 21600, "y": 2500, "z": -11200},
 	 	        "chamber": {"type": "wall"}
 	 	    },
 	 	    {
-	 	        "start": {"x": 19040, "z": -9620},
+	 	        "start": {"x": 19040, "y": 2500, "z": -9620},
 	 	        "chamber": {"type": "wall"}
 	 	    },
 	 	    {
-	 	        "start": {"x": 15290, "z": -5330},
+	 	        "start": {"x": 15290, "y": 2500, "z": -5330},
 	 	        "chamber": {"type": "wall"}
 	 	    },	
 			{
-				"start": {"x": 21020, "z": -15040}
+				"start": {"x": 21020, "y": 2500, "z": -15040}
 			},				
 	 	    {
-	 	        "start": {"x": 20800, "z": -14900},
+	 	        "start": {"x": 20800, "y": 2300, "z": -14900},
 	 	        "chamber": {"type": "wall"}
 	 	    },
 	 	    {
-	 	        "start": {"x": 22600, "z": -11920},
+	 	        "start": {"x": 22600, "y": 2500, "z": -11920},
 	 	        "chamber": {"type": "wall"}
 	 	    },
 	 	    {
-	 	        "start": {"x": 22800, "z": -12040},
+	 	        "start": {"x": 22800, "y": 2500, "z": -12040},
 	 	        "chamber": {"type": "wall"}
 	 	    },
 	 	    {
-	 	        "start": {"x": 21130, "z": -14860},
+	 	        "start": {"x": 21130, "y": 2500, "z": -14860},
 	 	        "chamber": {"type": "wall"}
 	 	    },
 			{
@@ -5143,6 +5143,7 @@
 				"start": {"x": -41080, "y": -300, "z": 51690}
 			}				
 			
+			
 		]	
 	}
 }