diff --git a/e2-estia.i b/e2-estia.i
index 0a03570..a7ad400 100644
--- a/e2-estia.i
+++ b/e2-estia.i
@@ -120,7 +120,7 @@ c read file=tallies/full_mesh_p.i echo
 c read file=tallies/full_mesh_np.i echo
 c read file=tallies/NBPI_f4.i echo
 read file=tallies/BBG_f4.i echo
-read file=tallies/BBG_f5.i echo
+c read file=tallies/BBG_f5.i echo
 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
@@ -167,7 +167,7 @@ c --------------- PHYSICS CARDS --------------------------
 c -------------------------------------------------------
 c dbcn 375642321 j j j j j j j j j j j 15291711
 c stop calculation either at 2e8 histories, 6.5 days or tally 15 error <0.001
-stop nps 2e8 ctme 4.5e6 f15 0.001
+stop nps 2e9 ctme 4.5e6 f14 0.001
 rand gen=2 seed=29976355590901 $ default 19073486328125
 c histp
 mode  n p h / z $ neutron, photon, proton, pi+, pi0
@@ -195,10 +195,10 @@ C                02  $ ABLA
 c * For testing for geometry errors
 c read file=sources/geometry_test.i echo
 c * Source for simulation from proton beam (needs different WW and ESplit)
-read file=sources/proton.i echo
+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
-c read file=sources/e2_2m_mod.i echo
+read file=sources/e2_2m_mod.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
@@ -206,7 +206,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 1e5
+prdmp 1e8 -30 1 2 1e6
 print 30 32 40 
 c      120 $O importance function quality
 c      128 $O universe map
diff --git a/sources/e2_2m_mod.i b/sources/e2_2m_mod.i
index 10f0310..85d7209 100644
--- a/sources/e2_2m_mod.i
+++ b/sources/e2_2m_mod.i
@@ -4,7 +4,7 @@ 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 5e17 1j
+WWP:n  j j 2 j -1 j 1.0 1j 5e15 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
diff --git a/tallies/BBG_f4.i b/tallies/BBG_f4.i
index b2f5b9e..13aaf7a 100644
--- a/tallies/BBG_f4.i
+++ b/tallies/BBG_f4.i
@@ -17,7 +17,7 @@ e14      1e-10 1.58e-10 2.51e-10 3.98e-10 6.31e-10
          1e+3 1.58e+3 2.51e+3
 fq14 e f
 c  DXTRAN spheres to improve statistics in tallies
-dxt:n   331.2 -448.0  7.0 9.5 12.0 $ around both tally spheres
+c dxt:n   331.2 -448.0  7.0 9.5 12.0 $ around both tally spheres
 c        331.2 -448.0 13.3 3.2 6.2 $ around upper tally sphere
 c        331.1 -447.9 0.7  3.2 6.2 $ around lower tally sphere
-dxc:n   0.1 276r 0 0 0.1 578r
+c dxc:n   0.1 276r 0 0 0.1 578r
diff --git a/weight_windows/current.wwg b/weight_windows/current.wwg
index a41e8b0..c53f9a2 120000
--- a/weight_windows/current.wwg
+++ b/weight_windows/current.wwg
@@ -1 +1 @@
-proton-newmono_v02-ge6fe712-gf25c87c.wwg
\ No newline at end of file
+neutron-bunker-newmono_v02-20-g79fefd5.wwg
\ No newline at end of file