diff --git a/e2-estia.i b/e2-estia.i
index fd9f92c..837d36c 100644
--- a/e2-estia.i
+++ b/e2-estia.i
@@ -76,15 +76,15 @@ c -------------------------------------------------------
 c --------------- WEIGHT CARDS --------------------------
 c -------------------------------------------------------
 c weight window generator, can be run with previous weight window files
-WWGE:n   1e-3 1e-1 1e1 3e3
-WWG:n    904 0 0
-MESH     GEOM=CYL ORIGIN=0 0 -500 REF=133.7 -176.7 13.5 AXS=0 0 1 
-         IMESH=200 550 1150 1500 5000
-         IINTS=  2   5    1   10    5
-         JMESH=100 300 460 500 540 700 900 1000
-         JINTS=  2   4   4   8   8   4   4    2
-         KMESH=295 302 309 317 360
-         KINTS= 14   1   5   1   2
+c WWGE:n   1e-3 1e-1 1e1 3e3
+c WWG:n    904 0 0
+c MESH     GEOM=CYL ORIGIN=0 0 -500 REF=133.7 -176.7 13.5 AXS=0 0 1 
+c          IMESH=200 550 1150 1500 5000
+c          IINTS=  2   5    1   10    5
+c          JMESH=100 300 460 500 540 700 900 1000
+c          JINTS=  2   4   4   8   8   4   4    2
+c          KMESH=295 302 309 317 360
+c          KINTS= 14   1   5   1   2
 c ++++++++++++++++++++++ END ++++++++++++++++++++++++++++
 c -----------------------------------------------------------
 c ------------------- TALLY CARDS ---------------------------
@@ -94,11 +94,11 @@ c read file=tallies/inbunker_f4.i echo
 c read file=tallies/chopper_pit_doses.i echo
 c read file=tallies/bunker_wall_f4.i echo
 c read file=tallies/e1_e2_f4.i echo
-c read file=tallies/e1_e2_f5.i echo
+read file=tallies/e1_e2_f5.i echo
 c read file=tallies/shutter_f4.i echo
-read file=tallies/shutter_f5.i echo
-c read file=tallies/optical_cave_f5.i echo
-read file=tallies/selene1_walls_f4.i echo
+c read file=tallies/shutter_f5.i echo
+read file=tallies/optical_cave_f5.i echo
+c read file=tallies/selene1_walls_f4.i echo
 c 
 c ========================================== 
 c
@@ -127,7 +127,7 @@ c -------------------------------------------------------
 c --------------- PHYSICS CARDS --------------------------
 c -------------------------------------------------------
 c dbcn 375642321 j j j j j j j j j j j 15291711
-nps 2e9
+nps 1e10
 c histp
 mode n p n h / d t s a
 c volume calculated for tally cells (spheres)
@@ -152,7 +152,7 @@ c * Source Term from Valentina for 2m adapted to size
 read file=sources/e2_2m.i echo
 c * McStas source terms for gamma doeses
 c read file=sources/mcstas_source_vs.i echo
-prdmp 5e7 -60 1 2 5e6
+prdmp 2e8 -60 1 2 1e7
 print 30 32 $ 120 128 150 160 161 162  
 c ++++++++++++++++++++++ END ++++++++++++++++++++++++++++
 
diff --git a/sources/e2_2m.i b/sources/e2_2m.i
index f86fcc1..fc22312 100644
--- a/sources/e2_2m.i
+++ b/sources/e2_2m.i
@@ -1,7 +1,7 @@
 c source definition based on tally_181.txt 
 c but adapted to model geometry and actual size of Estia beam extraction
 c make sure to supply the correct WWINP file
-WWP:n   j j 2 j -1 j 1.0
+WWP:n   j j 5 j -1 j 1.0
 c the source definition with neutrons/s
 sdef  dir=d1 erg=fdir d2 x=199.98 y=d23 z=d24  vec=1 0 0 tr=101
         par=n ara=165.0 wgt=3.6041775E13