diff --git a/e2-estia.i b/e2-estia.i
index b062392..70b9299 100644
--- a/e2-estia.i
+++ b/e2-estia.i
@@ -126,7 +126,7 @@ c -------------------------------------------------------
 c --------------- WEIGHT CARDS --------------------------
 c -------------------------------------------------------
 c weight window generator, can be run with previous weight window files
-c WWGE:n   1e-3 1e-1 1 10 100 3e3
+WWGE:n   1e-6 1e-3 1e-1 4 10 100 3e3
 c mesh based weight windows, can be reused after change of cell structure
 c WWG      15 0 0
 c MESH     GEOM=CYL ORIGIN=0 0 -500 REF=133.7 -176.7 13.5 AXS=0 0 1 
@@ -138,7 +138,7 @@ c          JINTS=  2   4   4   8   8   4   4    6
 c          KMESH=298 303 309 315 360
 c          KINTS= 14   1  20   1   2
 c generate cell based weight windows, needs to be updated on geometry change
-c WWG    14 61003 0 $255 61003 0
+WWG    14 61003 0 $255 61003 0
 c ++++++++++++++++++++++ END ++++++++++++++++++++++++++++
 c -----------------------------------------------------------
 c ------------------- TALLY CARDS ---------------------------
@@ -206,15 +206,15 @@ 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
 c stop nps 39242646 CTME 4e5 $f31 0.01
-stop nps 1e7 CTME 4e5 $f31 0.01
+stop nps 15e7 CTME 4e5 $f31 0.01
 rand gen=2 seed=29976355590901 $ default 19073486328125
 c histp
 mode  n p h / z $ neutron, photon, proton, pi+, pi0
 c imp:n,p,h,/,z 1 276r 0 0 1 711r
 c Reduce model size for WWG runs until earlier stages of the model:
 void 201255 201257 203123 $ void cells downstream of BBG
-imp:n,p,h,/,z 1 276r 0 0 1 323r 0 1 0 1 34r 0 1 348r $ zero importance for cells above
-c imp:n,p,h,/,z 1 276r 0 0 1 487r 0 0 0 1 0 87r 1 9r
+imp:n,p,h,/,z 1 276r 0 0 1 323r 0 1 0 1 34r 0 1 348r $ zero importance for above
+c
 cut:h,/,z 1e+08 1e-3
 phys:n 3000 0
 phys:p 3000
@@ -252,7 +252,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 5e6 -30 1 2 1e8
+prdmp 1e7 -30 1 2 1e6
 print 30 32 40 
 c      120 $O importance function quality
 c      128 $O universe map
diff --git a/results/e2-estia_baseline_v08-2-ga9c5891.out.gz b/results/e2-estia_baseline_v08-2-ga9c5891.out.gz
new file mode 100644
index 0000000..6df8023
Binary files /dev/null and b/results/e2-estia_baseline_v08-2-ga9c5891.out.gz differ
diff --git a/sources/e2_2m_mod.i b/sources/e2_2m_mod.i
index 20304f2..bd7e9a0 100644
--- a/sources/e2_2m_mod.i
+++ b/sources/e2_2m_mod.i
@@ -1,10 +1,11 @@
 c source definition based on tally_181.txt, modified for high E flux
-cut:n j 0
+c cut:n j 0
+cut:n j j -0.02 -0.01 $ put weight cut-off for 0-WW to 1.0% of source weight
 c cut all photons that can't produce neutrons
 cut:p 1e+08 1.667
 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 4 j -1 j 1.0 1j 2.0E+13 1j
+c WWP:n  j j 4 j -1 j 1.0 1j 2.0E+13 1j
 c the source definition with neutrons/s
 sdef  dir=d1 erg=fdir d2 x=199.5 y=d23 z=d24  vec=1 0 0 tr=101
         par=n ara=165.0 wgt=6.14727e+13