diff --git a/geometry/estia_shutter.i b/geometry/estia_shutter.i
index 981b65a..c83266e 100755
--- a/geometry/estia_shutter.i
+++ b/geometry/estia_shutter.i
@@ -36,3 +36,5 @@ c Vacuum elements
 c                    #(220400 -220401  220402 -220403  220420 -220423) $ opened
 220054   0            220305 -220201  220300 -220301  220302 -220303
 220055   0            220201 -220001 -220100
+c McStas shutter source location
+c 220060   0           -290001
diff --git a/geometry/estia_surfaces.i b/geometry/estia_surfaces.i
index 58232aa..afc39bc 100644
--- a/geometry/estia_surfaces.i
+++ b/geometry/estia_surfaces.i
@@ -1081,6 +1081,7 @@ c  VS Blades (open)
 c visualize 2m source
 c visualize Selene gamma sources
 c visualize Shutter Source
+290001 3 rpp -171 -169  0 4   -6 6
 c visualize boundary mesh geometry
 c Selene guide carrier repeating components
 c axis system is centered to C-cutout with x-direction along guide
diff --git a/tallies/shutter_wall_mesh_np.i b/tallies/shutter_wall_mesh_np.i
index 380982e..80a7192 100755
--- a/tallies/shutter_wall_mesh_np.i
+++ b/tallies/shutter_wall_mesh_np.i
@@ -1,13 +1,13 @@
 c fine mesh before and after the shutter wall to analyzer local doses
 tmesh
   rmesh11:n dose 1
-  cora11   2108 11i 2168
-  corb11   -150 59i 150
-  corc11   -200 79i 600
+  cora11   2108 14i 2168 3i 2198
+  corb11   -150 9i -50 49i 50 9i 150
+  corc11   -200 6i -60 59i 60 11i 300
 c Official ESS dose conversion factors from n/cm²/s to Sv/h
 c Is described in  ESS-0019931
-  mshmf1   0.000000000 1.00000e-08
-          1.00000e-09 1.11000e-08   1.00000e-08 1.28000e-08   
+  mshmf1 0.000000000 1.00000e-08
+         1.00000e-09 1.11000e-08   1.00000e-08 1.28000e-08   
          2.50000e-08 1.44000e-08   1.00000e-07 1.87000e-08   
          2.00000e-07 2.11000e-08   5.00000e-07 2.37000e-08   
          1.00000e-06 2.53000e-08   2.00000e-06 2.66000e-08   
@@ -41,10 +41,10 @@ c Is described in  ESS-0019931
          8.00000e+02 2.24000e-06   9.00000e+02 2.30000e-06   
          1.00000e+03 2.35000e-06   2.00000e+03 2.76000e-06   
          5.00000e+03 3.64000e-06   1.00000e+04 4.75000e-06
-rmesh21:p dose 2
-cora21   2108 11i 2168
-corb21   -150 59i 150
-corc21   -200 79i 600
+  rmesh21:p dose 2
+  cora21   2108 14i 2168 3i 2198
+  corb21   -150 9i -50 49i 50 9i 150
+  corc21   -200 6i -60 59i 60 11i 300
 c Official ESS dose conversion factors from gamma/cm²/s to Sv/h
 c Is described in  ESS-0019931
   mshmf2  0.000000 1.00000e-04