diff --git a/e2-estia.i b/e2-estia.i
index 5786264..6688940 100644
--- a/e2-estia.i
+++ b/e2-estia.i
@@ -35,7 +35,7 @@ c 700 s 117.0 -155.00 13.5 3.0
 100703 1 s 1082 -25.0 0 5.0
 100704 1 s 1082 -0.25 0 5.0
 100705 1 s 1165 0.7 0 5.0
-100706 s 778.5 -1084 -2.5 12.0
+100706 21 s -22 0 0 12.0
 100707 s 1267 -1769 -13 12.0
 100708 s 746 -1370 0 30.0
 100709 s 1030 -1155 0 30.0
@@ -77,6 +77,10 @@ c Parallel to c-axis but horizontal and centered at sample
 TR15 2047.78 -2856.64 -29.06 0.58207953 -0.81304008 0.0 &
         -0.81310076 -0.58212297 0 &
         0.0 0.0 1.0 1
+c Flange axis for Selene 1
+TR21 776.8122 -1085.6682 -2.4264        0.582080 -0.813040 -0.012217
+                                        0.813040  0.582080  0.000000
+                                        0.007112 -0.009934  0.999925
 c Coordinate system of the Estia beamport focal point
 TR100 8.9 -5.4 13.7 0.58778525 -0.80901699 0.0 &
                      -0.80901699 -0.58778525 0 &
@@ -174,19 +178,19 @@ ext:n 0 276r $ in monolith
       0 132r 0.25v3 13r $CPC1+2
       0 28r 0.25v3 4r $ bunker wall
       0 15r 0.25v3 7r $ BWC
-      0 74r
+      0 142r
 c exponential transform reference vectors: origin, selene 1, sample
 vect v1 0 0 0 v2 1000 -1394 -6.5 v3 2048 -2856 -30
 c forced collisions in neutron guides
-fcl:n 0 276r $ in monolith
-      0 309r $ ess outside
-      0 -0.05 -0.1 4r $ NBOA
-      0 23r -0.1 $ BBG
-      0 13r -0.25 6r $ NFGA
-      0 170r -1 $ S1 glass
-      0 10r -1 -1 $ S2 glass + carrier
-      0 22r -1 $ S1 carrier (universe)
-      0 19r
+c fcl:n 0 276r $ in monolith
+c       0 309r $ ess outside
+c       0 -0.05 -0.1 4r $ NBOA
+c       0 23r -0.1 $ BBG
+c       0 13r -0.25 6r $ NFGA
+c       0 170r -1 $ S1 glass
+c       0 10r -1 -1 $ S2 glass + carrier
+c       0 22r -1 $ S1 carrier (universe)
+c       0 19r
 c 
 c -----------------------------------------------------------
 c -------------------------------------------------------
@@ -194,11 +198,11 @@ c --------------- PHYSICS CARDS --------------------------
 c -------------------------------------------------------
 c dbcn 375642321 j j j j j j j j j j j 15291711
 c stop calculation either at XeY histories, 6.5 days or tally 15 error <0.001
-stop nps 1e9 CTME 4e5 $f31 0.01
+stop nps 2e8 CTME 4e5 $f31 0.01
 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 589r
+imp:n,p,h,/,z 1 276r 0 0 1 657r
 c imp:n,p,h,/,z 1 276r 0 0 1 487r 0 0 0 1 0 87r 1 9r
 cut:h,/,z 1e+08 1e-3
 phys:n 3000 0
@@ -226,9 +230,9 @@ c * Source for simulation from proton beam (needs different WW and ESplit)
 c read file=sources/proton.i echo
 c * Source Term from Valentina for 2m adapted to size
 c read file=sources/e2_2m.i echo
-read file=sources/e2_2m_mod.i echo
+c read file=sources/e2_2m_mod.i echo
 c * Estimated source within bunker wall to optimize collimator efficiency
-c read file=sources/bunker_wall.i echo
+read file=sources/bunker_wall.i echo
 c * McStas source terms for gamma doeses
 c read file=sources/mcstas_source_vs.i echo
 c read file=sources/mcstas_source_sample.i echo
@@ -236,7 +240,7 @@ 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
 c read file=sources/mcstas_source_shutter.i echo
-prdmp 1e7 -30 1 2 1e6
+prdmp 5e6 -30 1 2 5e5
 print 30 32 40 
 c      120 $O importance function quality
 c      128 $O universe map
diff --git a/tallies/shutter_wall_f4.i b/tallies/shutter_wall_f4.i
index 261e462..6f46d30 100644
--- a/tallies/shutter_wall_f4.i
+++ b/tallies/shutter_wall_f4.i
@@ -23,4 +23,4 @@ dxc:n   0.001 276r $ in monolith
         0.001 0.001 78r $ NBOA to NFGA
         0.05 75r $ up to after CPC1
         0.1 34r $ up to after CPC2
-        0.25 102r $ up to end
+        0.25 170r $ up to end