diff --git a/jade_open_benchmarks/inputs/Simple_Tokamak/openmc/tallies.xml b/jade_open_benchmarks/inputs/Simple_Tokamak/openmc/tallies.xml
index faadb41..9a72f7e 100644
--- a/jade_open_benchmarks/inputs/Simple_Tokamak/openmc/tallies.xml
+++ b/jade_open_benchmarks/inputs/Simple_Tokamak/openmc/tallies.xml
@@ -78,19 +78,19 @@
   <scores>heating</scores>
   </tally>
   <tally id="26" name="Neutron nuclear heating in PF coils">
-  <filters>1 11</filters>
+  <filters>1 19</filters>
   <scores>heating</scores>
   </tally>
   <tally id="36" name="Photon nuclear heating in PF coils">
-  <filters>3 11</filters>
+  <filters>3 19</filters>
   <scores>heating</scores>
   </tally>
   <tally id="361" name="Positron nuclear heating in PF coils">
-  <filters>7 11</filters>
+  <filters>7 19</filters>
   <scores>heating</scores>
   </tally>
   <tally id="362" name="Electron nuclear heating in PF coils">
-  <filters>9 11</filters>
+  <filters>9 19</filters>
   <scores>heating</scores>
   </tally>
   <tally id="46" name="Neutron nuclear heating in VV">
diff --git a/jade_open_benchmarks/inputs/Simple_Tokamak/openmc/tally_factors.yaml b/jade_open_benchmarks/inputs/Simple_Tokamak/openmc/tally_factors.yaml
new file mode 100644
index 0000000..3b874d2
--- /dev/null
+++ b/jade_open_benchmarks/inputs/Simple_Tokamak/openmc/tally_factors.yaml
@@ -0,0 +1,80 @@
+24:
+  identifier : 24
+  normalisation : 1.0
+  volume : True
+  mass : False
+34:
+  identifier : 34
+  normalisation : 1.0
+  volume : True
+  mass : False
+44:
+  identifier : 44
+  normalisation : 1.0
+  volume : True
+  mass : False
+54:
+  identifier : 54
+  normalisation : 1.0
+  volume : True
+  mass : False
+64:
+  identifier : 64
+  normalisation : 1.0
+  volume : True
+  mass : False
+74:
+  identifier : 74
+  normalisation : 1.0
+  volume : True
+  mass : False
+84:
+  identifier : 84
+  normalisation : 1.0
+  volume : True
+  mass : False
+94:
+  identifier : 94
+  normalisation : 1.0
+  volume : True
+  mass : False
+6:
+  identifier : 6
+  normalisation : 1.0
+  volume : False
+  mass : False
+16:
+  identifier : 16
+  normalisation : 1.0
+  volume : False
+  mass : False
+26:
+  identifier : 26
+  normalisation : 1.0
+  volume : False
+  mass : False
+36:
+  identifier : 36
+  normalisation : 1.0
+  volume : False
+  mass : False
+46:
+  identifier : 46
+  normalisation : 1.0
+  volume : False
+  mass : False
+56:
+  identifier : 56
+  normalisation : 1.0
+  volume : False
+  mass : False
+104:
+  identifier : 104
+  normalisation : 1.0
+  volume : True
+  mass : False
+114:
+  identifier : 114
+  normalisation : 1.0
+  volume : True
+  mass : False
\ No newline at end of file
diff --git a/jade_open_benchmarks/inputs/Simple_Tokamak/volumes.json b/jade_open_benchmarks/inputs/Simple_Tokamak/volumes.json
new file mode 100644
index 0000000..018f353
--- /dev/null
+++ b/jade_open_benchmarks/inputs/Simple_Tokamak/volumes.json
@@ -0,0 +1,49 @@
+{
+    "cells": {
+        "72": 993745,
+        "73": 758884,
+        "74": 758884,
+        "75": 617552,
+        "76": 471278,
+        "77": 471278,
+        "78": 968837,
+        "79": 968837,
+        "80": 935995,
+        "81": 935995,
+        "82": 475537,
+        "83": 456889,
+        "84": 396061,
+        "85": 396061,
+        "86": 489021,
+        "87": 375064,
+        "88": 375064,
+        "89": 362416,
+        "90": 362416,
+        "91": 348213,
+        "92": 348213,
+        "93": 463905,
+        "94": 363225,
+        "95": 363225,
+        "96": 348460,
+        "97": 272836,
+        "98": 272836,
+        "99": 260049,
+        "100": 203682,
+        "101": 203682,
+        "102": 301943,
+        "103": 236413,
+        "104": 236413,
+        "105": 288639,
+        "106": 225997,
+        "107": 225997,
+        "108": 217511,
+        "109": 170305,
+        "110": 170305,
+        "111": 58780,
+        "23": 5026430,
+        "21": 5026430,
+        "20": 3686010,
+        "22": 3686010,
+        "121": 152231
+    }
+}
\ No newline at end of file
diff --git a/jade_open_benchmarks/inputs/Sphere/mcnp/Sphere.i b/jade_open_benchmarks/inputs/Sphere/mcnp/Sphere.i
index cb35914..411e150 100644
--- a/jade_open_benchmarks/inputs/Sphere/mcnp/Sphere.i
+++ b/jade_open_benchmarks/inputs/Sphere/mcnp/Sphere.i
@@ -95,4 +95,4 @@ C
 FC34 DPA production
 F34:N 2
 FM34 1 1 444
-SD34 1
+SD34 1
\ No newline at end of file
diff --git a/jade_open_benchmarks/inputs/Sphere/openmc/geometry.xml b/jade_open_benchmarks/inputs/Sphere/openmc/geometry.xml
index 3be058d..f5856ef 100644
--- a/jade_open_benchmarks/inputs/Sphere/openmc/geometry.xml
+++ b/jade_open_benchmarks/inputs/Sphere/openmc/geometry.xml
@@ -1,8 +1,9 @@
 <geometry>
   <surface boundary="transmission" coeffs="0.0 0.0 0.0 5.0" id="1" type="sphere" />
   <surface boundary="vacuum" coeffs="0.0 0.0 0.0 50.0" id="2" type="sphere" />
-  <surface boundary="transmission" coeffs="0.0 0.0 0.0 60.0" id="3" type="sphere" />
+  <surface boundary="transmission" coeffs="0.0 0.0 0.0 50.01" id="3" type="sphere" />
   <cell id="1" material="void" region=" -1" universe="0" />
   <cell id="2" material="1" region=" 1 -2" universe="0" />
-  <cell id="3" material="void" region=" 2" universe="0" />
+  <cell id="3" material="void" region=" 2 -3" universe="0" />
+  <cell id="3" material="void" region="3" universe="0" />
 </geometry>
diff --git a/jade_open_benchmarks/inputs/Sphere/openmc/tallies.xml b/jade_open_benchmarks/inputs/Sphere/openmc/tallies.xml
index 5d28348..4c38a0b 100644
--- a/jade_open_benchmarks/inputs/Sphere/openmc/tallies.xml
+++ b/jade_open_benchmarks/inputs/Sphere/openmc/tallies.xml
@@ -1,27 +1,62 @@
 <?xml version='1.0' encoding='utf-8'?>
 <tallies>
   <filter id="1" type="cell">
-    <bins>2</bins>
+    <bins>3</bins>
   </filter>
-  <filter id="2" type="particle">
+  <filter id="3" type="particle">
     <bins>neutron</bins>
   </filter>
-  <filter id="3" type="particle">
+  <filter id="7" type="particle">
     <bins>photon</bins>
   </filter>
-  <filter id="5" type="energy">
+  <filter id="9" type="particle">
+    <bins>electron</bins>
+  </filter>
+  <filter id="11" type="particle">
+    <bins>positron</bins>
+  </filter>
+  <filter id="13" type="energy">
     <bins>1e-05 0.1 0.41399 0.53158 0.68256 0.87643 1.1253 1.445 1.8554 2.3824 3.059 3.9279 5.0435 6.4759 8.3153 10.677 13.71 17.604 22.603 29.023 37.266 47.851 61.442 78.893 101.3 130.07 167.02 214.45 275.36 353.58 454.0 582.95 748.52 961.12 1234.1 1584.6 2034.7 2248.7 2485.2 2612.6 2746.5 3035.4 3354.6 3707.4 4307.4 5530.8 7101.7 9118.8 10595.0 11709.0 15034.0 19304.0 21875.0 23579.0 24176.0 24788.0 26058.0 27000.0 28501.0 31828.0 34307.0 40868.0 46309.0 52475.0 56562.0 67380.0 72024.0 79499.0 82503.0 86517.0 98036.0 111090.0 116790.0 122770.0 129070.0 135690.0 142640.0 149960.0 157640.0 165730.0 174220.0 183160.0 192550.0 202420.0 212800.0 223710.0 235180.0 247240.0 273240.0 287250.0 294520.0 297210.0 298490.0 301970.0 333730.0 368830.0 387740.0 407620.0 450490.0 497870.0 523400.0 550230.0 578440.0 608100.0 639280.0 672060.0 706510.0 742740.0 780820.0 820850.0 862940.0 907180.0 961670.0 1002600.0 1108000.0 1164800.0 1224600.0 1287400.0 1353400.0 1422700.0 1495700.0 1572400.0 1653000.0 1737700.0 1826800.0 1920500.0 2019000.0 2122500.0 2231300.0 2306900.0 2345700.0 2365300.0 2385100.0 2466000.0 2592400.0 2725300.0 2865000.0 3011900.0 3166400.0 3328700.0 3678800.0 4065700.0 4493300.0 4723700.0 4965800.0 5220500.0 5488100.0 5769500.0 6065300.0 6376300.0 6592400.0 6703200.0 7046900.0 7408200.0 7788000.0 8187300.0 8607100.0 9048400.0 9512300.0 10000000.0 10513000.0 11052000.0 11618000.0 12214000.0 12523000.0 12840000.0 13499000.0 13840000.0 14191000.0 14550000.0 14918000.0 15683000.0 16487000.0 16905000.0 17332000.0 19640000.0</bins>
   </filter>
-  <filter id="6" type="energy">
-    <bins> 1e-05 10000	20000	50000	100000	200000	300000	400000	600000	800000	1000000	1220000	1440000	1660000	2000000	2500000	3000000	4000000	5000000	6500000	8000000	10000000	12000000	14000000	20000000
-  </bins>
+  <filter id="17" type="energy">
+    <bins> 1e-05 10000	20000	50000	100000	200000	300000	400000	600000	800000	1000000	1220000	1440000	1660000	2000000	2500000	3000000	4000000	5000000	6500000	8000000	10000000	12000000	14000000	20000000</bins>
   </filter>
-  <tally id="4" name="Neutron spectra">
-    <filters>1 2 5</filters>
+  <filter id="19" type="energy">
+    <bins> 1e-05 10000 100000 1000000 5000000 20000000</bins>
+  </filter>
+  <filter id="21" type="energy">
+    <bins> 1e-05 1 100000 1000000 10000000 20000000</bins>
+  </filter>
+  <tally id="2" name="Neutron Flux at the external surface in Vitamin-J 175 energy groups">
+    <filters>1 3 13</filters>
+    <scores>flux</scores>
+  </tally>
+  <tally id="22" name="Gamma flux at the external surface">
+    <filters>1 7 19</filters>
+    <scores>flux</scores>
+  </tally>
+  <tally id="32" name="Gamma flux at the external surface [FINE@FISPACT MANUAL 24 Group Structure]">
+    <filters>1 7 17</filters>
     <scores>flux</scores>
   </tally>
-  <tally id="14" name="Photon spectra">
-    <filters>1 3 6</filters>
+  <tally id="6" name="Neutron heating F6">
+    <filters>1 3</filters>
+    <scores>heating</scores>
+  </tally>
+  <tally id="46" name="Gamma heating F6">
+    <filters>1 7</filters>
+    <scores>heating</scores>
+  </tally>
+  <tally id="461" name="Positron heating F6">
+    <filters>1 11</filters>
+    <scores>heating</scores>
+  </tally>
+  <tally id="462" name="Electron heating F6">
+    <filters>1 9</filters>
+    <scores>heating</scores>
+  </tally>
+  <tally id="12" name="Neutron Flux at the external surface in course energy groups">
+    <filters>1 3 21</filters>
     <scores>flux</scores>
   </tally>
 </tallies>
\ No newline at end of file