diff --git a/e2-estia.i b/e2-estia.i
index bb4a77c..85c6900 100644
--- a/e2-estia.i
+++ b/e2-estia.i
@@ -116,6 +116,8 @@ c read file=tallies/bunker_mesh_act.i echo
 c read file=tallies/full_mesh.i echo
 c read file=tallies/full_mesh_p.i echo
 c read file=tallies/full_mesh_np.i echo
+read file=tallies/NBPI_f4.i echo
+c read file=tallies/BBG_f4.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
@@ -158,9 +160,22 @@ c -------------------------------------------------------
 c --------------- PHYSICS CARDS --------------------------
 c -------------------------------------------------------
 c dbcn 375642321 j j j j j j j j j j j 15291711
-nps 1e8
+nps 1e5
 c histp
-mode n p n h / d t s a
+mode            n p h / 
+                d $ deuteron
+                t $ triton
+                s $ helion
+                a $ alpha
+c in ESS model from target:
+c MODE             N $ neutron
+c                  P $ photon
+c                  H $ proton
+c                  / $ pion-+
+c                  | $ mu--
+c                  U $ nu-e
+c                  V $ nu-mu
+c                  Z $ pion-0
 c volume calculated for tally cells (spheres)
 c and set for chopper disk/spindle and stages x1/x2/z1/z2/rot
 c vol 1 506r 11j 1 183r 3848.5 10104 1j 1 7r 479.5 479.5 913 913 1734   
@@ -176,9 +191,9 @@ phys:h 3000
 lca 2 1 1 0023 1 1 0 1 1 0
 lea 1 4 1 0 1 0 0 1
 c * For testing for geometry errors
-read file=sources/geometry_test.i echo
+c read file=sources/geometry_test.i echo
 c * Source for simulation from proton beam (needs different WW and ESplit)
-c read file=sources/proton.i echo
+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_act.i echo
diff --git a/geometry/estia_inbunker.i b/geometry/estia_inbunker.i
index cdd00b6..d11e5ad 100644
--- a/geometry/estia_inbunker.i
+++ b/geometry/estia_inbunker.i
@@ -51,7 +51,7 @@ c NBOA wedges
          201372)) -201502 -201311 U=-10
 201036    14  -8.92   201107 -201108 201381 201382 -201502 -201311 U=-10
 c Al window and He in front of NBOA 
-201041     5 0.0582256    -201110 201305 201306 201307 201308 U=10
+201041     5 0.0582256    -201110 201305 201306 201307 201308 U=10 VOL=59.8
 201042     9 2.45e-05   201110 -201100 201305 201306 201307 201308 U=-10
 c Al window and He behind NBOA
 201051     9 2.45e-05   201108 -201118 201213 -201508 -201507 U=-10
diff --git a/tallies/NBPI_f4.i b/tallies/NBPI_f4.i
new file mode 100644
index 0000000..210c3e5
--- /dev/null
+++ b/tallies/NBPI_f4.i
@@ -0,0 +1,18 @@
+c f4 tally for the NBPI window
+fc514     neutron flux at NBPI entrance window
+f514:n    201041
+e514     1e-10 1.58e-10 2.51e-10 3.98e-10 6.31e-10
+         1e-9 1.58e-9 2.51e-9 3.98e-9 6.31e-9 
+         1e-8 1.58e-8 2.51e-8 3.98e-8 6.31e-8 
+         1e-7 1.58e-7 2.51e-7 3.98e-7 6.31e-7 
+         1e-6 1.58e-6 2.51e-6 3.98e-6 6.31e-6 
+         1e-5 1.58e-5 2.51e-5 3.98e-5 6.31e-5 
+         1e-4 1.58e-4 2.51e-4 3.98e-4 6.31e-4 
+         1e-3 1.58e-3 2.51e-3 3.98e-3 6.31e-3 
+         1e-2 1.58e-2 2.51e-2 3.98e-2 6.31e-2 
+         1e-1 1.58e-1 2.51e-1 3.98e-1 6.31e-1 
+         1e-0   1.58    2.51    3.98    6.31 
+         1e+1 1.58e+1 2.51e+1 3.98e+1 6.31e+1 
+         1e+2 1.58e+2 2.51e+2 3.98e+2 6.31e+2
+         1e+3 1.58e+3 2.51e+3
+fq514 e f