diff --git a/e2-estia.i b/e2-estia.i
index 8da5587..9df649d 100644
--- a/e2-estia.i
+++ b/e2-estia.i
@@ -200,7 +200,7 @@ ext:n 0 276r $ in monolith
       0 146r 0.75v2 8r 0.75v3 4r $CPC1+2
       0 28r 0.75v3 4r $ bunker wall
       0 37r 0.75v3 7r $ BWC
-      0 272r
+      0 273r
 c exponential transform reference vectors: origin, VS, shutter
 vect v1 0 0 0 v2 1114.8 -1.75 0.5 v3 2137 -1.25 -12.5
 c forced collisions in neutron guides
@@ -210,7 +210,7 @@ fcl:n 0 276r $ in monolith
       0 23r -0.3 $ BBG
       0 13r -1.0 6r $ NFGA
       0 206r -1 $ Glass in Selene 1
-      0 53r -1 7r $ S1 back plate and mineral cast in universe
+      0 54r -1 7r $ S1 back plate and mineral cast in universe
       0 192r
 c 
 c -----------------------------------------------------------
@@ -228,7 +228,7 @@ c random number generator options
 rand gen=2 seed=29976355590901 $ default 19073486328125
 c histp
 mode  n p h / z $ neutron, photon, proton, pi+, pi0
-imp:n,p,h,/,z 1 276r 0 0 1 823r
+imp:n,p,h,/,z 1 276r 0 0 1 824r
 c Reduce model size for WWG runs until earlier stages of the model:
 c void 201255 201257 203123 $ void cells downstream of BBG
 c imp:n,p,h,/,z 1 276r 0 0 1 323r 0 1 0 1 34r 0 1 414r $ zero for above
@@ -270,10 +270,10 @@ c read file=sources/bunker_wall.i echo $ approximate, not for official results
 c * McStas source terms for gamma doeses
 c read file=sources/mcstas_rssa.i echo
 c read file=sources/mcstas_source_vs.i echo
-read file=sources/mcstas_source_sample.i echo
+c read file=sources/mcstas_source_sample.i echo
 c read file=sources/mcstas_source_mf.i echo
 c read file=sources/mcstas_gammas.i echo
-c read file=sources/mcstas_gammas_2.i echo
+read file=sources/mcstas_gammas_2.i echo
 c read file=sources/mcstas_source_shutter.i echo
 prdmp -120 -30 1 2 5e5
 print 30 32 40 
diff --git a/geometry/estia_guides.i b/geometry/estia_guides.i
index 0bfdbb5..14fda89 100644
--- a/geometry/estia_guides.i
+++ b/geometry/estia_guides.i
@@ -106,8 +106,8 @@ c Selene 1/2 separator
 c Optical cave
 208005    49 0.074981   (208101 -208709 100059 -208243 -208242 -208312
          100003) #(208248 208249)
-208006     4 -1.2E-3   208100 -208709  -208201 -100101  208251 -208243
-         #(-208305 -100610)
+208006     4 -1.2E-3   208100 -208709  -208201 (-100101:100610)  208251 -208243
+         #(-208305 -100610) -208231
 208007    49 0.074981   208100 -208101  208252 -208243  -208246 208201
          #(208103 220002 -220003  220004)
 c air
@@ -228,8 +228,12 @@ c Selene 2 Vacuum tank (stainless steel)
          -208932) #(208626 208636 -208932)
 c                  #(8626 8636 -8932)
 c Air outside the guide shielding
-208601     4 -1.2E-3   100610 -208709  -100104 100101  208203 208251
+208601     4 -1.2E-3   100610 -208709  -100104 
+            ((208232 -208223):(100101 208223))
+            208203 208251 
 208602     49 0.074981 100003 100072 -100610   100101 -100104  100067 208203
+c Thin wall shielding the cabinet area
+208603    54 0.0833854 100610 -208709   208231 -208232   100059 -208223
 c Tube after Selene 2 with sapphire window
 208611  0            208636 208641 -208932
 208612  5 0.0582256 -208626 208642 -208931 208932
diff --git a/geometry/estia_surfaces.i b/geometry/estia_surfaces.i
index 5a3a4aa..a65714c 100644
--- a/geometry/estia_surfaces.i
+++ b/geometry/estia_surfaces.i
@@ -464,6 +464,9 @@ c wall breakthrough
 208222 py -49.62
 208223  pz        120.0
 208224 p 0.0 0.0 -1.0 50.0
+c  Wall E01 side for cabinets
+208231 py 308
+208232 py 310
 c  New Gemoetry
 c  SKADI wall                     
 c  Sides