diff --git a/geometry/estia_shutter.i b/geometry/estia_shutter.i
index 445b650..9ec955f 100755
--- a/geometry/estia_shutter.i
+++ b/geometry/estia_shutter.i
@@ -28,30 +28,30 @@ c Support plate below shutter
 220027  54 0.0833854  220000 -220001  220002 -220003  220007 -220004
 c Shutter block B4C and Lead in Al casing
 c closed shutter
-c 220031   5 0.0582256  220400 -220401  220402 -220403  220404 -220405
-c                     #(220406 -220408  220410 -220411  220412 -220413)
-c                     #(220300 -220301  220302 -220303 -220406)
-c 220032   20 -2.3      220406 -220407  220410 -220411  220412 -220413
-c 220033   13 -11.34    220407 -220408  220410 -220411  220412 -220413
+220031   5 0.0582256  220400 -220401  220402 -220403  220404 -220405
+                    #(220406 -220408  220410 -220411  220412 -220413)
+                    #(220300 -220301  220302 -220303 -220406)
+220032   20 -2.3      220406 -220407  220410 -220411  220412 -220413
+220033   13 -11.34    220407 -220408  220410 -220411  220412 -220413
 c open shutter
-220031   5 0.0582256  220400 -220401  220402 -220403  220420 -220423
-                    #(220406 -220408  220410 -220411  220421 -220422)
-                    #(220300 -220301  220424 -220425 -220406)
-220032   20 -2.3      220406 -220407  220410 -220411  220421 -220422
-220033   13 -11.34    220407 -220408  220410 -220411  220421 -220422
+c 220031   5 0.0582256  220400 -220401  220402 -220403  220420 -220423
+c                     #(220406 -220408  220410 -220411  220421 -220422)
+c                     #(220300 -220301  220424 -220425 -220406)
+c 220032   20 -2.3      220406 -220407  220410 -220411  220421 -220422
+c 220033   13 -11.34    220407 -220408  220410 -220411  220421 -220422
 c attached items
 220041   5 0.0582256  220204 -220503    -220501
 220042   5 0.0582256  220204 -220503    -220502
-c 220043   5 0.0582256  220405 -220505    -220504 $ closed
-220043   5 0.0582256  220423 -220506    -220504 $ open
+220043   5 0.0582256  220405 -220505    -220504 $ closed
+c 220043   5 0.0582256  220423 -220506    -220504 $ open
 c Vacuum elements
 220051   0            220000 -220200 -220100
 220052   0            220200 -220304  220300 -220301  220302 -220303
 220053   0          ((220304 -220305  220307 -220308  220204 -220205 #220043
-c                     #(220400 -220401  220402 -220403  220404 -220405) $ closed
-c                     ):(220300 -220301  220302 -220303  220400 -220406)) 
-                    #(220400 -220401  220402 -220403  220420 -220423) $ opened
-                   ):(220300 -220301  220424 -220425  220400 -220406)) 
+                    #(220400 -220401  220402 -220403  220404 -220405) $ closed
+                    ):(220300 -220301  220302 -220303  220400 -220406)) 
+c                     #(220400 -220401  220402 -220403  220420 -220423) $ opened
+c                    ):(220300 -220301  220424 -220425  220400 -220406)) 
 220054   0            220305 -220201  220300 -220301  220302 -220303
 220055   0            220201 -220001 -220100
 c McStas shutter source location