From 37c046118b1e8a1e76094930e01d920b5a203055 Mon Sep 17 00:00:00 2001
From: Luis Antonio Obis Aparicio <luis.antonio.obis@gmail.com>
Date: Tue, 29 Oct 2024 14:13:11 +0100
Subject: [PATCH] update geometry

---
 gdml/BabyIAXO/Chamber.gdml                    |   5 +
 gdml/BabyIAXO/ChamberAndPipe.gdml             |   5 +
 gdml/BabyIAXO/CompleteVeto1Layers.gdml        |   5 +
 gdml/BabyIAXO/CompleteVeto2Layers.gdml        |   5 +
 gdml/BabyIAXO/CompleteVeto3Layers.gdml        |   5 +
 gdml/BabyIAXO/CompleteVeto4Layers.gdml        |   5 +
 gdml/BabyIAXO/Default.gdml                    |   5 +
 gdml/BabyIAXO/DefaultXenon.gdml               |   5 +
 gdml/BabyIAXO/DetectorPipe.gdml               |   5 +
 gdml/BabyIAXO/NoVetoes.gdml                   |   5 +
 gdml/BabyIAXO/NoVetoesGasNotSplit.gdml        |   5 +
 gdml/BabyIAXO/Shielding.gdml                  |   5 +
 gdml/BabyIAXO/ShieldingLayers.gdml            |   5 +
 gdml/BabyIAXO/ShieldingLayersNoCopperBox.gdml |   5 +
 gdml/BabyIAXO/Veto.gdml                       |   5 +
 gdml/BabyIAXO/VetoSystem.gdml                 |   5 +
 gdml/BabyIAXO/WithTelescopePipe.gdml          |   5 +
 gdml/IAXO-D1/Chamber.gdml                     |   5 +
 gdml/IAXO-D1/ChamberAndPipe.gdml              |   5 +
 gdml/IAXO-D1/CompleteVeto1Layers.gdml         | 351 +++++++++------
 gdml/IAXO-D1/CompleteVeto2Layers.gdml         | 373 +++++++++-------
 gdml/IAXO-D1/CompleteVeto3Layers.gdml         | 385 ++++++++++-------
 gdml/IAXO-D1/CompleteVeto4Layers.gdml         | 407 +++++++++++-------
 gdml/IAXO-D1/Default.gdml                     | 385 ++++++++++-------
 gdml/IAXO-D1/DefaultXenon.gdml                |   5 +
 gdml/IAXO-D1/DetectorPipe.gdml                |   5 +
 gdml/IAXO-D1/NeutronShieldingTubes.gdml       |   5 +
 gdml/IAXO-D1/NeutronShieldingVetoes.gdml      |   5 +
 gdml/IAXO-D1/NoVetoes.gdml                    |   5 +
 gdml/IAXO-D1/NoVetoesGasNotSplit.gdml         |   5 +
 gdml/IAXO-D1/Shielding.gdml                   |   5 +
 gdml/IAXO-D1/ShieldingLayers.gdml             |   5 +
 gdml/IAXO-D1/ShieldingLayersNoCopperBox.gdml  |   5 +
 gdml/IAXO-D1/Veto.gdml                        |   5 +
 gdml/IAXO-D1/VetoSystem.gdml                  | 385 ++++++++++-------
 gdml/IAXO-LiquidO/Default.gdml                |   5 +
 36 files changed, 1536 insertions(+), 900 deletions(-)

diff --git a/gdml/BabyIAXO/Chamber.gdml b/gdml/BabyIAXO/Chamber.gdml
index 24cc26e..04d0218 100644
--- a/gdml/BabyIAXO/Chamber.gdml
+++ b/gdml/BabyIAXO/Chamber.gdml
@@ -3193,6 +3193,11 @@
             <fraction n="0.05" ref="G4_B"/>
             <fraction n="0.95" ref="G4_POLYETHYLENE"/>
         </material>
+        <material state="solid" name="BoratedHDPE1pct">
+            <D value="0.96" unit="g/cm3"/>
+            <fraction n="0.01" ref="G4_B"/>
+            <fraction n="0.99" ref="G4_POLYETHYLENE"/>
+        </material>
         <material state="solid" name="EJ254-5pct">
             <D value="1.026" unit="g/cm3"/>
             <fraction n="0.084647652" ref="G4_H"/>
diff --git a/gdml/BabyIAXO/ChamberAndPipe.gdml b/gdml/BabyIAXO/ChamberAndPipe.gdml
index e1c36ab..d4c0e0d 100644
--- a/gdml/BabyIAXO/ChamberAndPipe.gdml
+++ b/gdml/BabyIAXO/ChamberAndPipe.gdml
@@ -3193,6 +3193,11 @@
             <fraction n="0.05" ref="G4_B"/>
             <fraction n="0.95" ref="G4_POLYETHYLENE"/>
         </material>
+        <material state="solid" name="BoratedHDPE1pct">
+            <D value="0.96" unit="g/cm3"/>
+            <fraction n="0.01" ref="G4_B"/>
+            <fraction n="0.99" ref="G4_POLYETHYLENE"/>
+        </material>
         <material state="solid" name="EJ254-5pct">
             <D value="1.026" unit="g/cm3"/>
             <fraction n="0.084647652" ref="G4_H"/>
diff --git a/gdml/BabyIAXO/CompleteVeto1Layers.gdml b/gdml/BabyIAXO/CompleteVeto1Layers.gdml
index 56fed2a..f4c149c 100644
--- a/gdml/BabyIAXO/CompleteVeto1Layers.gdml
+++ b/gdml/BabyIAXO/CompleteVeto1Layers.gdml
@@ -3193,6 +3193,11 @@
             <fraction n="0.05" ref="G4_B"/>
             <fraction n="0.95" ref="G4_POLYETHYLENE"/>
         </material>
+        <material state="solid" name="BoratedHDPE1pct">
+            <D value="0.96" unit="g/cm3"/>
+            <fraction n="0.01" ref="G4_B"/>
+            <fraction n="0.99" ref="G4_POLYETHYLENE"/>
+        </material>
         <material state="solid" name="EJ254-5pct">
             <D value="1.026" unit="g/cm3"/>
             <fraction n="0.084647652" ref="G4_H"/>
diff --git a/gdml/BabyIAXO/CompleteVeto2Layers.gdml b/gdml/BabyIAXO/CompleteVeto2Layers.gdml
index ecbba45..dc81cbd 100644
--- a/gdml/BabyIAXO/CompleteVeto2Layers.gdml
+++ b/gdml/BabyIAXO/CompleteVeto2Layers.gdml
@@ -3193,6 +3193,11 @@
             <fraction n="0.05" ref="G4_B"/>
             <fraction n="0.95" ref="G4_POLYETHYLENE"/>
         </material>
+        <material state="solid" name="BoratedHDPE1pct">
+            <D value="0.96" unit="g/cm3"/>
+            <fraction n="0.01" ref="G4_B"/>
+            <fraction n="0.99" ref="G4_POLYETHYLENE"/>
+        </material>
         <material state="solid" name="EJ254-5pct">
             <D value="1.026" unit="g/cm3"/>
             <fraction n="0.084647652" ref="G4_H"/>
diff --git a/gdml/BabyIAXO/CompleteVeto3Layers.gdml b/gdml/BabyIAXO/CompleteVeto3Layers.gdml
index 342fb62..f510dcf 100644
--- a/gdml/BabyIAXO/CompleteVeto3Layers.gdml
+++ b/gdml/BabyIAXO/CompleteVeto3Layers.gdml
@@ -3193,6 +3193,11 @@
             <fraction n="0.05" ref="G4_B"/>
             <fraction n="0.95" ref="G4_POLYETHYLENE"/>
         </material>
+        <material state="solid" name="BoratedHDPE1pct">
+            <D value="0.96" unit="g/cm3"/>
+            <fraction n="0.01" ref="G4_B"/>
+            <fraction n="0.99" ref="G4_POLYETHYLENE"/>
+        </material>
         <material state="solid" name="EJ254-5pct">
             <D value="1.026" unit="g/cm3"/>
             <fraction n="0.084647652" ref="G4_H"/>
diff --git a/gdml/BabyIAXO/CompleteVeto4Layers.gdml b/gdml/BabyIAXO/CompleteVeto4Layers.gdml
index 1eb4df9..5b7e8f8 100644
--- a/gdml/BabyIAXO/CompleteVeto4Layers.gdml
+++ b/gdml/BabyIAXO/CompleteVeto4Layers.gdml
@@ -3193,6 +3193,11 @@
             <fraction n="0.05" ref="G4_B"/>
             <fraction n="0.95" ref="G4_POLYETHYLENE"/>
         </material>
+        <material state="solid" name="BoratedHDPE1pct">
+            <D value="0.96" unit="g/cm3"/>
+            <fraction n="0.01" ref="G4_B"/>
+            <fraction n="0.99" ref="G4_POLYETHYLENE"/>
+        </material>
         <material state="solid" name="EJ254-5pct">
             <D value="1.026" unit="g/cm3"/>
             <fraction n="0.084647652" ref="G4_H"/>
diff --git a/gdml/BabyIAXO/Default.gdml b/gdml/BabyIAXO/Default.gdml
index 342fb62..f510dcf 100644
--- a/gdml/BabyIAXO/Default.gdml
+++ b/gdml/BabyIAXO/Default.gdml
@@ -3193,6 +3193,11 @@
             <fraction n="0.05" ref="G4_B"/>
             <fraction n="0.95" ref="G4_POLYETHYLENE"/>
         </material>
+        <material state="solid" name="BoratedHDPE1pct">
+            <D value="0.96" unit="g/cm3"/>
+            <fraction n="0.01" ref="G4_B"/>
+            <fraction n="0.99" ref="G4_POLYETHYLENE"/>
+        </material>
         <material state="solid" name="EJ254-5pct">
             <D value="1.026" unit="g/cm3"/>
             <fraction n="0.084647652" ref="G4_H"/>
diff --git a/gdml/BabyIAXO/DefaultXenon.gdml b/gdml/BabyIAXO/DefaultXenon.gdml
index 12dc920..8ba1cf0 100644
--- a/gdml/BabyIAXO/DefaultXenon.gdml
+++ b/gdml/BabyIAXO/DefaultXenon.gdml
@@ -3193,6 +3193,11 @@
             <fraction n="0.05" ref="G4_B"/>
             <fraction n="0.95" ref="G4_POLYETHYLENE"/>
         </material>
+        <material state="solid" name="BoratedHDPE1pct">
+            <D value="0.96" unit="g/cm3"/>
+            <fraction n="0.01" ref="G4_B"/>
+            <fraction n="0.99" ref="G4_POLYETHYLENE"/>
+        </material>
         <material state="solid" name="EJ254-5pct">
             <D value="1.026" unit="g/cm3"/>
             <fraction n="0.084647652" ref="G4_H"/>
diff --git a/gdml/BabyIAXO/DetectorPipe.gdml b/gdml/BabyIAXO/DetectorPipe.gdml
index 46df0d6..8b7691a 100644
--- a/gdml/BabyIAXO/DetectorPipe.gdml
+++ b/gdml/BabyIAXO/DetectorPipe.gdml
@@ -3193,6 +3193,11 @@
             <fraction n="0.05" ref="G4_B"/>
             <fraction n="0.95" ref="G4_POLYETHYLENE"/>
         </material>
+        <material state="solid" name="BoratedHDPE1pct">
+            <D value="0.96" unit="g/cm3"/>
+            <fraction n="0.01" ref="G4_B"/>
+            <fraction n="0.99" ref="G4_POLYETHYLENE"/>
+        </material>
         <material state="solid" name="EJ254-5pct">
             <D value="1.026" unit="g/cm3"/>
             <fraction n="0.084647652" ref="G4_H"/>
diff --git a/gdml/BabyIAXO/NoVetoes.gdml b/gdml/BabyIAXO/NoVetoes.gdml
index ac12870..13e69b9 100644
--- a/gdml/BabyIAXO/NoVetoes.gdml
+++ b/gdml/BabyIAXO/NoVetoes.gdml
@@ -3193,6 +3193,11 @@
             <fraction n="0.05" ref="G4_B"/>
             <fraction n="0.95" ref="G4_POLYETHYLENE"/>
         </material>
+        <material state="solid" name="BoratedHDPE1pct">
+            <D value="0.96" unit="g/cm3"/>
+            <fraction n="0.01" ref="G4_B"/>
+            <fraction n="0.99" ref="G4_POLYETHYLENE"/>
+        </material>
         <material state="solid" name="EJ254-5pct">
             <D value="1.026" unit="g/cm3"/>
             <fraction n="0.084647652" ref="G4_H"/>
diff --git a/gdml/BabyIAXO/NoVetoesGasNotSplit.gdml b/gdml/BabyIAXO/NoVetoesGasNotSplit.gdml
index 1725601..b7863ea 100644
--- a/gdml/BabyIAXO/NoVetoesGasNotSplit.gdml
+++ b/gdml/BabyIAXO/NoVetoesGasNotSplit.gdml
@@ -3193,6 +3193,11 @@
             <fraction n="0.05" ref="G4_B"/>
             <fraction n="0.95" ref="G4_POLYETHYLENE"/>
         </material>
+        <material state="solid" name="BoratedHDPE1pct">
+            <D value="0.96" unit="g/cm3"/>
+            <fraction n="0.01" ref="G4_B"/>
+            <fraction n="0.99" ref="G4_POLYETHYLENE"/>
+        </material>
         <material state="solid" name="EJ254-5pct">
             <D value="1.026" unit="g/cm3"/>
             <fraction n="0.084647652" ref="G4_H"/>
diff --git a/gdml/BabyIAXO/Shielding.gdml b/gdml/BabyIAXO/Shielding.gdml
index 024e0ec..c0d41b9 100644
--- a/gdml/BabyIAXO/Shielding.gdml
+++ b/gdml/BabyIAXO/Shielding.gdml
@@ -3193,6 +3193,11 @@
             <fraction n="0.05" ref="G4_B"/>
             <fraction n="0.95" ref="G4_POLYETHYLENE"/>
         </material>
+        <material state="solid" name="BoratedHDPE1pct">
+            <D value="0.96" unit="g/cm3"/>
+            <fraction n="0.01" ref="G4_B"/>
+            <fraction n="0.99" ref="G4_POLYETHYLENE"/>
+        </material>
         <material state="solid" name="EJ254-5pct">
             <D value="1.026" unit="g/cm3"/>
             <fraction n="0.084647652" ref="G4_H"/>
diff --git a/gdml/BabyIAXO/ShieldingLayers.gdml b/gdml/BabyIAXO/ShieldingLayers.gdml
index 9e32bc9..a336ce6 100644
--- a/gdml/BabyIAXO/ShieldingLayers.gdml
+++ b/gdml/BabyIAXO/ShieldingLayers.gdml
@@ -3193,6 +3193,11 @@
             <fraction n="0.05" ref="G4_B"/>
             <fraction n="0.95" ref="G4_POLYETHYLENE"/>
         </material>
+        <material state="solid" name="BoratedHDPE1pct">
+            <D value="0.96" unit="g/cm3"/>
+            <fraction n="0.01" ref="G4_B"/>
+            <fraction n="0.99" ref="G4_POLYETHYLENE"/>
+        </material>
         <material state="solid" name="EJ254-5pct">
             <D value="1.026" unit="g/cm3"/>
             <fraction n="0.084647652" ref="G4_H"/>
diff --git a/gdml/BabyIAXO/ShieldingLayersNoCopperBox.gdml b/gdml/BabyIAXO/ShieldingLayersNoCopperBox.gdml
index ee3adfe..4c175e3 100644
--- a/gdml/BabyIAXO/ShieldingLayersNoCopperBox.gdml
+++ b/gdml/BabyIAXO/ShieldingLayersNoCopperBox.gdml
@@ -3193,6 +3193,11 @@
             <fraction n="0.05" ref="G4_B"/>
             <fraction n="0.95" ref="G4_POLYETHYLENE"/>
         </material>
+        <material state="solid" name="BoratedHDPE1pct">
+            <D value="0.96" unit="g/cm3"/>
+            <fraction n="0.01" ref="G4_B"/>
+            <fraction n="0.99" ref="G4_POLYETHYLENE"/>
+        </material>
         <material state="solid" name="EJ254-5pct">
             <D value="1.026" unit="g/cm3"/>
             <fraction n="0.084647652" ref="G4_H"/>
diff --git a/gdml/BabyIAXO/Veto.gdml b/gdml/BabyIAXO/Veto.gdml
index e17edce..ca20400 100644
--- a/gdml/BabyIAXO/Veto.gdml
+++ b/gdml/BabyIAXO/Veto.gdml
@@ -3193,6 +3193,11 @@
             <fraction n="0.05" ref="G4_B"/>
             <fraction n="0.95" ref="G4_POLYETHYLENE"/>
         </material>
+        <material state="solid" name="BoratedHDPE1pct">
+            <D value="0.96" unit="g/cm3"/>
+            <fraction n="0.01" ref="G4_B"/>
+            <fraction n="0.99" ref="G4_POLYETHYLENE"/>
+        </material>
         <material state="solid" name="EJ254-5pct">
             <D value="1.026" unit="g/cm3"/>
             <fraction n="0.084647652" ref="G4_H"/>
diff --git a/gdml/BabyIAXO/VetoSystem.gdml b/gdml/BabyIAXO/VetoSystem.gdml
index cb13f05..c8cc9b7 100644
--- a/gdml/BabyIAXO/VetoSystem.gdml
+++ b/gdml/BabyIAXO/VetoSystem.gdml
@@ -3193,6 +3193,11 @@
             <fraction n="0.05" ref="G4_B"/>
             <fraction n="0.95" ref="G4_POLYETHYLENE"/>
         </material>
+        <material state="solid" name="BoratedHDPE1pct">
+            <D value="0.96" unit="g/cm3"/>
+            <fraction n="0.01" ref="G4_B"/>
+            <fraction n="0.99" ref="G4_POLYETHYLENE"/>
+        </material>
         <material state="solid" name="EJ254-5pct">
             <D value="1.026" unit="g/cm3"/>
             <fraction n="0.084647652" ref="G4_H"/>
diff --git a/gdml/BabyIAXO/WithTelescopePipe.gdml b/gdml/BabyIAXO/WithTelescopePipe.gdml
index 20e85de..63b658f 100644
--- a/gdml/BabyIAXO/WithTelescopePipe.gdml
+++ b/gdml/BabyIAXO/WithTelescopePipe.gdml
@@ -3193,6 +3193,11 @@
             <fraction n="0.05" ref="G4_B"/>
             <fraction n="0.95" ref="G4_POLYETHYLENE"/>
         </material>
+        <material state="solid" name="BoratedHDPE1pct">
+            <D value="0.96" unit="g/cm3"/>
+            <fraction n="0.01" ref="G4_B"/>
+            <fraction n="0.99" ref="G4_POLYETHYLENE"/>
+        </material>
         <material state="solid" name="EJ254-5pct">
             <D value="1.026" unit="g/cm3"/>
             <fraction n="0.084647652" ref="G4_H"/>
diff --git a/gdml/IAXO-D1/Chamber.gdml b/gdml/IAXO-D1/Chamber.gdml
index 59647d3..22c6617 100644
--- a/gdml/IAXO-D1/Chamber.gdml
+++ b/gdml/IAXO-D1/Chamber.gdml
@@ -3193,6 +3193,11 @@
             <fraction n="0.05" ref="G4_B"/>
             <fraction n="0.95" ref="G4_POLYETHYLENE"/>
         </material>
+        <material state="solid" name="BoratedHDPE1pct">
+            <D value="0.96" unit="g/cm3"/>
+            <fraction n="0.01" ref="G4_B"/>
+            <fraction n="0.99" ref="G4_POLYETHYLENE"/>
+        </material>
         <material state="solid" name="EJ254-5pct">
             <D value="1.026" unit="g/cm3"/>
             <fraction n="0.084647652" ref="G4_H"/>
diff --git a/gdml/IAXO-D1/ChamberAndPipe.gdml b/gdml/IAXO-D1/ChamberAndPipe.gdml
index d04fdea..18007f3 100644
--- a/gdml/IAXO-D1/ChamberAndPipe.gdml
+++ b/gdml/IAXO-D1/ChamberAndPipe.gdml
@@ -3193,6 +3193,11 @@
             <fraction n="0.05" ref="G4_B"/>
             <fraction n="0.95" ref="G4_POLYETHYLENE"/>
         </material>
+        <material state="solid" name="BoratedHDPE1pct">
+            <D value="0.96" unit="g/cm3"/>
+            <fraction n="0.01" ref="G4_B"/>
+            <fraction n="0.99" ref="G4_POLYETHYLENE"/>
+        </material>
         <material state="solid" name="EJ254-5pct">
             <D value="1.026" unit="g/cm3"/>
             <fraction n="0.084647652" ref="G4_H"/>
diff --git a/gdml/IAXO-D1/CompleteVeto1Layers.gdml b/gdml/IAXO-D1/CompleteVeto1Layers.gdml
index 7738623..a77655b 100644
--- a/gdml/IAXO-D1/CompleteVeto1Layers.gdml
+++ b/gdml/IAXO-D1/CompleteVeto1Layers.gdml
@@ -3193,6 +3193,11 @@
             <fraction n="0.05" ref="G4_B"/>
             <fraction n="0.95" ref="G4_POLYETHYLENE"/>
         </material>
+        <material state="solid" name="BoratedHDPE1pct">
+            <D value="0.96" unit="g/cm3"/>
+            <fraction n="0.01" ref="G4_B"/>
+            <fraction n="0.99" ref="G4_POLYETHYLENE"/>
+        </material>
         <material state="solid" name="EJ254-5pct">
             <D value="1.026" unit="g/cm3"/>
             <fraction n="0.084647652" ref="G4_H"/>
@@ -4437,6 +4442,44 @@
                 <position name="assembly-6.veto4.position" x="310.5" unit="mm"/>
             </physvol>
         </assembly>
+        <assembly name="assembly-7">
+            <physvol name="scintillatorVolume-1500.0mm-73266210">
+                <volumeref ref="scintillatorVolume-1500.0mm"/>
+            </physvol>
+            <physvol name="scintillatorWrappingSolid-1500.0mm-73266211">
+                <volumeref ref="scintillatorWrappingSolid-1500.0mm"/>
+            </physvol>
+            <physvol name="captureLayerVolume-1500.0mm-73266212">
+                <volumeref ref="captureLayerVolume-1500.0mm"/>
+                <position name="captureLayerVolume-1500.0mm-73266212.position" y="26.5" unit="mm"/>
+            </physvol>
+            <physvol name="captureLayerVolume-1500.0mm-73266213">
+                <volumeref ref="captureLayerVolume-1500.0mm"/>
+                <position name="captureLayerVolume-1500.0mm-73266213.position" y="-26.5" unit="mm"/>
+            </physvol>
+            <physvol name="scintillatorLightGuideVolume-1500.0mm-73266214">
+                <volumeref ref="scintillatorLightGuideVolume-1500.0mm"/>
+                <position name="scintillatorLightGuideVolume-1500.0mm-73266214.position" z="-815.0" unit="mm"/>
+            </physvol>
+        </assembly>
+        <assembly name="assembly-8">
+            <physvol name="assembly-8.veto1">
+                <volumeref ref="assembly-7"/>
+                <position name="assembly-8.veto1.position" x="-310.5" unit="mm"/>
+            </physvol>
+            <physvol name="assembly-8.veto2">
+                <volumeref ref="assembly-7"/>
+                <position name="assembly-8.veto2.position" x="-103.5" unit="mm"/>
+            </physvol>
+            <physvol name="assembly-8.veto3">
+                <volumeref ref="assembly-7"/>
+                <position name="assembly-8.veto3.position" x="103.5" unit="mm"/>
+            </physvol>
+            <physvol name="assembly-8.veto4">
+                <volumeref ref="assembly-7"/>
+                <position name="assembly-8.veto4.position" x="310.5" unit="mm"/>
+            </physvol>
+        </assembly>
         <volume name="scintillatorVolume-800.0mm">
             <materialref ref="BC408"/>
             <solidref ref="scintillatorSolid-800.0mm"/>
@@ -4453,279 +4496,317 @@
             <materialref ref="G4_LUCITE"/>
             <solidref ref="scintillatorLightGuideSolid-800.0mm"/>
         </volume>
-        <assembly name="assembly-8">
-            <physvol name="scintillatorVolume-800.0mm-73266211">
+        <assembly name="assembly-10">
+            <physvol name="scintillatorVolume-800.0mm-f1a5df66">
                 <volumeref ref="scintillatorVolume-800.0mm"/>
             </physvol>
-            <physvol name="scintillatorWrappingSolid-800.0mm-73266212">
+            <physvol name="scintillatorWrappingSolid-800.0mm-f1a5df67">
                 <volumeref ref="scintillatorWrappingSolid-800.0mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-800.0mm-73266213">
+            <physvol name="captureLayerVolume-800.0mm-f1a5df68">
                 <volumeref ref="captureLayerVolume-800.0mm"/>
-                <position name="captureLayerVolume-800.0mm-73266213.position" y="26.5" unit="mm"/>
+                <position name="captureLayerVolume-800.0mm-f1a5df68.position" y="26.5" unit="mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-800.0mm-73266214">
+            <physvol name="captureLayerVolume-800.0mm-f1a5df69">
                 <volumeref ref="captureLayerVolume-800.0mm"/>
-                <position name="captureLayerVolume-800.0mm-73266214.position" y="-26.5" unit="mm"/>
+                <position name="captureLayerVolume-800.0mm-f1a5df69.position" y="-26.5" unit="mm"/>
             </physvol>
-            <physvol name="scintillatorLightGuideVolume-800.0mm-73266215">
+            <physvol name="scintillatorLightGuideVolume-800.0mm-f1a5df6a">
                 <volumeref ref="scintillatorLightGuideVolume-800.0mm"/>
-                <position name="scintillatorLightGuideVolume-800.0mm-73266215.position" z="-465.0" unit="mm"/>
+                <position name="scintillatorLightGuideVolume-800.0mm-f1a5df6a.position" z="-465.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-9">
-            <physvol name="assembly-9.veto1">
-                <volumeref ref="assembly-8"/>
-                <position name="assembly-9.veto1.position" x="-207.0" unit="mm"/>
+        <assembly name="assembly-11">
+            <physvol name="assembly-11.veto1">
+                <volumeref ref="assembly-10"/>
+                <position name="assembly-11.veto1.position" x="-207.0" unit="mm"/>
             </physvol>
-            <physvol name="assembly-9.veto2">
-                <volumeref ref="assembly-8"/>
-                <position name="assembly-9.veto2.position" unit="mm"/>
+            <physvol name="assembly-11.veto2">
+                <volumeref ref="assembly-10"/>
+                <position name="assembly-11.veto2.position" unit="mm"/>
             </physvol>
-            <physvol name="assembly-9.veto3">
-                <volumeref ref="assembly-8"/>
-                <position name="assembly-9.veto3.position" x="207.0" unit="mm"/>
+            <physvol name="assembly-11.veto3">
+                <volumeref ref="assembly-10"/>
+                <position name="assembly-11.veto3.position" x="207.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-7">
+        <assembly name="assembly-9">
             <physvol name="vetoLayerTop1">
-                <volumeref ref="assembly-9"/>
+                <volumeref ref="assembly-11"/>
                 <position name="vetoLayerTop1.position" y="-35.0" z="-240.0" unit="mm"/>
                 <rotation name="vetoLayerTop1.rotation" y="180.0" unit="deg"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-10">
-            <physvol name="scintillatorVolume-1500.0mm-f1a5df66">
+        <assembly name="assembly-12">
+            <physvol name="scintillatorVolume-1500.0mm-f1a5df68">
                 <volumeref ref="scintillatorVolume-1500.0mm"/>
             </physvol>
-            <physvol name="scintillatorWrappingSolid-1500.0mm-f1a5df67">
+            <physvol name="scintillatorWrappingSolid-1500.0mm-f1a5df69">
                 <volumeref ref="scintillatorWrappingSolid-1500.0mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-1500.0mm-f1a5df68">
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df6a">
                 <volumeref ref="captureLayerVolume-1500.0mm"/>
-                <position name="captureLayerVolume-1500.0mm-f1a5df68.position" y="26.5" unit="mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df6a.position" y="26.5" unit="mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-1500.0mm-f1a5df69">
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df6b">
                 <volumeref ref="captureLayerVolume-1500.0mm"/>
-                <position name="captureLayerVolume-1500.0mm-f1a5df69.position" y="-26.5" unit="mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df6b.position" y="-26.5" unit="mm"/>
             </physvol>
-            <physvol name="scintillatorLightGuideVolume-1500.0mm-f1a5df6a">
+            <physvol name="scintillatorLightGuideVolume-1500.0mm-f1a5df6c">
                 <volumeref ref="scintillatorLightGuideVolume-1500.0mm"/>
-                <position name="scintillatorLightGuideVolume-1500.0mm-f1a5df6a.position" z="-815.0" unit="mm"/>
+                <position name="scintillatorLightGuideVolume-1500.0mm-f1a5df6c.position" z="-815.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-11">
-            <physvol name="assembly-11.veto1">
-                <volumeref ref="assembly-10"/>
-                <position name="assembly-11.veto1.position" x="-310.5" unit="mm"/>
+        <assembly name="assembly-13">
+            <physvol name="assembly-13.veto1">
+                <volumeref ref="assembly-12"/>
+                <position name="assembly-13.veto1.position" x="-310.5" unit="mm"/>
             </physvol>
-            <physvol name="assembly-11.veto2">
-                <volumeref ref="assembly-10"/>
-                <position name="assembly-11.veto2.position" x="-103.5" unit="mm"/>
+            <physvol name="assembly-13.veto2">
+                <volumeref ref="assembly-12"/>
+                <position name="assembly-13.veto2.position" x="-103.5" unit="mm"/>
             </physvol>
-            <physvol name="assembly-11.veto3">
-                <volumeref ref="assembly-10"/>
-                <position name="assembly-11.veto3.position" x="103.5" unit="mm"/>
+            <physvol name="assembly-13.veto3">
+                <volumeref ref="assembly-12"/>
+                <position name="assembly-13.veto3.position" x="103.5" unit="mm"/>
             </physvol>
-            <physvol name="assembly-11.veto4">
-                <volumeref ref="assembly-10"/>
-                <position name="assembly-11.veto4.position" x="310.5" unit="mm"/>
+            <physvol name="assembly-13.veto4">
+                <volumeref ref="assembly-12"/>
+                <position name="assembly-13.veto4.position" x="310.5" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-12">
+        <assembly name="assembly-14">
+            <physvol name="scintillatorVolume-1500.0mm-f1a5df6a">
+                <volumeref ref="scintillatorVolume-1500.0mm"/>
+            </physvol>
+            <physvol name="scintillatorWrappingSolid-1500.0mm-f1a5df6b">
+                <volumeref ref="scintillatorWrappingSolid-1500.0mm"/>
+            </physvol>
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df6c">
+                <volumeref ref="captureLayerVolume-1500.0mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df6c.position" y="26.5" unit="mm"/>
+            </physvol>
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df6d">
+                <volumeref ref="captureLayerVolume-1500.0mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df6d.position" y="-26.5" unit="mm"/>
+            </physvol>
+            <physvol name="scintillatorLightGuideVolume-1500.0mm-f1a5df6e">
+                <volumeref ref="scintillatorLightGuideVolume-1500.0mm"/>
+                <position name="scintillatorLightGuideVolume-1500.0mm-f1a5df6e.position" z="-815.0" unit="mm"/>
+            </physvol>
+        </assembly>
+        <assembly name="assembly-15">
+            <physvol name="assembly-15.veto1">
+                <volumeref ref="assembly-14"/>
+                <position name="assembly-15.veto1.position" x="-310.5" unit="mm"/>
+            </physvol>
+            <physvol name="assembly-15.veto2">
+                <volumeref ref="assembly-14"/>
+                <position name="assembly-15.veto2.position" x="-103.5" unit="mm"/>
+            </physvol>
+            <physvol name="assembly-15.veto3">
+                <volumeref ref="assembly-14"/>
+                <position name="assembly-15.veto3.position" x="103.5" unit="mm"/>
+            </physvol>
+            <physvol name="assembly-15.veto4">
+                <volumeref ref="assembly-14"/>
+                <position name="assembly-15.veto4.position" x="310.5" unit="mm"/>
+            </physvol>
+        </assembly>
+        <assembly name="assembly-16">
             <physvol name="vetoLayerBottom1">
-                <volumeref ref="assembly-11"/>
+                <volumeref ref="assembly-13"/>
                 <position name="vetoLayerBottom1.position" y="20.0" unit="mm"/>
                 <rotation name="vetoLayerBottom1.rotation" y="360.0" unit="deg"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-13">
-            <physvol name="scintillatorVolume-1500.0mm-f1a5df69">
+        <assembly name="assembly-17">
+            <physvol name="scintillatorVolume-1500.0mm-f1a5df6d">
                 <volumeref ref="scintillatorVolume-1500.0mm"/>
             </physvol>
-            <physvol name="scintillatorWrappingSolid-1500.0mm-f1a5df6a">
+            <physvol name="scintillatorWrappingSolid-1500.0mm-f1a5df6e">
                 <volumeref ref="scintillatorWrappingSolid-1500.0mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-1500.0mm-f1a5df6b">
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df6f">
                 <volumeref ref="captureLayerVolume-1500.0mm"/>
-                <position name="captureLayerVolume-1500.0mm-f1a5df6b.position" y="26.5" unit="mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df6f.position" y="26.5" unit="mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-1500.0mm-f1a5df6c">
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df70">
                 <volumeref ref="captureLayerVolume-1500.0mm"/>
-                <position name="captureLayerVolume-1500.0mm-f1a5df6c.position" y="-26.5" unit="mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df70.position" y="-26.5" unit="mm"/>
             </physvol>
-            <physvol name="scintillatorLightGuideVolume-1500.0mm-f1a5df6d">
+            <physvol name="scintillatorLightGuideVolume-1500.0mm-f1a5df71">
                 <volumeref ref="scintillatorLightGuideVolume-1500.0mm"/>
-                <position name="scintillatorLightGuideVolume-1500.0mm-f1a5df6d.position" z="-815.0" unit="mm"/>
+                <position name="scintillatorLightGuideVolume-1500.0mm-f1a5df71.position" z="-815.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-14">
-            <physvol name="assembly-14.veto1">
-                <volumeref ref="assembly-13"/>
-                <position name="assembly-14.veto1.position" x="-212.0" unit="mm"/>
+        <assembly name="assembly-18">
+            <physvol name="assembly-18.veto1">
+                <volumeref ref="assembly-17"/>
+                <position name="assembly-18.veto1.position" x="-212.0" unit="mm"/>
             </physvol>
-            <physvol name="assembly-14.veto2">
-                <volumeref ref="assembly-13"/>
-                <position name="assembly-14.veto2.position" unit="mm"/>
+            <physvol name="assembly-18.veto2">
+                <volumeref ref="assembly-17"/>
+                <position name="assembly-18.veto2.position" unit="mm"/>
             </physvol>
-            <physvol name="assembly-14.veto3">
-                <volumeref ref="assembly-13"/>
-                <position name="assembly-14.veto3.position" x="212.0" unit="mm"/>
+            <physvol name="assembly-18.veto3">
+                <volumeref ref="assembly-17"/>
+                <position name="assembly-18.veto3.position" x="212.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-15">
+        <assembly name="assembly-19">
             <physvol name="vetoLayerRight1">
-                <volumeref ref="assembly-14"/>
+                <volumeref ref="assembly-18"/>
                 <position name="vetoLayerRight1.position" x="-0.0" unit="mm"/>
                 <rotation name="vetoLayerRight1.rotation" x="180.0" z="-90.0" unit="deg"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-16">
-            <physvol name="scintillatorVolume-1500.0mm-f1a5df6c">
+        <assembly name="assembly-20">
+            <physvol name="scintillatorVolume-1500.0mm-f1a5df85">
                 <volumeref ref="scintillatorVolume-1500.0mm"/>
             </physvol>
-            <physvol name="scintillatorWrappingSolid-1500.0mm-f1a5df6d">
+            <physvol name="scintillatorWrappingSolid-1500.0mm-f1a5df86">
                 <volumeref ref="scintillatorWrappingSolid-1500.0mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-1500.0mm-f1a5df6e">
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df87">
                 <volumeref ref="captureLayerVolume-1500.0mm"/>
-                <position name="captureLayerVolume-1500.0mm-f1a5df6e.position" y="26.5" unit="mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df87.position" y="26.5" unit="mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-1500.0mm-f1a5df6f">
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df88">
                 <volumeref ref="captureLayerVolume-1500.0mm"/>
-                <position name="captureLayerVolume-1500.0mm-f1a5df6f.position" y="-26.5" unit="mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df88.position" y="-26.5" unit="mm"/>
             </physvol>
-            <physvol name="scintillatorLightGuideVolume-1500.0mm-f1a5df70">
+            <physvol name="scintillatorLightGuideVolume-1500.0mm-f1a5df89">
                 <volumeref ref="scintillatorLightGuideVolume-1500.0mm"/>
-                <position name="scintillatorLightGuideVolume-1500.0mm-f1a5df70.position" z="-815.0" unit="mm"/>
+                <position name="scintillatorLightGuideVolume-1500.0mm-f1a5df89.position" z="-815.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-17">
-            <physvol name="assembly-17.veto1">
-                <volumeref ref="assembly-16"/>
-                <position name="assembly-17.veto1.position" x="-212.0" unit="mm"/>
+        <assembly name="assembly-21">
+            <physvol name="assembly-21.veto1">
+                <volumeref ref="assembly-20"/>
+                <position name="assembly-21.veto1.position" x="-212.0" unit="mm"/>
             </physvol>
-            <physvol name="assembly-17.veto2">
-                <volumeref ref="assembly-16"/>
-                <position name="assembly-17.veto2.position" unit="mm"/>
+            <physvol name="assembly-21.veto2">
+                <volumeref ref="assembly-20"/>
+                <position name="assembly-21.veto2.position" unit="mm"/>
             </physvol>
-            <physvol name="assembly-17.veto3">
-                <volumeref ref="assembly-16"/>
-                <position name="assembly-17.veto3.position" x="212.0" unit="mm"/>
+            <physvol name="assembly-21.veto3">
+                <volumeref ref="assembly-20"/>
+                <position name="assembly-21.veto3.position" x="212.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-18">
+        <assembly name="assembly-22">
             <physvol name="vetoLayerLeft1">
-                <volumeref ref="assembly-17"/>
+                <volumeref ref="assembly-21"/>
                 <position name="vetoLayerLeft1.position" unit="mm"/>
                 <rotation name="vetoLayerLeft1.rotation" z="90.0" unit="deg"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-19">
-            <physvol name="scintillatorVolume-800.0mm-f1a5df6f">
+        <assembly name="assembly-23">
+            <physvol name="scintillatorVolume-800.0mm-f1a5df88">
                 <volumeref ref="scintillatorVolume-800.0mm"/>
             </physvol>
-            <physvol name="scintillatorWrappingSolid-800.0mm-f1a5df70">
+            <physvol name="scintillatorWrappingSolid-800.0mm-f1a5df89">
                 <volumeref ref="scintillatorWrappingSolid-800.0mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-800.0mm-f1a5df71">
+            <physvol name="captureLayerVolume-800.0mm-f1a5df8a">
                 <volumeref ref="captureLayerVolume-800.0mm"/>
-                <position name="captureLayerVolume-800.0mm-f1a5df71.position" y="26.5" unit="mm"/>
+                <position name="captureLayerVolume-800.0mm-f1a5df8a.position" y="26.5" unit="mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-800.0mm-f1a5df72">
+            <physvol name="captureLayerVolume-800.0mm-f1a5df8b">
                 <volumeref ref="captureLayerVolume-800.0mm"/>
-                <position name="captureLayerVolume-800.0mm-f1a5df72.position" y="-26.5" unit="mm"/>
+                <position name="captureLayerVolume-800.0mm-f1a5df8b.position" y="-26.5" unit="mm"/>
             </physvol>
-            <physvol name="scintillatorLightGuideVolume-800.0mm-f1a5df73">
+            <physvol name="scintillatorLightGuideVolume-800.0mm-f1a5df8c">
                 <volumeref ref="scintillatorLightGuideVolume-800.0mm"/>
-                <position name="scintillatorLightGuideVolume-800.0mm-f1a5df73.position" z="-465.0" unit="mm"/>
+                <position name="scintillatorLightGuideVolume-800.0mm-f1a5df8c.position" z="-465.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-20">
-            <physvol name="assembly-20.veto1">
-                <volumeref ref="assembly-19"/>
-                <position name="assembly-20.veto1.position" x="-212.0" unit="mm"/>
+        <assembly name="assembly-24">
+            <physvol name="assembly-24.veto1">
+                <volumeref ref="assembly-23"/>
+                <position name="assembly-24.veto1.position" x="-212.0" unit="mm"/>
             </physvol>
-            <physvol name="assembly-20.veto2">
-                <volumeref ref="assembly-19"/>
-                <position name="assembly-20.veto2.position" unit="mm"/>
+            <physvol name="assembly-24.veto2">
+                <volumeref ref="assembly-23"/>
+                <position name="assembly-24.veto2.position" unit="mm"/>
             </physvol>
-            <physvol name="assembly-20.veto3">
-                <volumeref ref="assembly-19"/>
-                <position name="assembly-20.veto3.position" x="212.0" unit="mm"/>
+            <physvol name="assembly-24.veto3">
+                <volumeref ref="assembly-23"/>
+                <position name="assembly-24.veto3.position" x="212.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-21">
+        <assembly name="assembly-25">
             <physvol name="vetoLayerBack1">
-                <volumeref ref="assembly-20"/>
+                <volumeref ref="assembly-24"/>
                 <position name="vetoLayerBack1.position" z="-0.0" unit="mm"/>
                 <rotation name="vetoLayerBack1.rotation" x="-90.0" y="-90.0" unit="deg"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-22">
-            <physvol name="scintillatorVolume-800.0mm-f1a5df87">
+        <assembly name="assembly-26">
+            <physvol name="scintillatorVolume-800.0mm-f1a5df8b">
                 <volumeref ref="scintillatorVolume-800.0mm"/>
             </physvol>
-            <physvol name="scintillatorWrappingSolid-800.0mm-f1a5df88">
+            <physvol name="scintillatorWrappingSolid-800.0mm-f1a5df8c">
                 <volumeref ref="scintillatorWrappingSolid-800.0mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-800.0mm-f1a5df89">
+            <physvol name="captureLayerVolume-800.0mm-f1a5df8d">
                 <volumeref ref="captureLayerVolume-800.0mm"/>
-                <position name="captureLayerVolume-800.0mm-f1a5df89.position" y="26.5" unit="mm"/>
+                <position name="captureLayerVolume-800.0mm-f1a5df8d.position" y="26.5" unit="mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-800.0mm-f1a5df8a">
+            <physvol name="captureLayerVolume-800.0mm-f1a5df8e">
                 <volumeref ref="captureLayerVolume-800.0mm"/>
-                <position name="captureLayerVolume-800.0mm-f1a5df8a.position" y="-26.5" unit="mm"/>
+                <position name="captureLayerVolume-800.0mm-f1a5df8e.position" y="-26.5" unit="mm"/>
             </physvol>
-            <physvol name="scintillatorLightGuideVolume-800.0mm-f1a5df8b">
+            <physvol name="scintillatorLightGuideVolume-800.0mm-f1a5df8f">
                 <volumeref ref="scintillatorLightGuideVolume-800.0mm"/>
-                <position name="scintillatorLightGuideVolume-800.0mm-f1a5df8b.position" z="-465.0" unit="mm"/>
+                <position name="scintillatorLightGuideVolume-800.0mm-f1a5df8f.position" z="-465.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-23">
-            <physvol name="assembly-23.veto1">
-                <volumeref ref="assembly-22"/>
-                <position name="assembly-23.veto1.position" x="-212.0" unit="mm"/>
+        <assembly name="assembly-27">
+            <physvol name="assembly-27.veto1">
+                <volumeref ref="assembly-26"/>
+                <position name="assembly-27.veto1.position" x="-212.0" unit="mm"/>
             </physvol>
-            <physvol name="assembly-23.veto2">
-                <volumeref ref="assembly-22"/>
-                <position name="assembly-23.veto2.position" unit="mm"/>
+            <physvol name="assembly-27.veto2">
+                <volumeref ref="assembly-26"/>
+                <position name="assembly-27.veto2.position" unit="mm"/>
             </physvol>
-            <physvol name="assembly-23.veto3">
-                <volumeref ref="assembly-22"/>
-                <position name="assembly-23.veto3.position" x="212.0" unit="mm"/>
+            <physvol name="assembly-27.veto3">
+                <volumeref ref="assembly-26"/>
+                <position name="assembly-27.veto3.position" x="212.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-24">
+        <assembly name="assembly-28">
             <physvol name="vetoLayerFront1">
-                <volumeref ref="assembly-23"/>
+                <volumeref ref="assembly-27"/>
                 <position name="vetoLayerFront1.position" unit="mm"/>
                 <rotation name="vetoLayerFront1.rotation" x="-90.0" y="90.0" unit="deg"/>
             </physvol>
         </assembly>
         <assembly name="assembly-4">
             <physvol name="vetoSystemTop">
-                <volumeref ref="assembly-7"/>
+                <volumeref ref="assembly-9"/>
                 <position name="vetoSystemTop.position" y="327.0" z="19.5" unit="mm"/>
             </physvol>
             <physvol name="vetoSystemBottom">
-                <volumeref ref="assembly-12"/>
+                <volumeref ref="assembly-16"/>
                 <position name="vetoSystemBottom.position" y="-437.0" z="19.5" unit="mm"/>
             </physvol>
             <physvol name="vetoSystemRight">
-                <volumeref ref="assembly-15"/>
+                <volumeref ref="assembly-19"/>
                 <position name="vetoSystemRight.position" x="-387.0" z="119.5" unit="mm"/>
             </physvol>
             <physvol name="vetoSystemLeft">
-                <volumeref ref="assembly-18"/>
+                <volumeref ref="assembly-22"/>
                 <position name="vetoSystemLeft.position" x="387.0" z="-80.5" unit="mm"/>
             </physvol>
             <physvol name="vetoSystemBack">
-                <volumeref ref="assembly-21"/>
+                <volumeref ref="assembly-25"/>
                 <position name="vetoSystemBack.position" x="-65.0" z="-692.5" unit="mm"/>
             </physvol>
             <physvol name="vetoSystemFront">
-                <volumeref ref="assembly-24"/>
+                <volumeref ref="assembly-28"/>
                 <position name="vetoSystemFront.position" x="65.0" z="711.5" unit="mm"/>
             </physvol>
         </assembly>
diff --git a/gdml/IAXO-D1/CompleteVeto2Layers.gdml b/gdml/IAXO-D1/CompleteVeto2Layers.gdml
index 1d93d06..d7dd7f0 100644
--- a/gdml/IAXO-D1/CompleteVeto2Layers.gdml
+++ b/gdml/IAXO-D1/CompleteVeto2Layers.gdml
@@ -3193,6 +3193,11 @@
             <fraction n="0.05" ref="G4_B"/>
             <fraction n="0.95" ref="G4_POLYETHYLENE"/>
         </material>
+        <material state="solid" name="BoratedHDPE1pct">
+            <D value="0.96" unit="g/cm3"/>
+            <fraction n="0.01" ref="G4_B"/>
+            <fraction n="0.99" ref="G4_POLYETHYLENE"/>
+        </material>
         <material state="solid" name="EJ254-5pct">
             <D value="1.026" unit="g/cm3"/>
             <fraction n="0.084647652" ref="G4_H"/>
@@ -4437,6 +4442,44 @@
                 <position name="assembly-6.veto4.position" x="310.5" unit="mm"/>
             </physvol>
         </assembly>
+        <assembly name="assembly-7">
+            <physvol name="scintillatorVolume-1500.0mm-73266210">
+                <volumeref ref="scintillatorVolume-1500.0mm"/>
+            </physvol>
+            <physvol name="scintillatorWrappingSolid-1500.0mm-73266211">
+                <volumeref ref="scintillatorWrappingSolid-1500.0mm"/>
+            </physvol>
+            <physvol name="captureLayerVolume-1500.0mm-73266212">
+                <volumeref ref="captureLayerVolume-1500.0mm"/>
+                <position name="captureLayerVolume-1500.0mm-73266212.position" y="26.5" unit="mm"/>
+            </physvol>
+            <physvol name="captureLayerVolume-1500.0mm-73266213">
+                <volumeref ref="captureLayerVolume-1500.0mm"/>
+                <position name="captureLayerVolume-1500.0mm-73266213.position" y="-26.5" unit="mm"/>
+            </physvol>
+            <physvol name="scintillatorLightGuideVolume-1500.0mm-73266214">
+                <volumeref ref="scintillatorLightGuideVolume-1500.0mm"/>
+                <position name="scintillatorLightGuideVolume-1500.0mm-73266214.position" z="-815.0" unit="mm"/>
+            </physvol>
+        </assembly>
+        <assembly name="assembly-8">
+            <physvol name="assembly-8.veto1">
+                <volumeref ref="assembly-7"/>
+                <position name="assembly-8.veto1.position" x="-310.5" unit="mm"/>
+            </physvol>
+            <physvol name="assembly-8.veto2">
+                <volumeref ref="assembly-7"/>
+                <position name="assembly-8.veto2.position" x="-103.5" unit="mm"/>
+            </physvol>
+            <physvol name="assembly-8.veto3">
+                <volumeref ref="assembly-7"/>
+                <position name="assembly-8.veto3.position" x="103.5" unit="mm"/>
+            </physvol>
+            <physvol name="assembly-8.veto4">
+                <volumeref ref="assembly-7"/>
+                <position name="assembly-8.veto4.position" x="310.5" unit="mm"/>
+            </physvol>
+        </assembly>
         <volume name="scintillatorVolume-800.0mm">
             <materialref ref="BC408"/>
             <solidref ref="scintillatorSolid-800.0mm"/>
@@ -4453,309 +4496,347 @@
             <materialref ref="G4_LUCITE"/>
             <solidref ref="scintillatorLightGuideSolid-800.0mm"/>
         </volume>
-        <assembly name="assembly-8">
-            <physvol name="scintillatorVolume-800.0mm-73266211">
+        <assembly name="assembly-10">
+            <physvol name="scintillatorVolume-800.0mm-f1a5df66">
                 <volumeref ref="scintillatorVolume-800.0mm"/>
             </physvol>
-            <physvol name="scintillatorWrappingSolid-800.0mm-73266212">
+            <physvol name="scintillatorWrappingSolid-800.0mm-f1a5df67">
                 <volumeref ref="scintillatorWrappingSolid-800.0mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-800.0mm-73266213">
+            <physvol name="captureLayerVolume-800.0mm-f1a5df68">
                 <volumeref ref="captureLayerVolume-800.0mm"/>
-                <position name="captureLayerVolume-800.0mm-73266213.position" y="26.5" unit="mm"/>
+                <position name="captureLayerVolume-800.0mm-f1a5df68.position" y="26.5" unit="mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-800.0mm-73266214">
+            <physvol name="captureLayerVolume-800.0mm-f1a5df69">
                 <volumeref ref="captureLayerVolume-800.0mm"/>
-                <position name="captureLayerVolume-800.0mm-73266214.position" y="-26.5" unit="mm"/>
+                <position name="captureLayerVolume-800.0mm-f1a5df69.position" y="-26.5" unit="mm"/>
             </physvol>
-            <physvol name="scintillatorLightGuideVolume-800.0mm-73266215">
+            <physvol name="scintillatorLightGuideVolume-800.0mm-f1a5df6a">
                 <volumeref ref="scintillatorLightGuideVolume-800.0mm"/>
-                <position name="scintillatorLightGuideVolume-800.0mm-73266215.position" z="-465.0" unit="mm"/>
+                <position name="scintillatorLightGuideVolume-800.0mm-f1a5df6a.position" z="-465.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-9">
-            <physvol name="assembly-9.veto1">
-                <volumeref ref="assembly-8"/>
-                <position name="assembly-9.veto1.position" x="-207.0" unit="mm"/>
+        <assembly name="assembly-11">
+            <physvol name="assembly-11.veto1">
+                <volumeref ref="assembly-10"/>
+                <position name="assembly-11.veto1.position" x="-207.0" unit="mm"/>
             </physvol>
-            <physvol name="assembly-9.veto2">
-                <volumeref ref="assembly-8"/>
-                <position name="assembly-9.veto2.position" unit="mm"/>
+            <physvol name="assembly-11.veto2">
+                <volumeref ref="assembly-10"/>
+                <position name="assembly-11.veto2.position" unit="mm"/>
             </physvol>
-            <physvol name="assembly-9.veto3">
-                <volumeref ref="assembly-8"/>
-                <position name="assembly-9.veto3.position" x="207.0" unit="mm"/>
+            <physvol name="assembly-11.veto3">
+                <volumeref ref="assembly-10"/>
+                <position name="assembly-11.veto3.position" x="207.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-7">
+        <assembly name="assembly-9">
             <physvol name="vetoLayerTop1">
-                <volumeref ref="assembly-9"/>
+                <volumeref ref="assembly-11"/>
                 <position name="vetoLayerTop1.position" y="-35.0" z="-240.0" unit="mm"/>
                 <rotation name="vetoLayerTop1.rotation" y="180.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerTop2">
-                <volumeref ref="assembly-6"/>
+                <volumeref ref="assembly-8"/>
                 <position name="vetoLayerTop2.position" y="59.0" unit="mm"/>
                 <rotation name="vetoLayerTop2.rotation" y="360.0" unit="deg"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-10">
-            <physvol name="scintillatorVolume-1500.0mm-f1a5df66">
+        <assembly name="assembly-12">
+            <physvol name="scintillatorVolume-1500.0mm-f1a5df68">
                 <volumeref ref="scintillatorVolume-1500.0mm"/>
             </physvol>
-            <physvol name="scintillatorWrappingSolid-1500.0mm-f1a5df67">
+            <physvol name="scintillatorWrappingSolid-1500.0mm-f1a5df69">
                 <volumeref ref="scintillatorWrappingSolid-1500.0mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-1500.0mm-f1a5df68">
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df6a">
                 <volumeref ref="captureLayerVolume-1500.0mm"/>
-                <position name="captureLayerVolume-1500.0mm-f1a5df68.position" y="26.5" unit="mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df6a.position" y="26.5" unit="mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-1500.0mm-f1a5df69">
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df6b">
                 <volumeref ref="captureLayerVolume-1500.0mm"/>
-                <position name="captureLayerVolume-1500.0mm-f1a5df69.position" y="-26.5" unit="mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df6b.position" y="-26.5" unit="mm"/>
             </physvol>
-            <physvol name="scintillatorLightGuideVolume-1500.0mm-f1a5df6a">
+            <physvol name="scintillatorLightGuideVolume-1500.0mm-f1a5df6c">
                 <volumeref ref="scintillatorLightGuideVolume-1500.0mm"/>
-                <position name="scintillatorLightGuideVolume-1500.0mm-f1a5df6a.position" z="-815.0" unit="mm"/>
+                <position name="scintillatorLightGuideVolume-1500.0mm-f1a5df6c.position" z="-815.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-11">
-            <physvol name="assembly-11.veto1">
-                <volumeref ref="assembly-10"/>
-                <position name="assembly-11.veto1.position" x="-310.5" unit="mm"/>
+        <assembly name="assembly-13">
+            <physvol name="assembly-13.veto1">
+                <volumeref ref="assembly-12"/>
+                <position name="assembly-13.veto1.position" x="-310.5" unit="mm"/>
             </physvol>
-            <physvol name="assembly-11.veto2">
-                <volumeref ref="assembly-10"/>
-                <position name="assembly-11.veto2.position" x="-103.5" unit="mm"/>
+            <physvol name="assembly-13.veto2">
+                <volumeref ref="assembly-12"/>
+                <position name="assembly-13.veto2.position" x="-103.5" unit="mm"/>
             </physvol>
-            <physvol name="assembly-11.veto3">
-                <volumeref ref="assembly-10"/>
-                <position name="assembly-11.veto3.position" x="103.5" unit="mm"/>
+            <physvol name="assembly-13.veto3">
+                <volumeref ref="assembly-12"/>
+                <position name="assembly-13.veto3.position" x="103.5" unit="mm"/>
             </physvol>
-            <physvol name="assembly-11.veto4">
-                <volumeref ref="assembly-10"/>
-                <position name="assembly-11.veto4.position" x="310.5" unit="mm"/>
+            <physvol name="assembly-13.veto4">
+                <volumeref ref="assembly-12"/>
+                <position name="assembly-13.veto4.position" x="310.5" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-12">
+        <assembly name="assembly-14">
+            <physvol name="scintillatorVolume-1500.0mm-f1a5df6a">
+                <volumeref ref="scintillatorVolume-1500.0mm"/>
+            </physvol>
+            <physvol name="scintillatorWrappingSolid-1500.0mm-f1a5df6b">
+                <volumeref ref="scintillatorWrappingSolid-1500.0mm"/>
+            </physvol>
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df6c">
+                <volumeref ref="captureLayerVolume-1500.0mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df6c.position" y="26.5" unit="mm"/>
+            </physvol>
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df6d">
+                <volumeref ref="captureLayerVolume-1500.0mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df6d.position" y="-26.5" unit="mm"/>
+            </physvol>
+            <physvol name="scintillatorLightGuideVolume-1500.0mm-f1a5df6e">
+                <volumeref ref="scintillatorLightGuideVolume-1500.0mm"/>
+                <position name="scintillatorLightGuideVolume-1500.0mm-f1a5df6e.position" z="-815.0" unit="mm"/>
+            </physvol>
+        </assembly>
+        <assembly name="assembly-15">
+            <physvol name="assembly-15.veto1">
+                <volumeref ref="assembly-14"/>
+                <position name="assembly-15.veto1.position" x="-310.5" unit="mm"/>
+            </physvol>
+            <physvol name="assembly-15.veto2">
+                <volumeref ref="assembly-14"/>
+                <position name="assembly-15.veto2.position" x="-103.5" unit="mm"/>
+            </physvol>
+            <physvol name="assembly-15.veto3">
+                <volumeref ref="assembly-14"/>
+                <position name="assembly-15.veto3.position" x="103.5" unit="mm"/>
+            </physvol>
+            <physvol name="assembly-15.veto4">
+                <volumeref ref="assembly-14"/>
+                <position name="assembly-15.veto4.position" x="310.5" unit="mm"/>
+            </physvol>
+        </assembly>
+        <assembly name="assembly-16">
             <physvol name="vetoLayerBottom1">
-                <volumeref ref="assembly-11"/>
+                <volumeref ref="assembly-13"/>
                 <position name="vetoLayerBottom1.position" y="20.0" unit="mm"/>
                 <rotation name="vetoLayerBottom1.rotation" y="360.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerBottom2">
-                <volumeref ref="assembly-11"/>
+                <volumeref ref="assembly-15"/>
                 <position name="vetoLayerBottom2.position" y="-59.0" unit="mm"/>
                 <rotation name="vetoLayerBottom2.rotation" y="540.0" unit="deg"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-13">
-            <physvol name="scintillatorVolume-1500.0mm-f1a5df69">
+        <assembly name="assembly-17">
+            <physvol name="scintillatorVolume-1500.0mm-f1a5df6d">
                 <volumeref ref="scintillatorVolume-1500.0mm"/>
             </physvol>
-            <physvol name="scintillatorWrappingSolid-1500.0mm-f1a5df6a">
+            <physvol name="scintillatorWrappingSolid-1500.0mm-f1a5df6e">
                 <volumeref ref="scintillatorWrappingSolid-1500.0mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-1500.0mm-f1a5df6b">
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df6f">
                 <volumeref ref="captureLayerVolume-1500.0mm"/>
-                <position name="captureLayerVolume-1500.0mm-f1a5df6b.position" y="26.5" unit="mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df6f.position" y="26.5" unit="mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-1500.0mm-f1a5df6c">
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df70">
                 <volumeref ref="captureLayerVolume-1500.0mm"/>
-                <position name="captureLayerVolume-1500.0mm-f1a5df6c.position" y="-26.5" unit="mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df70.position" y="-26.5" unit="mm"/>
             </physvol>
-            <physvol name="scintillatorLightGuideVolume-1500.0mm-f1a5df6d">
+            <physvol name="scintillatorLightGuideVolume-1500.0mm-f1a5df71">
                 <volumeref ref="scintillatorLightGuideVolume-1500.0mm"/>
-                <position name="scintillatorLightGuideVolume-1500.0mm-f1a5df6d.position" z="-815.0" unit="mm"/>
+                <position name="scintillatorLightGuideVolume-1500.0mm-f1a5df71.position" z="-815.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-14">
-            <physvol name="assembly-14.veto1">
-                <volumeref ref="assembly-13"/>
-                <position name="assembly-14.veto1.position" x="-212.0" unit="mm"/>
+        <assembly name="assembly-18">
+            <physvol name="assembly-18.veto1">
+                <volumeref ref="assembly-17"/>
+                <position name="assembly-18.veto1.position" x="-212.0" unit="mm"/>
             </physvol>
-            <physvol name="assembly-14.veto2">
-                <volumeref ref="assembly-13"/>
-                <position name="assembly-14.veto2.position" unit="mm"/>
+            <physvol name="assembly-18.veto2">
+                <volumeref ref="assembly-17"/>
+                <position name="assembly-18.veto2.position" unit="mm"/>
             </physvol>
-            <physvol name="assembly-14.veto3">
-                <volumeref ref="assembly-13"/>
-                <position name="assembly-14.veto3.position" x="212.0" unit="mm"/>
+            <physvol name="assembly-18.veto3">
+                <volumeref ref="assembly-17"/>
+                <position name="assembly-18.veto3.position" x="212.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-15">
+        <assembly name="assembly-19">
             <physvol name="vetoLayerRight1">
-                <volumeref ref="assembly-14"/>
+                <volumeref ref="assembly-18"/>
                 <position name="vetoLayerRight1.position" x="-0.0" unit="mm"/>
                 <rotation name="vetoLayerRight1.rotation" x="180.0" z="-90.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerRight2">
-                <volumeref ref="assembly-14"/>
+                <volumeref ref="assembly-18"/>
                 <position name="vetoLayerRight2.position" x="-74.0" unit="mm"/>
                 <rotation name="vetoLayerRight2.rotation" x="180.0" z="-90.0" unit="deg"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-16">
-            <physvol name="scintillatorVolume-1500.0mm-f1a5df6c">
+        <assembly name="assembly-20">
+            <physvol name="scintillatorVolume-1500.0mm-f1a5df85">
                 <volumeref ref="scintillatorVolume-1500.0mm"/>
             </physvol>
-            <physvol name="scintillatorWrappingSolid-1500.0mm-f1a5df6d">
+            <physvol name="scintillatorWrappingSolid-1500.0mm-f1a5df86">
                 <volumeref ref="scintillatorWrappingSolid-1500.0mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-1500.0mm-f1a5df6e">
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df87">
                 <volumeref ref="captureLayerVolume-1500.0mm"/>
-                <position name="captureLayerVolume-1500.0mm-f1a5df6e.position" y="26.5" unit="mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df87.position" y="26.5" unit="mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-1500.0mm-f1a5df6f">
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df88">
                 <volumeref ref="captureLayerVolume-1500.0mm"/>
-                <position name="captureLayerVolume-1500.0mm-f1a5df6f.position" y="-26.5" unit="mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df88.position" y="-26.5" unit="mm"/>
             </physvol>
-            <physvol name="scintillatorLightGuideVolume-1500.0mm-f1a5df70">
+            <physvol name="scintillatorLightGuideVolume-1500.0mm-f1a5df89">
                 <volumeref ref="scintillatorLightGuideVolume-1500.0mm"/>
-                <position name="scintillatorLightGuideVolume-1500.0mm-f1a5df70.position" z="-815.0" unit="mm"/>
+                <position name="scintillatorLightGuideVolume-1500.0mm-f1a5df89.position" z="-815.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-17">
-            <physvol name="assembly-17.veto1">
-                <volumeref ref="assembly-16"/>
-                <position name="assembly-17.veto1.position" x="-212.0" unit="mm"/>
+        <assembly name="assembly-21">
+            <physvol name="assembly-21.veto1">
+                <volumeref ref="assembly-20"/>
+                <position name="assembly-21.veto1.position" x="-212.0" unit="mm"/>
             </physvol>
-            <physvol name="assembly-17.veto2">
-                <volumeref ref="assembly-16"/>
-                <position name="assembly-17.veto2.position" unit="mm"/>
+            <physvol name="assembly-21.veto2">
+                <volumeref ref="assembly-20"/>
+                <position name="assembly-21.veto2.position" unit="mm"/>
             </physvol>
-            <physvol name="assembly-17.veto3">
-                <volumeref ref="assembly-16"/>
-                <position name="assembly-17.veto3.position" x="212.0" unit="mm"/>
+            <physvol name="assembly-21.veto3">
+                <volumeref ref="assembly-20"/>
+                <position name="assembly-21.veto3.position" x="212.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-18">
+        <assembly name="assembly-22">
             <physvol name="vetoLayerLeft1">
-                <volumeref ref="assembly-17"/>
+                <volumeref ref="assembly-21"/>
                 <position name="vetoLayerLeft1.position" unit="mm"/>
                 <rotation name="vetoLayerLeft1.rotation" z="90.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerLeft2">
-                <volumeref ref="assembly-17"/>
+                <volumeref ref="assembly-21"/>
                 <position name="vetoLayerLeft2.position" x="74.0" unit="mm"/>
                 <rotation name="vetoLayerLeft2.rotation" z="90.0" unit="deg"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-19">
-            <physvol name="scintillatorVolume-800.0mm-f1a5df6f">
+        <assembly name="assembly-23">
+            <physvol name="scintillatorVolume-800.0mm-f1a5df88">
                 <volumeref ref="scintillatorVolume-800.0mm"/>
             </physvol>
-            <physvol name="scintillatorWrappingSolid-800.0mm-f1a5df70">
+            <physvol name="scintillatorWrappingSolid-800.0mm-f1a5df89">
                 <volumeref ref="scintillatorWrappingSolid-800.0mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-800.0mm-f1a5df71">
+            <physvol name="captureLayerVolume-800.0mm-f1a5df8a">
                 <volumeref ref="captureLayerVolume-800.0mm"/>
-                <position name="captureLayerVolume-800.0mm-f1a5df71.position" y="26.5" unit="mm"/>
+                <position name="captureLayerVolume-800.0mm-f1a5df8a.position" y="26.5" unit="mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-800.0mm-f1a5df72">
+            <physvol name="captureLayerVolume-800.0mm-f1a5df8b">
                 <volumeref ref="captureLayerVolume-800.0mm"/>
-                <position name="captureLayerVolume-800.0mm-f1a5df72.position" y="-26.5" unit="mm"/>
+                <position name="captureLayerVolume-800.0mm-f1a5df8b.position" y="-26.5" unit="mm"/>
             </physvol>
-            <physvol name="scintillatorLightGuideVolume-800.0mm-f1a5df73">
+            <physvol name="scintillatorLightGuideVolume-800.0mm-f1a5df8c">
                 <volumeref ref="scintillatorLightGuideVolume-800.0mm"/>
-                <position name="scintillatorLightGuideVolume-800.0mm-f1a5df73.position" z="-465.0" unit="mm"/>
+                <position name="scintillatorLightGuideVolume-800.0mm-f1a5df8c.position" z="-465.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-20">
-            <physvol name="assembly-20.veto1">
-                <volumeref ref="assembly-19"/>
-                <position name="assembly-20.veto1.position" x="-212.0" unit="mm"/>
+        <assembly name="assembly-24">
+            <physvol name="assembly-24.veto1">
+                <volumeref ref="assembly-23"/>
+                <position name="assembly-24.veto1.position" x="-212.0" unit="mm"/>
             </physvol>
-            <physvol name="assembly-20.veto2">
-                <volumeref ref="assembly-19"/>
-                <position name="assembly-20.veto2.position" unit="mm"/>
+            <physvol name="assembly-24.veto2">
+                <volumeref ref="assembly-23"/>
+                <position name="assembly-24.veto2.position" unit="mm"/>
             </physvol>
-            <physvol name="assembly-20.veto3">
-                <volumeref ref="assembly-19"/>
-                <position name="assembly-20.veto3.position" x="212.0" unit="mm"/>
+            <physvol name="assembly-24.veto3">
+                <volumeref ref="assembly-23"/>
+                <position name="assembly-24.veto3.position" x="212.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-21">
-            <physvol name="vetoLayerBack1">
-                <volumeref ref="assembly-20"/>
-                <position name="vetoLayerBack1.position" z="-0.0" unit="mm"/>
-                <rotation name="vetoLayerBack1.rotation" x="-90.0" y="-90.0" unit="deg"/>
-            </physvol>
+        <assembly name="assembly-25">
             <physvol name="vetoLayerBack2">
-                <volumeref ref="assembly-20"/>
-                <position name="vetoLayerBack2.position" z="-74.0" unit="mm"/>
+                <volumeref ref="assembly-24"/>
+                <position name="vetoLayerBack2.position" z="-0.0" unit="mm"/>
                 <rotation name="vetoLayerBack2.rotation" x="-90.0" y="-90.0" unit="deg"/>
             </physvol>
+            <physvol name="vetoLayerBack1">
+                <volumeref ref="assembly-24"/>
+                <position name="vetoLayerBack1.position" z="-74.0" unit="mm"/>
+                <rotation name="vetoLayerBack1.rotation" x="-90.0" y="-90.0" unit="deg"/>
+            </physvol>
         </assembly>
-        <assembly name="assembly-22">
-            <physvol name="scintillatorVolume-800.0mm-f1a5df87">
+        <assembly name="assembly-26">
+            <physvol name="scintillatorVolume-800.0mm-f1a5df8b">
                 <volumeref ref="scintillatorVolume-800.0mm"/>
             </physvol>
-            <physvol name="scintillatorWrappingSolid-800.0mm-f1a5df88">
+            <physvol name="scintillatorWrappingSolid-800.0mm-f1a5df8c">
                 <volumeref ref="scintillatorWrappingSolid-800.0mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-800.0mm-f1a5df89">
+            <physvol name="captureLayerVolume-800.0mm-f1a5df8d">
                 <volumeref ref="captureLayerVolume-800.0mm"/>
-                <position name="captureLayerVolume-800.0mm-f1a5df89.position" y="26.5" unit="mm"/>
+                <position name="captureLayerVolume-800.0mm-f1a5df8d.position" y="26.5" unit="mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-800.0mm-f1a5df8a">
+            <physvol name="captureLayerVolume-800.0mm-f1a5df8e">
                 <volumeref ref="captureLayerVolume-800.0mm"/>
-                <position name="captureLayerVolume-800.0mm-f1a5df8a.position" y="-26.5" unit="mm"/>
+                <position name="captureLayerVolume-800.0mm-f1a5df8e.position" y="-26.5" unit="mm"/>
             </physvol>
-            <physvol name="scintillatorLightGuideVolume-800.0mm-f1a5df8b">
+            <physvol name="scintillatorLightGuideVolume-800.0mm-f1a5df8f">
                 <volumeref ref="scintillatorLightGuideVolume-800.0mm"/>
-                <position name="scintillatorLightGuideVolume-800.0mm-f1a5df8b.position" z="-465.0" unit="mm"/>
+                <position name="scintillatorLightGuideVolume-800.0mm-f1a5df8f.position" z="-465.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-23">
-            <physvol name="assembly-23.veto1">
-                <volumeref ref="assembly-22"/>
-                <position name="assembly-23.veto1.position" x="-212.0" unit="mm"/>
+        <assembly name="assembly-27">
+            <physvol name="assembly-27.veto1">
+                <volumeref ref="assembly-26"/>
+                <position name="assembly-27.veto1.position" x="-212.0" unit="mm"/>
             </physvol>
-            <physvol name="assembly-23.veto2">
-                <volumeref ref="assembly-22"/>
-                <position name="assembly-23.veto2.position" unit="mm"/>
+            <physvol name="assembly-27.veto2">
+                <volumeref ref="assembly-26"/>
+                <position name="assembly-27.veto2.position" unit="mm"/>
             </physvol>
-            <physvol name="assembly-23.veto3">
-                <volumeref ref="assembly-22"/>
-                <position name="assembly-23.veto3.position" x="212.0" unit="mm"/>
+            <physvol name="assembly-27.veto3">
+                <volumeref ref="assembly-26"/>
+                <position name="assembly-27.veto3.position" x="212.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-24">
+        <assembly name="assembly-28">
             <physvol name="vetoLayerFront1">
-                <volumeref ref="assembly-23"/>
+                <volumeref ref="assembly-27"/>
                 <position name="vetoLayerFront1.position" unit="mm"/>
                 <rotation name="vetoLayerFront1.rotation" x="-90.0" y="90.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerFront2">
-                <volumeref ref="assembly-23"/>
+                <volumeref ref="assembly-27"/>
                 <position name="vetoLayerFront2.position" z="74.0" unit="mm"/>
                 <rotation name="vetoLayerFront2.rotation" x="-90.0" y="90.0" unit="deg"/>
             </physvol>
         </assembly>
         <assembly name="assembly-4">
             <physvol name="vetoSystemTop">
-                <volumeref ref="assembly-7"/>
+                <volumeref ref="assembly-9"/>
                 <position name="vetoSystemTop.position" y="327.0" z="19.5" unit="mm"/>
             </physvol>
             <physvol name="vetoSystemBottom">
-                <volumeref ref="assembly-12"/>
+                <volumeref ref="assembly-16"/>
                 <position name="vetoSystemBottom.position" y="-437.0" z="19.5" unit="mm"/>
             </physvol>
             <physvol name="vetoSystemRight">
-                <volumeref ref="assembly-15"/>
+                <volumeref ref="assembly-19"/>
                 <position name="vetoSystemRight.position" x="-387.0" z="119.5" unit="mm"/>
             </physvol>
             <physvol name="vetoSystemLeft">
-                <volumeref ref="assembly-18"/>
+                <volumeref ref="assembly-22"/>
                 <position name="vetoSystemLeft.position" x="387.0" z="-80.5" unit="mm"/>
             </physvol>
             <physvol name="vetoSystemBack">
-                <volumeref ref="assembly-21"/>
+                <volumeref ref="assembly-25"/>
                 <position name="vetoSystemBack.position" x="-65.0" z="-692.5" unit="mm"/>
             </physvol>
             <physvol name="vetoSystemFront">
-                <volumeref ref="assembly-24"/>
+                <volumeref ref="assembly-28"/>
                 <position name="vetoSystemFront.position" x="65.0" z="711.5" unit="mm"/>
             </physvol>
         </assembly>
diff --git a/gdml/IAXO-D1/CompleteVeto3Layers.gdml b/gdml/IAXO-D1/CompleteVeto3Layers.gdml
index 44cec78..d5f6cfa 100644
--- a/gdml/IAXO-D1/CompleteVeto3Layers.gdml
+++ b/gdml/IAXO-D1/CompleteVeto3Layers.gdml
@@ -3193,6 +3193,11 @@
             <fraction n="0.05" ref="G4_B"/>
             <fraction n="0.95" ref="G4_POLYETHYLENE"/>
         </material>
+        <material state="solid" name="BoratedHDPE1pct">
+            <D value="0.96" unit="g/cm3"/>
+            <fraction n="0.01" ref="G4_B"/>
+            <fraction n="0.99" ref="G4_POLYETHYLENE"/>
+        </material>
         <material state="solid" name="EJ254-5pct">
             <D value="1.026" unit="g/cm3"/>
             <fraction n="0.084647652" ref="G4_H"/>
@@ -4437,6 +4442,44 @@
                 <position name="assembly-6.veto4.position" x="310.5" unit="mm"/>
             </physvol>
         </assembly>
+        <assembly name="assembly-7">
+            <physvol name="scintillatorVolume-1500.0mm-73266210">
+                <volumeref ref="scintillatorVolume-1500.0mm"/>
+            </physvol>
+            <physvol name="scintillatorWrappingSolid-1500.0mm-73266211">
+                <volumeref ref="scintillatorWrappingSolid-1500.0mm"/>
+            </physvol>
+            <physvol name="captureLayerVolume-1500.0mm-73266212">
+                <volumeref ref="captureLayerVolume-1500.0mm"/>
+                <position name="captureLayerVolume-1500.0mm-73266212.position" y="26.5" unit="mm"/>
+            </physvol>
+            <physvol name="captureLayerVolume-1500.0mm-73266213">
+                <volumeref ref="captureLayerVolume-1500.0mm"/>
+                <position name="captureLayerVolume-1500.0mm-73266213.position" y="-26.5" unit="mm"/>
+            </physvol>
+            <physvol name="scintillatorLightGuideVolume-1500.0mm-73266214">
+                <volumeref ref="scintillatorLightGuideVolume-1500.0mm"/>
+                <position name="scintillatorLightGuideVolume-1500.0mm-73266214.position" z="-815.0" unit="mm"/>
+            </physvol>
+        </assembly>
+        <assembly name="assembly-8">
+            <physvol name="assembly-8.veto1">
+                <volumeref ref="assembly-7"/>
+                <position name="assembly-8.veto1.position" x="-310.5" unit="mm"/>
+            </physvol>
+            <physvol name="assembly-8.veto2">
+                <volumeref ref="assembly-7"/>
+                <position name="assembly-8.veto2.position" x="-103.5" unit="mm"/>
+            </physvol>
+            <physvol name="assembly-8.veto3">
+                <volumeref ref="assembly-7"/>
+                <position name="assembly-8.veto3.position" x="103.5" unit="mm"/>
+            </physvol>
+            <physvol name="assembly-8.veto4">
+                <volumeref ref="assembly-7"/>
+                <position name="assembly-8.veto4.position" x="310.5" unit="mm"/>
+            </physvol>
+        </assembly>
         <volume name="scintillatorVolume-800.0mm">
             <materialref ref="BC408"/>
             <solidref ref="scintillatorSolid-800.0mm"/>
@@ -4453,48 +4496,48 @@
             <materialref ref="G4_LUCITE"/>
             <solidref ref="scintillatorLightGuideSolid-800.0mm"/>
         </volume>
-        <assembly name="assembly-8">
-            <physvol name="scintillatorVolume-800.0mm-73266211">
+        <assembly name="assembly-10">
+            <physvol name="scintillatorVolume-800.0mm-f1a5df66">
                 <volumeref ref="scintillatorVolume-800.0mm"/>
             </physvol>
-            <physvol name="scintillatorWrappingSolid-800.0mm-73266212">
+            <physvol name="scintillatorWrappingSolid-800.0mm-f1a5df67">
                 <volumeref ref="scintillatorWrappingSolid-800.0mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-800.0mm-73266213">
+            <physvol name="captureLayerVolume-800.0mm-f1a5df68">
                 <volumeref ref="captureLayerVolume-800.0mm"/>
-                <position name="captureLayerVolume-800.0mm-73266213.position" y="26.5" unit="mm"/>
+                <position name="captureLayerVolume-800.0mm-f1a5df68.position" y="26.5" unit="mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-800.0mm-73266214">
+            <physvol name="captureLayerVolume-800.0mm-f1a5df69">
                 <volumeref ref="captureLayerVolume-800.0mm"/>
-                <position name="captureLayerVolume-800.0mm-73266214.position" y="-26.5" unit="mm"/>
+                <position name="captureLayerVolume-800.0mm-f1a5df69.position" y="-26.5" unit="mm"/>
             </physvol>
-            <physvol name="scintillatorLightGuideVolume-800.0mm-73266215">
+            <physvol name="scintillatorLightGuideVolume-800.0mm-f1a5df6a">
                 <volumeref ref="scintillatorLightGuideVolume-800.0mm"/>
-                <position name="scintillatorLightGuideVolume-800.0mm-73266215.position" z="-465.0" unit="mm"/>
+                <position name="scintillatorLightGuideVolume-800.0mm-f1a5df6a.position" z="-465.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-9">
-            <physvol name="assembly-9.veto1">
-                <volumeref ref="assembly-8"/>
-                <position name="assembly-9.veto1.position" x="-207.0" unit="mm"/>
+        <assembly name="assembly-11">
+            <physvol name="assembly-11.veto1">
+                <volumeref ref="assembly-10"/>
+                <position name="assembly-11.veto1.position" x="-207.0" unit="mm"/>
             </physvol>
-            <physvol name="assembly-9.veto2">
-                <volumeref ref="assembly-8"/>
-                <position name="assembly-9.veto2.position" unit="mm"/>
+            <physvol name="assembly-11.veto2">
+                <volumeref ref="assembly-10"/>
+                <position name="assembly-11.veto2.position" unit="mm"/>
             </physvol>
-            <physvol name="assembly-9.veto3">
-                <volumeref ref="assembly-8"/>
-                <position name="assembly-9.veto3.position" x="207.0" unit="mm"/>
+            <physvol name="assembly-11.veto3">
+                <volumeref ref="assembly-10"/>
+                <position name="assembly-11.veto3.position" x="207.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-7">
+        <assembly name="assembly-9">
             <physvol name="vetoLayerTop1">
-                <volumeref ref="assembly-9"/>
+                <volumeref ref="assembly-11"/>
                 <position name="vetoLayerTop1.position" y="-35.0" z="-240.0" unit="mm"/>
                 <rotation name="vetoLayerTop1.rotation" y="180.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerTop2">
-                <volumeref ref="assembly-6"/>
+                <volumeref ref="assembly-8"/>
                 <position name="vetoLayerTop2.position" y="59.0" unit="mm"/>
                 <rotation name="vetoLayerTop2.rotation" y="360.0" unit="deg"/>
             </physvol>
@@ -4504,288 +4547,326 @@
                 <rotation name="vetoLayerTop3.rotation" y="540.0" unit="deg"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-10">
-            <physvol name="scintillatorVolume-1500.0mm-f1a5df66">
+        <assembly name="assembly-12">
+            <physvol name="scintillatorVolume-1500.0mm-f1a5df68">
                 <volumeref ref="scintillatorVolume-1500.0mm"/>
             </physvol>
-            <physvol name="scintillatorWrappingSolid-1500.0mm-f1a5df67">
+            <physvol name="scintillatorWrappingSolid-1500.0mm-f1a5df69">
                 <volumeref ref="scintillatorWrappingSolid-1500.0mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-1500.0mm-f1a5df68">
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df6a">
                 <volumeref ref="captureLayerVolume-1500.0mm"/>
-                <position name="captureLayerVolume-1500.0mm-f1a5df68.position" y="26.5" unit="mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df6a.position" y="26.5" unit="mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-1500.0mm-f1a5df69">
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df6b">
                 <volumeref ref="captureLayerVolume-1500.0mm"/>
-                <position name="captureLayerVolume-1500.0mm-f1a5df69.position" y="-26.5" unit="mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df6b.position" y="-26.5" unit="mm"/>
             </physvol>
-            <physvol name="scintillatorLightGuideVolume-1500.0mm-f1a5df6a">
+            <physvol name="scintillatorLightGuideVolume-1500.0mm-f1a5df6c">
                 <volumeref ref="scintillatorLightGuideVolume-1500.0mm"/>
-                <position name="scintillatorLightGuideVolume-1500.0mm-f1a5df6a.position" z="-815.0" unit="mm"/>
+                <position name="scintillatorLightGuideVolume-1500.0mm-f1a5df6c.position" z="-815.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-11">
-            <physvol name="assembly-11.veto1">
-                <volumeref ref="assembly-10"/>
-                <position name="assembly-11.veto1.position" x="-310.5" unit="mm"/>
+        <assembly name="assembly-13">
+            <physvol name="assembly-13.veto1">
+                <volumeref ref="assembly-12"/>
+                <position name="assembly-13.veto1.position" x="-310.5" unit="mm"/>
             </physvol>
-            <physvol name="assembly-11.veto2">
-                <volumeref ref="assembly-10"/>
-                <position name="assembly-11.veto2.position" x="-103.5" unit="mm"/>
+            <physvol name="assembly-13.veto2">
+                <volumeref ref="assembly-12"/>
+                <position name="assembly-13.veto2.position" x="-103.5" unit="mm"/>
             </physvol>
-            <physvol name="assembly-11.veto3">
-                <volumeref ref="assembly-10"/>
-                <position name="assembly-11.veto3.position" x="103.5" unit="mm"/>
+            <physvol name="assembly-13.veto3">
+                <volumeref ref="assembly-12"/>
+                <position name="assembly-13.veto3.position" x="103.5" unit="mm"/>
             </physvol>
-            <physvol name="assembly-11.veto4">
-                <volumeref ref="assembly-10"/>
-                <position name="assembly-11.veto4.position" x="310.5" unit="mm"/>
+            <physvol name="assembly-13.veto4">
+                <volumeref ref="assembly-12"/>
+                <position name="assembly-13.veto4.position" x="310.5" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-12">
+        <assembly name="assembly-14">
+            <physvol name="scintillatorVolume-1500.0mm-f1a5df6a">
+                <volumeref ref="scintillatorVolume-1500.0mm"/>
+            </physvol>
+            <physvol name="scintillatorWrappingSolid-1500.0mm-f1a5df6b">
+                <volumeref ref="scintillatorWrappingSolid-1500.0mm"/>
+            </physvol>
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df6c">
+                <volumeref ref="captureLayerVolume-1500.0mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df6c.position" y="26.5" unit="mm"/>
+            </physvol>
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df6d">
+                <volumeref ref="captureLayerVolume-1500.0mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df6d.position" y="-26.5" unit="mm"/>
+            </physvol>
+            <physvol name="scintillatorLightGuideVolume-1500.0mm-f1a5df6e">
+                <volumeref ref="scintillatorLightGuideVolume-1500.0mm"/>
+                <position name="scintillatorLightGuideVolume-1500.0mm-f1a5df6e.position" z="-815.0" unit="mm"/>
+            </physvol>
+        </assembly>
+        <assembly name="assembly-15">
+            <physvol name="assembly-15.veto1">
+                <volumeref ref="assembly-14"/>
+                <position name="assembly-15.veto1.position" x="-310.5" unit="mm"/>
+            </physvol>
+            <physvol name="assembly-15.veto2">
+                <volumeref ref="assembly-14"/>
+                <position name="assembly-15.veto2.position" x="-103.5" unit="mm"/>
+            </physvol>
+            <physvol name="assembly-15.veto3">
+                <volumeref ref="assembly-14"/>
+                <position name="assembly-15.veto3.position" x="103.5" unit="mm"/>
+            </physvol>
+            <physvol name="assembly-15.veto4">
+                <volumeref ref="assembly-14"/>
+                <position name="assembly-15.veto4.position" x="310.5" unit="mm"/>
+            </physvol>
+        </assembly>
+        <assembly name="assembly-16">
             <physvol name="vetoLayerBottom1">
-                <volumeref ref="assembly-11"/>
+                <volumeref ref="assembly-13"/>
                 <position name="vetoLayerBottom1.position" y="20.0" unit="mm"/>
                 <rotation name="vetoLayerBottom1.rotation" y="360.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerBottom2">
-                <volumeref ref="assembly-11"/>
+                <volumeref ref="assembly-15"/>
                 <position name="vetoLayerBottom2.position" y="-59.0" unit="mm"/>
                 <rotation name="vetoLayerBottom2.rotation" y="540.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerBottom3">
-                <volumeref ref="assembly-11"/>
+                <volumeref ref="assembly-13"/>
                 <position name="vetoLayerBottom3.position" y="-118.0" unit="mm"/>
                 <rotation name="vetoLayerBottom3.rotation" y="720.0" unit="deg"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-13">
-            <physvol name="scintillatorVolume-1500.0mm-f1a5df69">
+        <assembly name="assembly-17">
+            <physvol name="scintillatorVolume-1500.0mm-f1a5df6d">
                 <volumeref ref="scintillatorVolume-1500.0mm"/>
             </physvol>
-            <physvol name="scintillatorWrappingSolid-1500.0mm-f1a5df6a">
+            <physvol name="scintillatorWrappingSolid-1500.0mm-f1a5df6e">
                 <volumeref ref="scintillatorWrappingSolid-1500.0mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-1500.0mm-f1a5df6b">
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df6f">
                 <volumeref ref="captureLayerVolume-1500.0mm"/>
-                <position name="captureLayerVolume-1500.0mm-f1a5df6b.position" y="26.5" unit="mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df6f.position" y="26.5" unit="mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-1500.0mm-f1a5df6c">
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df70">
                 <volumeref ref="captureLayerVolume-1500.0mm"/>
-                <position name="captureLayerVolume-1500.0mm-f1a5df6c.position" y="-26.5" unit="mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df70.position" y="-26.5" unit="mm"/>
             </physvol>
-            <physvol name="scintillatorLightGuideVolume-1500.0mm-f1a5df6d">
+            <physvol name="scintillatorLightGuideVolume-1500.0mm-f1a5df71">
                 <volumeref ref="scintillatorLightGuideVolume-1500.0mm"/>
-                <position name="scintillatorLightGuideVolume-1500.0mm-f1a5df6d.position" z="-815.0" unit="mm"/>
+                <position name="scintillatorLightGuideVolume-1500.0mm-f1a5df71.position" z="-815.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-14">
-            <physvol name="assembly-14.veto1">
-                <volumeref ref="assembly-13"/>
-                <position name="assembly-14.veto1.position" x="-212.0" unit="mm"/>
+        <assembly name="assembly-18">
+            <physvol name="assembly-18.veto1">
+                <volumeref ref="assembly-17"/>
+                <position name="assembly-18.veto1.position" x="-212.0" unit="mm"/>
             </physvol>
-            <physvol name="assembly-14.veto2">
-                <volumeref ref="assembly-13"/>
-                <position name="assembly-14.veto2.position" unit="mm"/>
+            <physvol name="assembly-18.veto2">
+                <volumeref ref="assembly-17"/>
+                <position name="assembly-18.veto2.position" unit="mm"/>
             </physvol>
-            <physvol name="assembly-14.veto3">
-                <volumeref ref="assembly-13"/>
-                <position name="assembly-14.veto3.position" x="212.0" unit="mm"/>
+            <physvol name="assembly-18.veto3">
+                <volumeref ref="assembly-17"/>
+                <position name="assembly-18.veto3.position" x="212.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-15">
+        <assembly name="assembly-19">
             <physvol name="vetoLayerRight1">
-                <volumeref ref="assembly-14"/>
+                <volumeref ref="assembly-18"/>
                 <position name="vetoLayerRight1.position" x="-0.0" unit="mm"/>
                 <rotation name="vetoLayerRight1.rotation" x="180.0" z="-90.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerRight2">
-                <volumeref ref="assembly-14"/>
+                <volumeref ref="assembly-18"/>
                 <position name="vetoLayerRight2.position" x="-74.0" unit="mm"/>
                 <rotation name="vetoLayerRight2.rotation" x="180.0" z="-90.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerRight3">
-                <volumeref ref="assembly-14"/>
+                <volumeref ref="assembly-18"/>
                 <position name="vetoLayerRight3.position" x="-148.0" unit="mm"/>
                 <rotation name="vetoLayerRight3.rotation" x="180.0" z="-90.0" unit="deg"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-16">
-            <physvol name="scintillatorVolume-1500.0mm-f1a5df6c">
+        <assembly name="assembly-20">
+            <physvol name="scintillatorVolume-1500.0mm-f1a5df85">
                 <volumeref ref="scintillatorVolume-1500.0mm"/>
             </physvol>
-            <physvol name="scintillatorWrappingSolid-1500.0mm-f1a5df6d">
+            <physvol name="scintillatorWrappingSolid-1500.0mm-f1a5df86">
                 <volumeref ref="scintillatorWrappingSolid-1500.0mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-1500.0mm-f1a5df6e">
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df87">
                 <volumeref ref="captureLayerVolume-1500.0mm"/>
-                <position name="captureLayerVolume-1500.0mm-f1a5df6e.position" y="26.5" unit="mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df87.position" y="26.5" unit="mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-1500.0mm-f1a5df6f">
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df88">
                 <volumeref ref="captureLayerVolume-1500.0mm"/>
-                <position name="captureLayerVolume-1500.0mm-f1a5df6f.position" y="-26.5" unit="mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df88.position" y="-26.5" unit="mm"/>
             </physvol>
-            <physvol name="scintillatorLightGuideVolume-1500.0mm-f1a5df70">
+            <physvol name="scintillatorLightGuideVolume-1500.0mm-f1a5df89">
                 <volumeref ref="scintillatorLightGuideVolume-1500.0mm"/>
-                <position name="scintillatorLightGuideVolume-1500.0mm-f1a5df70.position" z="-815.0" unit="mm"/>
+                <position name="scintillatorLightGuideVolume-1500.0mm-f1a5df89.position" z="-815.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-17">
-            <physvol name="assembly-17.veto1">
-                <volumeref ref="assembly-16"/>
-                <position name="assembly-17.veto1.position" x="-212.0" unit="mm"/>
+        <assembly name="assembly-21">
+            <physvol name="assembly-21.veto1">
+                <volumeref ref="assembly-20"/>
+                <position name="assembly-21.veto1.position" x="-212.0" unit="mm"/>
             </physvol>
-            <physvol name="assembly-17.veto2">
-                <volumeref ref="assembly-16"/>
-                <position name="assembly-17.veto2.position" unit="mm"/>
+            <physvol name="assembly-21.veto2">
+                <volumeref ref="assembly-20"/>
+                <position name="assembly-21.veto2.position" unit="mm"/>
             </physvol>
-            <physvol name="assembly-17.veto3">
-                <volumeref ref="assembly-16"/>
-                <position name="assembly-17.veto3.position" x="212.0" unit="mm"/>
+            <physvol name="assembly-21.veto3">
+                <volumeref ref="assembly-20"/>
+                <position name="assembly-21.veto3.position" x="212.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-18">
+        <assembly name="assembly-22">
             <physvol name="vetoLayerLeft1">
-                <volumeref ref="assembly-17"/>
+                <volumeref ref="assembly-21"/>
                 <position name="vetoLayerLeft1.position" unit="mm"/>
                 <rotation name="vetoLayerLeft1.rotation" z="90.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerLeft2">
-                <volumeref ref="assembly-17"/>
+                <volumeref ref="assembly-21"/>
                 <position name="vetoLayerLeft2.position" x="74.0" unit="mm"/>
                 <rotation name="vetoLayerLeft2.rotation" z="90.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerLeft3">
-                <volumeref ref="assembly-17"/>
+                <volumeref ref="assembly-21"/>
                 <position name="vetoLayerLeft3.position" x="148.0" unit="mm"/>
                 <rotation name="vetoLayerLeft3.rotation" z="90.0" unit="deg"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-19">
-            <physvol name="scintillatorVolume-800.0mm-f1a5df6f">
+        <assembly name="assembly-23">
+            <physvol name="scintillatorVolume-800.0mm-f1a5df88">
                 <volumeref ref="scintillatorVolume-800.0mm"/>
             </physvol>
-            <physvol name="scintillatorWrappingSolid-800.0mm-f1a5df70">
+            <physvol name="scintillatorWrappingSolid-800.0mm-f1a5df89">
                 <volumeref ref="scintillatorWrappingSolid-800.0mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-800.0mm-f1a5df71">
+            <physvol name="captureLayerVolume-800.0mm-f1a5df8a">
                 <volumeref ref="captureLayerVolume-800.0mm"/>
-                <position name="captureLayerVolume-800.0mm-f1a5df71.position" y="26.5" unit="mm"/>
+                <position name="captureLayerVolume-800.0mm-f1a5df8a.position" y="26.5" unit="mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-800.0mm-f1a5df72">
+            <physvol name="captureLayerVolume-800.0mm-f1a5df8b">
                 <volumeref ref="captureLayerVolume-800.0mm"/>
-                <position name="captureLayerVolume-800.0mm-f1a5df72.position" y="-26.5" unit="mm"/>
+                <position name="captureLayerVolume-800.0mm-f1a5df8b.position" y="-26.5" unit="mm"/>
             </physvol>
-            <physvol name="scintillatorLightGuideVolume-800.0mm-f1a5df73">
+            <physvol name="scintillatorLightGuideVolume-800.0mm-f1a5df8c">
                 <volumeref ref="scintillatorLightGuideVolume-800.0mm"/>
-                <position name="scintillatorLightGuideVolume-800.0mm-f1a5df73.position" z="-465.0" unit="mm"/>
+                <position name="scintillatorLightGuideVolume-800.0mm-f1a5df8c.position" z="-465.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-20">
-            <physvol name="assembly-20.veto1">
-                <volumeref ref="assembly-19"/>
-                <position name="assembly-20.veto1.position" x="-212.0" unit="mm"/>
+        <assembly name="assembly-24">
+            <physvol name="assembly-24.veto1">
+                <volumeref ref="assembly-23"/>
+                <position name="assembly-24.veto1.position" x="-212.0" unit="mm"/>
             </physvol>
-            <physvol name="assembly-20.veto2">
-                <volumeref ref="assembly-19"/>
-                <position name="assembly-20.veto2.position" unit="mm"/>
+            <physvol name="assembly-24.veto2">
+                <volumeref ref="assembly-23"/>
+                <position name="assembly-24.veto2.position" unit="mm"/>
             </physvol>
-            <physvol name="assembly-20.veto3">
-                <volumeref ref="assembly-19"/>
-                <position name="assembly-20.veto3.position" x="212.0" unit="mm"/>
+            <physvol name="assembly-24.veto3">
+                <volumeref ref="assembly-23"/>
+                <position name="assembly-24.veto3.position" x="212.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-21">
-            <physvol name="vetoLayerBack1">
-                <volumeref ref="assembly-20"/>
-                <position name="vetoLayerBack1.position" z="-0.0" unit="mm"/>
-                <rotation name="vetoLayerBack1.rotation" x="-90.0" y="-90.0" unit="deg"/>
+        <assembly name="assembly-25">
+            <physvol name="vetoLayerBack3">
+                <volumeref ref="assembly-24"/>
+                <position name="vetoLayerBack3.position" z="-0.0" unit="mm"/>
+                <rotation name="vetoLayerBack3.rotation" x="-90.0" y="-90.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerBack2">
-                <volumeref ref="assembly-20"/>
+                <volumeref ref="assembly-24"/>
                 <position name="vetoLayerBack2.position" z="-74.0" unit="mm"/>
                 <rotation name="vetoLayerBack2.rotation" x="-90.0" y="-90.0" unit="deg"/>
             </physvol>
-            <physvol name="vetoLayerBack3">
-                <volumeref ref="assembly-20"/>
-                <position name="vetoLayerBack3.position" z="-148.0" unit="mm"/>
-                <rotation name="vetoLayerBack3.rotation" x="-90.0" y="-90.0" unit="deg"/>
+            <physvol name="vetoLayerBack1">
+                <volumeref ref="assembly-24"/>
+                <position name="vetoLayerBack1.position" z="-148.0" unit="mm"/>
+                <rotation name="vetoLayerBack1.rotation" x="-90.0" y="-90.0" unit="deg"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-22">
-            <physvol name="scintillatorVolume-800.0mm-f1a5df87">
+        <assembly name="assembly-26">
+            <physvol name="scintillatorVolume-800.0mm-f1a5df8b">
                 <volumeref ref="scintillatorVolume-800.0mm"/>
             </physvol>
-            <physvol name="scintillatorWrappingSolid-800.0mm-f1a5df88">
+            <physvol name="scintillatorWrappingSolid-800.0mm-f1a5df8c">
                 <volumeref ref="scintillatorWrappingSolid-800.0mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-800.0mm-f1a5df89">
+            <physvol name="captureLayerVolume-800.0mm-f1a5df8d">
                 <volumeref ref="captureLayerVolume-800.0mm"/>
-                <position name="captureLayerVolume-800.0mm-f1a5df89.position" y="26.5" unit="mm"/>
+                <position name="captureLayerVolume-800.0mm-f1a5df8d.position" y="26.5" unit="mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-800.0mm-f1a5df8a">
+            <physvol name="captureLayerVolume-800.0mm-f1a5df8e">
                 <volumeref ref="captureLayerVolume-800.0mm"/>
-                <position name="captureLayerVolume-800.0mm-f1a5df8a.position" y="-26.5" unit="mm"/>
+                <position name="captureLayerVolume-800.0mm-f1a5df8e.position" y="-26.5" unit="mm"/>
             </physvol>
-            <physvol name="scintillatorLightGuideVolume-800.0mm-f1a5df8b">
+            <physvol name="scintillatorLightGuideVolume-800.0mm-f1a5df8f">
                 <volumeref ref="scintillatorLightGuideVolume-800.0mm"/>
-                <position name="scintillatorLightGuideVolume-800.0mm-f1a5df8b.position" z="-465.0" unit="mm"/>
+                <position name="scintillatorLightGuideVolume-800.0mm-f1a5df8f.position" z="-465.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-23">
-            <physvol name="assembly-23.veto1">
-                <volumeref ref="assembly-22"/>
-                <position name="assembly-23.veto1.position" x="-212.0" unit="mm"/>
+        <assembly name="assembly-27">
+            <physvol name="assembly-27.veto1">
+                <volumeref ref="assembly-26"/>
+                <position name="assembly-27.veto1.position" x="-212.0" unit="mm"/>
             </physvol>
-            <physvol name="assembly-23.veto2">
-                <volumeref ref="assembly-22"/>
-                <position name="assembly-23.veto2.position" unit="mm"/>
+            <physvol name="assembly-27.veto2">
+                <volumeref ref="assembly-26"/>
+                <position name="assembly-27.veto2.position" unit="mm"/>
             </physvol>
-            <physvol name="assembly-23.veto3">
-                <volumeref ref="assembly-22"/>
-                <position name="assembly-23.veto3.position" x="212.0" unit="mm"/>
+            <physvol name="assembly-27.veto3">
+                <volumeref ref="assembly-26"/>
+                <position name="assembly-27.veto3.position" x="212.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-24">
+        <assembly name="assembly-28">
             <physvol name="vetoLayerFront1">
-                <volumeref ref="assembly-23"/>
+                <volumeref ref="assembly-27"/>
                 <position name="vetoLayerFront1.position" unit="mm"/>
                 <rotation name="vetoLayerFront1.rotation" x="-90.0" y="90.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerFront2">
-                <volumeref ref="assembly-23"/>
+                <volumeref ref="assembly-27"/>
                 <position name="vetoLayerFront2.position" z="74.0" unit="mm"/>
                 <rotation name="vetoLayerFront2.rotation" x="-90.0" y="90.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerFront3">
-                <volumeref ref="assembly-23"/>
+                <volumeref ref="assembly-27"/>
                 <position name="vetoLayerFront3.position" z="148.0" unit="mm"/>
                 <rotation name="vetoLayerFront3.rotation" x="-90.0" y="90.0" unit="deg"/>
             </physvol>
         </assembly>
         <assembly name="assembly-4">
             <physvol name="vetoSystemTop">
-                <volumeref ref="assembly-7"/>
+                <volumeref ref="assembly-9"/>
                 <position name="vetoSystemTop.position" y="327.0" z="19.5" unit="mm"/>
             </physvol>
             <physvol name="vetoSystemBottom">
-                <volumeref ref="assembly-12"/>
+                <volumeref ref="assembly-16"/>
                 <position name="vetoSystemBottom.position" y="-437.0" z="19.5" unit="mm"/>
             </physvol>
             <physvol name="vetoSystemRight">
-                <volumeref ref="assembly-15"/>
+                <volumeref ref="assembly-19"/>
                 <position name="vetoSystemRight.position" x="-387.0" z="119.5" unit="mm"/>
             </physvol>
             <physvol name="vetoSystemLeft">
-                <volumeref ref="assembly-18"/>
+                <volumeref ref="assembly-22"/>
                 <position name="vetoSystemLeft.position" x="387.0" z="-80.5" unit="mm"/>
             </physvol>
             <physvol name="vetoSystemBack">
-                <volumeref ref="assembly-21"/>
+                <volumeref ref="assembly-25"/>
                 <position name="vetoSystemBack.position" x="-65.0" z="-692.5" unit="mm"/>
             </physvol>
             <physvol name="vetoSystemFront">
-                <volumeref ref="assembly-24"/>
+                <volumeref ref="assembly-28"/>
                 <position name="vetoSystemFront.position" x="65.0" z="711.5" unit="mm"/>
             </physvol>
         </assembly>
diff --git a/gdml/IAXO-D1/CompleteVeto4Layers.gdml b/gdml/IAXO-D1/CompleteVeto4Layers.gdml
index a3e6af1..a11f961 100644
--- a/gdml/IAXO-D1/CompleteVeto4Layers.gdml
+++ b/gdml/IAXO-D1/CompleteVeto4Layers.gdml
@@ -3193,6 +3193,11 @@
             <fraction n="0.05" ref="G4_B"/>
             <fraction n="0.95" ref="G4_POLYETHYLENE"/>
         </material>
+        <material state="solid" name="BoratedHDPE1pct">
+            <D value="0.96" unit="g/cm3"/>
+            <fraction n="0.01" ref="G4_B"/>
+            <fraction n="0.99" ref="G4_POLYETHYLENE"/>
+        </material>
         <material state="solid" name="EJ254-5pct">
             <D value="1.026" unit="g/cm3"/>
             <fraction n="0.084647652" ref="G4_H"/>
@@ -4437,6 +4442,44 @@
                 <position name="assembly-6.veto4.position" x="310.5" unit="mm"/>
             </physvol>
         </assembly>
+        <assembly name="assembly-7">
+            <physvol name="scintillatorVolume-1500.0mm-73266210">
+                <volumeref ref="scintillatorVolume-1500.0mm"/>
+            </physvol>
+            <physvol name="scintillatorWrappingSolid-1500.0mm-73266211">
+                <volumeref ref="scintillatorWrappingSolid-1500.0mm"/>
+            </physvol>
+            <physvol name="captureLayerVolume-1500.0mm-73266212">
+                <volumeref ref="captureLayerVolume-1500.0mm"/>
+                <position name="captureLayerVolume-1500.0mm-73266212.position" y="26.5" unit="mm"/>
+            </physvol>
+            <physvol name="captureLayerVolume-1500.0mm-73266213">
+                <volumeref ref="captureLayerVolume-1500.0mm"/>
+                <position name="captureLayerVolume-1500.0mm-73266213.position" y="-26.5" unit="mm"/>
+            </physvol>
+            <physvol name="scintillatorLightGuideVolume-1500.0mm-73266214">
+                <volumeref ref="scintillatorLightGuideVolume-1500.0mm"/>
+                <position name="scintillatorLightGuideVolume-1500.0mm-73266214.position" z="-815.0" unit="mm"/>
+            </physvol>
+        </assembly>
+        <assembly name="assembly-8">
+            <physvol name="assembly-8.veto1">
+                <volumeref ref="assembly-7"/>
+                <position name="assembly-8.veto1.position" x="-310.5" unit="mm"/>
+            </physvol>
+            <physvol name="assembly-8.veto2">
+                <volumeref ref="assembly-7"/>
+                <position name="assembly-8.veto2.position" x="-103.5" unit="mm"/>
+            </physvol>
+            <physvol name="assembly-8.veto3">
+                <volumeref ref="assembly-7"/>
+                <position name="assembly-8.veto3.position" x="103.5" unit="mm"/>
+            </physvol>
+            <physvol name="assembly-8.veto4">
+                <volumeref ref="assembly-7"/>
+                <position name="assembly-8.veto4.position" x="310.5" unit="mm"/>
+            </physvol>
+        </assembly>
         <volume name="scintillatorVolume-800.0mm">
             <materialref ref="BC408"/>
             <solidref ref="scintillatorSolid-800.0mm"/>
@@ -4453,48 +4496,48 @@
             <materialref ref="G4_LUCITE"/>
             <solidref ref="scintillatorLightGuideSolid-800.0mm"/>
         </volume>
-        <assembly name="assembly-8">
-            <physvol name="scintillatorVolume-800.0mm-73266211">
+        <assembly name="assembly-10">
+            <physvol name="scintillatorVolume-800.0mm-f1a5df66">
                 <volumeref ref="scintillatorVolume-800.0mm"/>
             </physvol>
-            <physvol name="scintillatorWrappingSolid-800.0mm-73266212">
+            <physvol name="scintillatorWrappingSolid-800.0mm-f1a5df67">
                 <volumeref ref="scintillatorWrappingSolid-800.0mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-800.0mm-73266213">
+            <physvol name="captureLayerVolume-800.0mm-f1a5df68">
                 <volumeref ref="captureLayerVolume-800.0mm"/>
-                <position name="captureLayerVolume-800.0mm-73266213.position" y="26.5" unit="mm"/>
+                <position name="captureLayerVolume-800.0mm-f1a5df68.position" y="26.5" unit="mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-800.0mm-73266214">
+            <physvol name="captureLayerVolume-800.0mm-f1a5df69">
                 <volumeref ref="captureLayerVolume-800.0mm"/>
-                <position name="captureLayerVolume-800.0mm-73266214.position" y="-26.5" unit="mm"/>
+                <position name="captureLayerVolume-800.0mm-f1a5df69.position" y="-26.5" unit="mm"/>
             </physvol>
-            <physvol name="scintillatorLightGuideVolume-800.0mm-73266215">
+            <physvol name="scintillatorLightGuideVolume-800.0mm-f1a5df6a">
                 <volumeref ref="scintillatorLightGuideVolume-800.0mm"/>
-                <position name="scintillatorLightGuideVolume-800.0mm-73266215.position" z="-465.0" unit="mm"/>
+                <position name="scintillatorLightGuideVolume-800.0mm-f1a5df6a.position" z="-465.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-9">
-            <physvol name="assembly-9.veto1">
-                <volumeref ref="assembly-8"/>
-                <position name="assembly-9.veto1.position" x="-207.0" unit="mm"/>
+        <assembly name="assembly-11">
+            <physvol name="assembly-11.veto1">
+                <volumeref ref="assembly-10"/>
+                <position name="assembly-11.veto1.position" x="-207.0" unit="mm"/>
             </physvol>
-            <physvol name="assembly-9.veto2">
-                <volumeref ref="assembly-8"/>
-                <position name="assembly-9.veto2.position" unit="mm"/>
+            <physvol name="assembly-11.veto2">
+                <volumeref ref="assembly-10"/>
+                <position name="assembly-11.veto2.position" unit="mm"/>
             </physvol>
-            <physvol name="assembly-9.veto3">
-                <volumeref ref="assembly-8"/>
-                <position name="assembly-9.veto3.position" x="207.0" unit="mm"/>
+            <physvol name="assembly-11.veto3">
+                <volumeref ref="assembly-10"/>
+                <position name="assembly-11.veto3.position" x="207.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-7">
+        <assembly name="assembly-9">
             <physvol name="vetoLayerTop1">
-                <volumeref ref="assembly-9"/>
+                <volumeref ref="assembly-11"/>
                 <position name="vetoLayerTop1.position" y="-35.0" z="-240.0" unit="mm"/>
                 <rotation name="vetoLayerTop1.rotation" y="180.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerTop2">
-                <volumeref ref="assembly-6"/>
+                <volumeref ref="assembly-8"/>
                 <position name="vetoLayerTop2.position" y="59.0" unit="mm"/>
                 <rotation name="vetoLayerTop2.rotation" y="360.0" unit="deg"/>
             </physvol>
@@ -4504,318 +4547,356 @@
                 <rotation name="vetoLayerTop3.rotation" y="540.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerTop4">
-                <volumeref ref="assembly-6"/>
+                <volumeref ref="assembly-8"/>
                 <position name="vetoLayerTop4.position" y="177.0" unit="mm"/>
                 <rotation name="vetoLayerTop4.rotation" y="720.0" unit="deg"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-10">
-            <physvol name="scintillatorVolume-1500.0mm-f1a5df66">
+        <assembly name="assembly-12">
+            <physvol name="scintillatorVolume-1500.0mm-f1a5df68">
                 <volumeref ref="scintillatorVolume-1500.0mm"/>
             </physvol>
-            <physvol name="scintillatorWrappingSolid-1500.0mm-f1a5df67">
+            <physvol name="scintillatorWrappingSolid-1500.0mm-f1a5df69">
                 <volumeref ref="scintillatorWrappingSolid-1500.0mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-1500.0mm-f1a5df68">
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df6a">
                 <volumeref ref="captureLayerVolume-1500.0mm"/>
-                <position name="captureLayerVolume-1500.0mm-f1a5df68.position" y="26.5" unit="mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df6a.position" y="26.5" unit="mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-1500.0mm-f1a5df69">
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df6b">
                 <volumeref ref="captureLayerVolume-1500.0mm"/>
-                <position name="captureLayerVolume-1500.0mm-f1a5df69.position" y="-26.5" unit="mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df6b.position" y="-26.5" unit="mm"/>
             </physvol>
-            <physvol name="scintillatorLightGuideVolume-1500.0mm-f1a5df6a">
+            <physvol name="scintillatorLightGuideVolume-1500.0mm-f1a5df6c">
                 <volumeref ref="scintillatorLightGuideVolume-1500.0mm"/>
-                <position name="scintillatorLightGuideVolume-1500.0mm-f1a5df6a.position" z="-815.0" unit="mm"/>
+                <position name="scintillatorLightGuideVolume-1500.0mm-f1a5df6c.position" z="-815.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-11">
-            <physvol name="assembly-11.veto1">
-                <volumeref ref="assembly-10"/>
-                <position name="assembly-11.veto1.position" x="-310.5" unit="mm"/>
+        <assembly name="assembly-13">
+            <physvol name="assembly-13.veto1">
+                <volumeref ref="assembly-12"/>
+                <position name="assembly-13.veto1.position" x="-310.5" unit="mm"/>
             </physvol>
-            <physvol name="assembly-11.veto2">
-                <volumeref ref="assembly-10"/>
-                <position name="assembly-11.veto2.position" x="-103.5" unit="mm"/>
+            <physvol name="assembly-13.veto2">
+                <volumeref ref="assembly-12"/>
+                <position name="assembly-13.veto2.position" x="-103.5" unit="mm"/>
             </physvol>
-            <physvol name="assembly-11.veto3">
-                <volumeref ref="assembly-10"/>
-                <position name="assembly-11.veto3.position" x="103.5" unit="mm"/>
+            <physvol name="assembly-13.veto3">
+                <volumeref ref="assembly-12"/>
+                <position name="assembly-13.veto3.position" x="103.5" unit="mm"/>
             </physvol>
-            <physvol name="assembly-11.veto4">
-                <volumeref ref="assembly-10"/>
-                <position name="assembly-11.veto4.position" x="310.5" unit="mm"/>
+            <physvol name="assembly-13.veto4">
+                <volumeref ref="assembly-12"/>
+                <position name="assembly-13.veto4.position" x="310.5" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-12">
+        <assembly name="assembly-14">
+            <physvol name="scintillatorVolume-1500.0mm-f1a5df6a">
+                <volumeref ref="scintillatorVolume-1500.0mm"/>
+            </physvol>
+            <physvol name="scintillatorWrappingSolid-1500.0mm-f1a5df6b">
+                <volumeref ref="scintillatorWrappingSolid-1500.0mm"/>
+            </physvol>
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df6c">
+                <volumeref ref="captureLayerVolume-1500.0mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df6c.position" y="26.5" unit="mm"/>
+            </physvol>
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df6d">
+                <volumeref ref="captureLayerVolume-1500.0mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df6d.position" y="-26.5" unit="mm"/>
+            </physvol>
+            <physvol name="scintillatorLightGuideVolume-1500.0mm-f1a5df6e">
+                <volumeref ref="scintillatorLightGuideVolume-1500.0mm"/>
+                <position name="scintillatorLightGuideVolume-1500.0mm-f1a5df6e.position" z="-815.0" unit="mm"/>
+            </physvol>
+        </assembly>
+        <assembly name="assembly-15">
+            <physvol name="assembly-15.veto1">
+                <volumeref ref="assembly-14"/>
+                <position name="assembly-15.veto1.position" x="-310.5" unit="mm"/>
+            </physvol>
+            <physvol name="assembly-15.veto2">
+                <volumeref ref="assembly-14"/>
+                <position name="assembly-15.veto2.position" x="-103.5" unit="mm"/>
+            </physvol>
+            <physvol name="assembly-15.veto3">
+                <volumeref ref="assembly-14"/>
+                <position name="assembly-15.veto3.position" x="103.5" unit="mm"/>
+            </physvol>
+            <physvol name="assembly-15.veto4">
+                <volumeref ref="assembly-14"/>
+                <position name="assembly-15.veto4.position" x="310.5" unit="mm"/>
+            </physvol>
+        </assembly>
+        <assembly name="assembly-16">
             <physvol name="vetoLayerBottom1">
-                <volumeref ref="assembly-11"/>
+                <volumeref ref="assembly-13"/>
                 <position name="vetoLayerBottom1.position" y="20.0" unit="mm"/>
                 <rotation name="vetoLayerBottom1.rotation" y="360.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerBottom2">
-                <volumeref ref="assembly-11"/>
+                <volumeref ref="assembly-15"/>
                 <position name="vetoLayerBottom2.position" y="-59.0" unit="mm"/>
                 <rotation name="vetoLayerBottom2.rotation" y="540.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerBottom3">
-                <volumeref ref="assembly-11"/>
+                <volumeref ref="assembly-13"/>
                 <position name="vetoLayerBottom3.position" y="-118.0" unit="mm"/>
                 <rotation name="vetoLayerBottom3.rotation" y="720.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerBottom4">
-                <volumeref ref="assembly-11"/>
+                <volumeref ref="assembly-15"/>
                 <position name="vetoLayerBottom4.position" y="-177.0" unit="mm"/>
                 <rotation name="vetoLayerBottom4.rotation" y="900.0" unit="deg"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-13">
-            <physvol name="scintillatorVolume-1500.0mm-f1a5df69">
+        <assembly name="assembly-17">
+            <physvol name="scintillatorVolume-1500.0mm-f1a5df6d">
                 <volumeref ref="scintillatorVolume-1500.0mm"/>
             </physvol>
-            <physvol name="scintillatorWrappingSolid-1500.0mm-f1a5df6a">
+            <physvol name="scintillatorWrappingSolid-1500.0mm-f1a5df6e">
                 <volumeref ref="scintillatorWrappingSolid-1500.0mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-1500.0mm-f1a5df6b">
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df6f">
                 <volumeref ref="captureLayerVolume-1500.0mm"/>
-                <position name="captureLayerVolume-1500.0mm-f1a5df6b.position" y="26.5" unit="mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df6f.position" y="26.5" unit="mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-1500.0mm-f1a5df6c">
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df70">
                 <volumeref ref="captureLayerVolume-1500.0mm"/>
-                <position name="captureLayerVolume-1500.0mm-f1a5df6c.position" y="-26.5" unit="mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df70.position" y="-26.5" unit="mm"/>
             </physvol>
-            <physvol name="scintillatorLightGuideVolume-1500.0mm-f1a5df6d">
+            <physvol name="scintillatorLightGuideVolume-1500.0mm-f1a5df71">
                 <volumeref ref="scintillatorLightGuideVolume-1500.0mm"/>
-                <position name="scintillatorLightGuideVolume-1500.0mm-f1a5df6d.position" z="-815.0" unit="mm"/>
+                <position name="scintillatorLightGuideVolume-1500.0mm-f1a5df71.position" z="-815.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-14">
-            <physvol name="assembly-14.veto1">
-                <volumeref ref="assembly-13"/>
-                <position name="assembly-14.veto1.position" x="-212.0" unit="mm"/>
+        <assembly name="assembly-18">
+            <physvol name="assembly-18.veto1">
+                <volumeref ref="assembly-17"/>
+                <position name="assembly-18.veto1.position" x="-212.0" unit="mm"/>
             </physvol>
-            <physvol name="assembly-14.veto2">
-                <volumeref ref="assembly-13"/>
-                <position name="assembly-14.veto2.position" unit="mm"/>
+            <physvol name="assembly-18.veto2">
+                <volumeref ref="assembly-17"/>
+                <position name="assembly-18.veto2.position" unit="mm"/>
             </physvol>
-            <physvol name="assembly-14.veto3">
-                <volumeref ref="assembly-13"/>
-                <position name="assembly-14.veto3.position" x="212.0" unit="mm"/>
+            <physvol name="assembly-18.veto3">
+                <volumeref ref="assembly-17"/>
+                <position name="assembly-18.veto3.position" x="212.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-15">
+        <assembly name="assembly-19">
             <physvol name="vetoLayerRight1">
-                <volumeref ref="assembly-14"/>
+                <volumeref ref="assembly-18"/>
                 <position name="vetoLayerRight1.position" x="-0.0" unit="mm"/>
                 <rotation name="vetoLayerRight1.rotation" x="180.0" z="-90.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerRight2">
-                <volumeref ref="assembly-14"/>
+                <volumeref ref="assembly-18"/>
                 <position name="vetoLayerRight2.position" x="-74.0" unit="mm"/>
                 <rotation name="vetoLayerRight2.rotation" x="180.0" z="-90.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerRight3">
-                <volumeref ref="assembly-14"/>
+                <volumeref ref="assembly-18"/>
                 <position name="vetoLayerRight3.position" x="-148.0" unit="mm"/>
                 <rotation name="vetoLayerRight3.rotation" x="180.0" z="-90.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerRight4">
-                <volumeref ref="assembly-14"/>
+                <volumeref ref="assembly-18"/>
                 <position name="vetoLayerRight4.position" x="-222.0" unit="mm"/>
                 <rotation name="vetoLayerRight4.rotation" x="180.0" z="-90.0" unit="deg"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-16">
-            <physvol name="scintillatorVolume-1500.0mm-f1a5df6c">
+        <assembly name="assembly-20">
+            <physvol name="scintillatorVolume-1500.0mm-f1a5df85">
                 <volumeref ref="scintillatorVolume-1500.0mm"/>
             </physvol>
-            <physvol name="scintillatorWrappingSolid-1500.0mm-f1a5df6d">
+            <physvol name="scintillatorWrappingSolid-1500.0mm-f1a5df86">
                 <volumeref ref="scintillatorWrappingSolid-1500.0mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-1500.0mm-f1a5df6e">
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df87">
                 <volumeref ref="captureLayerVolume-1500.0mm"/>
-                <position name="captureLayerVolume-1500.0mm-f1a5df6e.position" y="26.5" unit="mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df87.position" y="26.5" unit="mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-1500.0mm-f1a5df6f">
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df88">
                 <volumeref ref="captureLayerVolume-1500.0mm"/>
-                <position name="captureLayerVolume-1500.0mm-f1a5df6f.position" y="-26.5" unit="mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df88.position" y="-26.5" unit="mm"/>
             </physvol>
-            <physvol name="scintillatorLightGuideVolume-1500.0mm-f1a5df70">
+            <physvol name="scintillatorLightGuideVolume-1500.0mm-f1a5df89">
                 <volumeref ref="scintillatorLightGuideVolume-1500.0mm"/>
-                <position name="scintillatorLightGuideVolume-1500.0mm-f1a5df70.position" z="-815.0" unit="mm"/>
+                <position name="scintillatorLightGuideVolume-1500.0mm-f1a5df89.position" z="-815.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-17">
-            <physvol name="assembly-17.veto1">
-                <volumeref ref="assembly-16"/>
-                <position name="assembly-17.veto1.position" x="-212.0" unit="mm"/>
+        <assembly name="assembly-21">
+            <physvol name="assembly-21.veto1">
+                <volumeref ref="assembly-20"/>
+                <position name="assembly-21.veto1.position" x="-212.0" unit="mm"/>
             </physvol>
-            <physvol name="assembly-17.veto2">
-                <volumeref ref="assembly-16"/>
-                <position name="assembly-17.veto2.position" unit="mm"/>
+            <physvol name="assembly-21.veto2">
+                <volumeref ref="assembly-20"/>
+                <position name="assembly-21.veto2.position" unit="mm"/>
             </physvol>
-            <physvol name="assembly-17.veto3">
-                <volumeref ref="assembly-16"/>
-                <position name="assembly-17.veto3.position" x="212.0" unit="mm"/>
+            <physvol name="assembly-21.veto3">
+                <volumeref ref="assembly-20"/>
+                <position name="assembly-21.veto3.position" x="212.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-18">
+        <assembly name="assembly-22">
             <physvol name="vetoLayerLeft1">
-                <volumeref ref="assembly-17"/>
+                <volumeref ref="assembly-21"/>
                 <position name="vetoLayerLeft1.position" unit="mm"/>
                 <rotation name="vetoLayerLeft1.rotation" z="90.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerLeft2">
-                <volumeref ref="assembly-17"/>
+                <volumeref ref="assembly-21"/>
                 <position name="vetoLayerLeft2.position" x="74.0" unit="mm"/>
                 <rotation name="vetoLayerLeft2.rotation" z="90.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerLeft3">
-                <volumeref ref="assembly-17"/>
+                <volumeref ref="assembly-21"/>
                 <position name="vetoLayerLeft3.position" x="148.0" unit="mm"/>
                 <rotation name="vetoLayerLeft3.rotation" z="90.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerLeft4">
-                <volumeref ref="assembly-17"/>
+                <volumeref ref="assembly-21"/>
                 <position name="vetoLayerLeft4.position" x="222.0" unit="mm"/>
                 <rotation name="vetoLayerLeft4.rotation" z="90.0" unit="deg"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-19">
-            <physvol name="scintillatorVolume-800.0mm-f1a5df6f">
+        <assembly name="assembly-23">
+            <physvol name="scintillatorVolume-800.0mm-f1a5df88">
                 <volumeref ref="scintillatorVolume-800.0mm"/>
             </physvol>
-            <physvol name="scintillatorWrappingSolid-800.0mm-f1a5df70">
+            <physvol name="scintillatorWrappingSolid-800.0mm-f1a5df89">
                 <volumeref ref="scintillatorWrappingSolid-800.0mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-800.0mm-f1a5df71">
+            <physvol name="captureLayerVolume-800.0mm-f1a5df8a">
                 <volumeref ref="captureLayerVolume-800.0mm"/>
-                <position name="captureLayerVolume-800.0mm-f1a5df71.position" y="26.5" unit="mm"/>
+                <position name="captureLayerVolume-800.0mm-f1a5df8a.position" y="26.5" unit="mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-800.0mm-f1a5df72">
+            <physvol name="captureLayerVolume-800.0mm-f1a5df8b">
                 <volumeref ref="captureLayerVolume-800.0mm"/>
-                <position name="captureLayerVolume-800.0mm-f1a5df72.position" y="-26.5" unit="mm"/>
+                <position name="captureLayerVolume-800.0mm-f1a5df8b.position" y="-26.5" unit="mm"/>
             </physvol>
-            <physvol name="scintillatorLightGuideVolume-800.0mm-f1a5df73">
+            <physvol name="scintillatorLightGuideVolume-800.0mm-f1a5df8c">
                 <volumeref ref="scintillatorLightGuideVolume-800.0mm"/>
-                <position name="scintillatorLightGuideVolume-800.0mm-f1a5df73.position" z="-465.0" unit="mm"/>
+                <position name="scintillatorLightGuideVolume-800.0mm-f1a5df8c.position" z="-465.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-20">
-            <physvol name="assembly-20.veto1">
-                <volumeref ref="assembly-19"/>
-                <position name="assembly-20.veto1.position" x="-212.0" unit="mm"/>
+        <assembly name="assembly-24">
+            <physvol name="assembly-24.veto1">
+                <volumeref ref="assembly-23"/>
+                <position name="assembly-24.veto1.position" x="-212.0" unit="mm"/>
             </physvol>
-            <physvol name="assembly-20.veto2">
-                <volumeref ref="assembly-19"/>
-                <position name="assembly-20.veto2.position" unit="mm"/>
+            <physvol name="assembly-24.veto2">
+                <volumeref ref="assembly-23"/>
+                <position name="assembly-24.veto2.position" unit="mm"/>
             </physvol>
-            <physvol name="assembly-20.veto3">
-                <volumeref ref="assembly-19"/>
-                <position name="assembly-20.veto3.position" x="212.0" unit="mm"/>
+            <physvol name="assembly-24.veto3">
+                <volumeref ref="assembly-23"/>
+                <position name="assembly-24.veto3.position" x="212.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-21">
-            <physvol name="vetoLayerBack1">
-                <volumeref ref="assembly-20"/>
-                <position name="vetoLayerBack1.position" z="-0.0" unit="mm"/>
-                <rotation name="vetoLayerBack1.rotation" x="-90.0" y="-90.0" unit="deg"/>
-            </physvol>
-            <physvol name="vetoLayerBack2">
-                <volumeref ref="assembly-20"/>
-                <position name="vetoLayerBack2.position" z="-74.0" unit="mm"/>
-                <rotation name="vetoLayerBack2.rotation" x="-90.0" y="-90.0" unit="deg"/>
+        <assembly name="assembly-25">
+            <physvol name="vetoLayerBack4">
+                <volumeref ref="assembly-24"/>
+                <position name="vetoLayerBack4.position" z="-0.0" unit="mm"/>
+                <rotation name="vetoLayerBack4.rotation" x="-90.0" y="-90.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerBack3">
-                <volumeref ref="assembly-20"/>
-                <position name="vetoLayerBack3.position" z="-148.0" unit="mm"/>
+                <volumeref ref="assembly-24"/>
+                <position name="vetoLayerBack3.position" z="-74.0" unit="mm"/>
                 <rotation name="vetoLayerBack3.rotation" x="-90.0" y="-90.0" unit="deg"/>
             </physvol>
-            <physvol name="vetoLayerBack4">
-                <volumeref ref="assembly-20"/>
-                <position name="vetoLayerBack4.position" z="-222.0" unit="mm"/>
-                <rotation name="vetoLayerBack4.rotation" x="-90.0" y="-90.0" unit="deg"/>
+            <physvol name="vetoLayerBack2">
+                <volumeref ref="assembly-24"/>
+                <position name="vetoLayerBack2.position" z="-148.0" unit="mm"/>
+                <rotation name="vetoLayerBack2.rotation" x="-90.0" y="-90.0" unit="deg"/>
+            </physvol>
+            <physvol name="vetoLayerBack1">
+                <volumeref ref="assembly-24"/>
+                <position name="vetoLayerBack1.position" z="-222.0" unit="mm"/>
+                <rotation name="vetoLayerBack1.rotation" x="-90.0" y="-90.0" unit="deg"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-22">
-            <physvol name="scintillatorVolume-800.0mm-f1a5df87">
+        <assembly name="assembly-26">
+            <physvol name="scintillatorVolume-800.0mm-f1a5df8b">
                 <volumeref ref="scintillatorVolume-800.0mm"/>
             </physvol>
-            <physvol name="scintillatorWrappingSolid-800.0mm-f1a5df88">
+            <physvol name="scintillatorWrappingSolid-800.0mm-f1a5df8c">
                 <volumeref ref="scintillatorWrappingSolid-800.0mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-800.0mm-f1a5df89">
+            <physvol name="captureLayerVolume-800.0mm-f1a5df8d">
                 <volumeref ref="captureLayerVolume-800.0mm"/>
-                <position name="captureLayerVolume-800.0mm-f1a5df89.position" y="26.5" unit="mm"/>
+                <position name="captureLayerVolume-800.0mm-f1a5df8d.position" y="26.5" unit="mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-800.0mm-f1a5df8a">
+            <physvol name="captureLayerVolume-800.0mm-f1a5df8e">
                 <volumeref ref="captureLayerVolume-800.0mm"/>
-                <position name="captureLayerVolume-800.0mm-f1a5df8a.position" y="-26.5" unit="mm"/>
+                <position name="captureLayerVolume-800.0mm-f1a5df8e.position" y="-26.5" unit="mm"/>
             </physvol>
-            <physvol name="scintillatorLightGuideVolume-800.0mm-f1a5df8b">
+            <physvol name="scintillatorLightGuideVolume-800.0mm-f1a5df8f">
                 <volumeref ref="scintillatorLightGuideVolume-800.0mm"/>
-                <position name="scintillatorLightGuideVolume-800.0mm-f1a5df8b.position" z="-465.0" unit="mm"/>
+                <position name="scintillatorLightGuideVolume-800.0mm-f1a5df8f.position" z="-465.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-23">
-            <physvol name="assembly-23.veto1">
-                <volumeref ref="assembly-22"/>
-                <position name="assembly-23.veto1.position" x="-212.0" unit="mm"/>
+        <assembly name="assembly-27">
+            <physvol name="assembly-27.veto1">
+                <volumeref ref="assembly-26"/>
+                <position name="assembly-27.veto1.position" x="-212.0" unit="mm"/>
             </physvol>
-            <physvol name="assembly-23.veto2">
-                <volumeref ref="assembly-22"/>
-                <position name="assembly-23.veto2.position" unit="mm"/>
+            <physvol name="assembly-27.veto2">
+                <volumeref ref="assembly-26"/>
+                <position name="assembly-27.veto2.position" unit="mm"/>
             </physvol>
-            <physvol name="assembly-23.veto3">
-                <volumeref ref="assembly-22"/>
-                <position name="assembly-23.veto3.position" x="212.0" unit="mm"/>
+            <physvol name="assembly-27.veto3">
+                <volumeref ref="assembly-26"/>
+                <position name="assembly-27.veto3.position" x="212.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-24">
+        <assembly name="assembly-28">
             <physvol name="vetoLayerFront1">
-                <volumeref ref="assembly-23"/>
+                <volumeref ref="assembly-27"/>
                 <position name="vetoLayerFront1.position" unit="mm"/>
                 <rotation name="vetoLayerFront1.rotation" x="-90.0" y="90.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerFront2">
-                <volumeref ref="assembly-23"/>
+                <volumeref ref="assembly-27"/>
                 <position name="vetoLayerFront2.position" z="74.0" unit="mm"/>
                 <rotation name="vetoLayerFront2.rotation" x="-90.0" y="90.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerFront3">
-                <volumeref ref="assembly-23"/>
+                <volumeref ref="assembly-27"/>
                 <position name="vetoLayerFront3.position" z="148.0" unit="mm"/>
                 <rotation name="vetoLayerFront3.rotation" x="-90.0" y="90.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerFront4">
-                <volumeref ref="assembly-23"/>
+                <volumeref ref="assembly-27"/>
                 <position name="vetoLayerFront4.position" z="222.0" unit="mm"/>
                 <rotation name="vetoLayerFront4.rotation" x="-90.0" y="90.0" unit="deg"/>
             </physvol>
         </assembly>
         <assembly name="assembly-4">
             <physvol name="vetoSystemTop">
-                <volumeref ref="assembly-7"/>
+                <volumeref ref="assembly-9"/>
                 <position name="vetoSystemTop.position" y="327.0" z="19.5" unit="mm"/>
             </physvol>
             <physvol name="vetoSystemBottom">
-                <volumeref ref="assembly-12"/>
+                <volumeref ref="assembly-16"/>
                 <position name="vetoSystemBottom.position" y="-437.0" z="19.5" unit="mm"/>
             </physvol>
             <physvol name="vetoSystemRight">
-                <volumeref ref="assembly-15"/>
+                <volumeref ref="assembly-19"/>
                 <position name="vetoSystemRight.position" x="-387.0" z="119.5" unit="mm"/>
             </physvol>
             <physvol name="vetoSystemLeft">
-                <volumeref ref="assembly-18"/>
+                <volumeref ref="assembly-22"/>
                 <position name="vetoSystemLeft.position" x="387.0" z="-80.5" unit="mm"/>
             </physvol>
             <physvol name="vetoSystemBack">
-                <volumeref ref="assembly-21"/>
+                <volumeref ref="assembly-25"/>
                 <position name="vetoSystemBack.position" x="-65.0" z="-692.5" unit="mm"/>
             </physvol>
             <physvol name="vetoSystemFront">
-                <volumeref ref="assembly-24"/>
+                <volumeref ref="assembly-28"/>
                 <position name="vetoSystemFront.position" x="65.0" z="711.5" unit="mm"/>
             </physvol>
         </assembly>
diff --git a/gdml/IAXO-D1/Default.gdml b/gdml/IAXO-D1/Default.gdml
index 44cec78..d5f6cfa 100644
--- a/gdml/IAXO-D1/Default.gdml
+++ b/gdml/IAXO-D1/Default.gdml
@@ -3193,6 +3193,11 @@
             <fraction n="0.05" ref="G4_B"/>
             <fraction n="0.95" ref="G4_POLYETHYLENE"/>
         </material>
+        <material state="solid" name="BoratedHDPE1pct">
+            <D value="0.96" unit="g/cm3"/>
+            <fraction n="0.01" ref="G4_B"/>
+            <fraction n="0.99" ref="G4_POLYETHYLENE"/>
+        </material>
         <material state="solid" name="EJ254-5pct">
             <D value="1.026" unit="g/cm3"/>
             <fraction n="0.084647652" ref="G4_H"/>
@@ -4437,6 +4442,44 @@
                 <position name="assembly-6.veto4.position" x="310.5" unit="mm"/>
             </physvol>
         </assembly>
+        <assembly name="assembly-7">
+            <physvol name="scintillatorVolume-1500.0mm-73266210">
+                <volumeref ref="scintillatorVolume-1500.0mm"/>
+            </physvol>
+            <physvol name="scintillatorWrappingSolid-1500.0mm-73266211">
+                <volumeref ref="scintillatorWrappingSolid-1500.0mm"/>
+            </physvol>
+            <physvol name="captureLayerVolume-1500.0mm-73266212">
+                <volumeref ref="captureLayerVolume-1500.0mm"/>
+                <position name="captureLayerVolume-1500.0mm-73266212.position" y="26.5" unit="mm"/>
+            </physvol>
+            <physvol name="captureLayerVolume-1500.0mm-73266213">
+                <volumeref ref="captureLayerVolume-1500.0mm"/>
+                <position name="captureLayerVolume-1500.0mm-73266213.position" y="-26.5" unit="mm"/>
+            </physvol>
+            <physvol name="scintillatorLightGuideVolume-1500.0mm-73266214">
+                <volumeref ref="scintillatorLightGuideVolume-1500.0mm"/>
+                <position name="scintillatorLightGuideVolume-1500.0mm-73266214.position" z="-815.0" unit="mm"/>
+            </physvol>
+        </assembly>
+        <assembly name="assembly-8">
+            <physvol name="assembly-8.veto1">
+                <volumeref ref="assembly-7"/>
+                <position name="assembly-8.veto1.position" x="-310.5" unit="mm"/>
+            </physvol>
+            <physvol name="assembly-8.veto2">
+                <volumeref ref="assembly-7"/>
+                <position name="assembly-8.veto2.position" x="-103.5" unit="mm"/>
+            </physvol>
+            <physvol name="assembly-8.veto3">
+                <volumeref ref="assembly-7"/>
+                <position name="assembly-8.veto3.position" x="103.5" unit="mm"/>
+            </physvol>
+            <physvol name="assembly-8.veto4">
+                <volumeref ref="assembly-7"/>
+                <position name="assembly-8.veto4.position" x="310.5" unit="mm"/>
+            </physvol>
+        </assembly>
         <volume name="scintillatorVolume-800.0mm">
             <materialref ref="BC408"/>
             <solidref ref="scintillatorSolid-800.0mm"/>
@@ -4453,48 +4496,48 @@
             <materialref ref="G4_LUCITE"/>
             <solidref ref="scintillatorLightGuideSolid-800.0mm"/>
         </volume>
-        <assembly name="assembly-8">
-            <physvol name="scintillatorVolume-800.0mm-73266211">
+        <assembly name="assembly-10">
+            <physvol name="scintillatorVolume-800.0mm-f1a5df66">
                 <volumeref ref="scintillatorVolume-800.0mm"/>
             </physvol>
-            <physvol name="scintillatorWrappingSolid-800.0mm-73266212">
+            <physvol name="scintillatorWrappingSolid-800.0mm-f1a5df67">
                 <volumeref ref="scintillatorWrappingSolid-800.0mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-800.0mm-73266213">
+            <physvol name="captureLayerVolume-800.0mm-f1a5df68">
                 <volumeref ref="captureLayerVolume-800.0mm"/>
-                <position name="captureLayerVolume-800.0mm-73266213.position" y="26.5" unit="mm"/>
+                <position name="captureLayerVolume-800.0mm-f1a5df68.position" y="26.5" unit="mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-800.0mm-73266214">
+            <physvol name="captureLayerVolume-800.0mm-f1a5df69">
                 <volumeref ref="captureLayerVolume-800.0mm"/>
-                <position name="captureLayerVolume-800.0mm-73266214.position" y="-26.5" unit="mm"/>
+                <position name="captureLayerVolume-800.0mm-f1a5df69.position" y="-26.5" unit="mm"/>
             </physvol>
-            <physvol name="scintillatorLightGuideVolume-800.0mm-73266215">
+            <physvol name="scintillatorLightGuideVolume-800.0mm-f1a5df6a">
                 <volumeref ref="scintillatorLightGuideVolume-800.0mm"/>
-                <position name="scintillatorLightGuideVolume-800.0mm-73266215.position" z="-465.0" unit="mm"/>
+                <position name="scintillatorLightGuideVolume-800.0mm-f1a5df6a.position" z="-465.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-9">
-            <physvol name="assembly-9.veto1">
-                <volumeref ref="assembly-8"/>
-                <position name="assembly-9.veto1.position" x="-207.0" unit="mm"/>
+        <assembly name="assembly-11">
+            <physvol name="assembly-11.veto1">
+                <volumeref ref="assembly-10"/>
+                <position name="assembly-11.veto1.position" x="-207.0" unit="mm"/>
             </physvol>
-            <physvol name="assembly-9.veto2">
-                <volumeref ref="assembly-8"/>
-                <position name="assembly-9.veto2.position" unit="mm"/>
+            <physvol name="assembly-11.veto2">
+                <volumeref ref="assembly-10"/>
+                <position name="assembly-11.veto2.position" unit="mm"/>
             </physvol>
-            <physvol name="assembly-9.veto3">
-                <volumeref ref="assembly-8"/>
-                <position name="assembly-9.veto3.position" x="207.0" unit="mm"/>
+            <physvol name="assembly-11.veto3">
+                <volumeref ref="assembly-10"/>
+                <position name="assembly-11.veto3.position" x="207.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-7">
+        <assembly name="assembly-9">
             <physvol name="vetoLayerTop1">
-                <volumeref ref="assembly-9"/>
+                <volumeref ref="assembly-11"/>
                 <position name="vetoLayerTop1.position" y="-35.0" z="-240.0" unit="mm"/>
                 <rotation name="vetoLayerTop1.rotation" y="180.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerTop2">
-                <volumeref ref="assembly-6"/>
+                <volumeref ref="assembly-8"/>
                 <position name="vetoLayerTop2.position" y="59.0" unit="mm"/>
                 <rotation name="vetoLayerTop2.rotation" y="360.0" unit="deg"/>
             </physvol>
@@ -4504,288 +4547,326 @@
                 <rotation name="vetoLayerTop3.rotation" y="540.0" unit="deg"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-10">
-            <physvol name="scintillatorVolume-1500.0mm-f1a5df66">
+        <assembly name="assembly-12">
+            <physvol name="scintillatorVolume-1500.0mm-f1a5df68">
                 <volumeref ref="scintillatorVolume-1500.0mm"/>
             </physvol>
-            <physvol name="scintillatorWrappingSolid-1500.0mm-f1a5df67">
+            <physvol name="scintillatorWrappingSolid-1500.0mm-f1a5df69">
                 <volumeref ref="scintillatorWrappingSolid-1500.0mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-1500.0mm-f1a5df68">
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df6a">
                 <volumeref ref="captureLayerVolume-1500.0mm"/>
-                <position name="captureLayerVolume-1500.0mm-f1a5df68.position" y="26.5" unit="mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df6a.position" y="26.5" unit="mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-1500.0mm-f1a5df69">
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df6b">
                 <volumeref ref="captureLayerVolume-1500.0mm"/>
-                <position name="captureLayerVolume-1500.0mm-f1a5df69.position" y="-26.5" unit="mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df6b.position" y="-26.5" unit="mm"/>
             </physvol>
-            <physvol name="scintillatorLightGuideVolume-1500.0mm-f1a5df6a">
+            <physvol name="scintillatorLightGuideVolume-1500.0mm-f1a5df6c">
                 <volumeref ref="scintillatorLightGuideVolume-1500.0mm"/>
-                <position name="scintillatorLightGuideVolume-1500.0mm-f1a5df6a.position" z="-815.0" unit="mm"/>
+                <position name="scintillatorLightGuideVolume-1500.0mm-f1a5df6c.position" z="-815.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-11">
-            <physvol name="assembly-11.veto1">
-                <volumeref ref="assembly-10"/>
-                <position name="assembly-11.veto1.position" x="-310.5" unit="mm"/>
+        <assembly name="assembly-13">
+            <physvol name="assembly-13.veto1">
+                <volumeref ref="assembly-12"/>
+                <position name="assembly-13.veto1.position" x="-310.5" unit="mm"/>
             </physvol>
-            <physvol name="assembly-11.veto2">
-                <volumeref ref="assembly-10"/>
-                <position name="assembly-11.veto2.position" x="-103.5" unit="mm"/>
+            <physvol name="assembly-13.veto2">
+                <volumeref ref="assembly-12"/>
+                <position name="assembly-13.veto2.position" x="-103.5" unit="mm"/>
             </physvol>
-            <physvol name="assembly-11.veto3">
-                <volumeref ref="assembly-10"/>
-                <position name="assembly-11.veto3.position" x="103.5" unit="mm"/>
+            <physvol name="assembly-13.veto3">
+                <volumeref ref="assembly-12"/>
+                <position name="assembly-13.veto3.position" x="103.5" unit="mm"/>
             </physvol>
-            <physvol name="assembly-11.veto4">
-                <volumeref ref="assembly-10"/>
-                <position name="assembly-11.veto4.position" x="310.5" unit="mm"/>
+            <physvol name="assembly-13.veto4">
+                <volumeref ref="assembly-12"/>
+                <position name="assembly-13.veto4.position" x="310.5" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-12">
+        <assembly name="assembly-14">
+            <physvol name="scintillatorVolume-1500.0mm-f1a5df6a">
+                <volumeref ref="scintillatorVolume-1500.0mm"/>
+            </physvol>
+            <physvol name="scintillatorWrappingSolid-1500.0mm-f1a5df6b">
+                <volumeref ref="scintillatorWrappingSolid-1500.0mm"/>
+            </physvol>
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df6c">
+                <volumeref ref="captureLayerVolume-1500.0mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df6c.position" y="26.5" unit="mm"/>
+            </physvol>
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df6d">
+                <volumeref ref="captureLayerVolume-1500.0mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df6d.position" y="-26.5" unit="mm"/>
+            </physvol>
+            <physvol name="scintillatorLightGuideVolume-1500.0mm-f1a5df6e">
+                <volumeref ref="scintillatorLightGuideVolume-1500.0mm"/>
+                <position name="scintillatorLightGuideVolume-1500.0mm-f1a5df6e.position" z="-815.0" unit="mm"/>
+            </physvol>
+        </assembly>
+        <assembly name="assembly-15">
+            <physvol name="assembly-15.veto1">
+                <volumeref ref="assembly-14"/>
+                <position name="assembly-15.veto1.position" x="-310.5" unit="mm"/>
+            </physvol>
+            <physvol name="assembly-15.veto2">
+                <volumeref ref="assembly-14"/>
+                <position name="assembly-15.veto2.position" x="-103.5" unit="mm"/>
+            </physvol>
+            <physvol name="assembly-15.veto3">
+                <volumeref ref="assembly-14"/>
+                <position name="assembly-15.veto3.position" x="103.5" unit="mm"/>
+            </physvol>
+            <physvol name="assembly-15.veto4">
+                <volumeref ref="assembly-14"/>
+                <position name="assembly-15.veto4.position" x="310.5" unit="mm"/>
+            </physvol>
+        </assembly>
+        <assembly name="assembly-16">
             <physvol name="vetoLayerBottom1">
-                <volumeref ref="assembly-11"/>
+                <volumeref ref="assembly-13"/>
                 <position name="vetoLayerBottom1.position" y="20.0" unit="mm"/>
                 <rotation name="vetoLayerBottom1.rotation" y="360.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerBottom2">
-                <volumeref ref="assembly-11"/>
+                <volumeref ref="assembly-15"/>
                 <position name="vetoLayerBottom2.position" y="-59.0" unit="mm"/>
                 <rotation name="vetoLayerBottom2.rotation" y="540.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerBottom3">
-                <volumeref ref="assembly-11"/>
+                <volumeref ref="assembly-13"/>
                 <position name="vetoLayerBottom3.position" y="-118.0" unit="mm"/>
                 <rotation name="vetoLayerBottom3.rotation" y="720.0" unit="deg"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-13">
-            <physvol name="scintillatorVolume-1500.0mm-f1a5df69">
+        <assembly name="assembly-17">
+            <physvol name="scintillatorVolume-1500.0mm-f1a5df6d">
                 <volumeref ref="scintillatorVolume-1500.0mm"/>
             </physvol>
-            <physvol name="scintillatorWrappingSolid-1500.0mm-f1a5df6a">
+            <physvol name="scintillatorWrappingSolid-1500.0mm-f1a5df6e">
                 <volumeref ref="scintillatorWrappingSolid-1500.0mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-1500.0mm-f1a5df6b">
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df6f">
                 <volumeref ref="captureLayerVolume-1500.0mm"/>
-                <position name="captureLayerVolume-1500.0mm-f1a5df6b.position" y="26.5" unit="mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df6f.position" y="26.5" unit="mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-1500.0mm-f1a5df6c">
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df70">
                 <volumeref ref="captureLayerVolume-1500.0mm"/>
-                <position name="captureLayerVolume-1500.0mm-f1a5df6c.position" y="-26.5" unit="mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df70.position" y="-26.5" unit="mm"/>
             </physvol>
-            <physvol name="scintillatorLightGuideVolume-1500.0mm-f1a5df6d">
+            <physvol name="scintillatorLightGuideVolume-1500.0mm-f1a5df71">
                 <volumeref ref="scintillatorLightGuideVolume-1500.0mm"/>
-                <position name="scintillatorLightGuideVolume-1500.0mm-f1a5df6d.position" z="-815.0" unit="mm"/>
+                <position name="scintillatorLightGuideVolume-1500.0mm-f1a5df71.position" z="-815.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-14">
-            <physvol name="assembly-14.veto1">
-                <volumeref ref="assembly-13"/>
-                <position name="assembly-14.veto1.position" x="-212.0" unit="mm"/>
+        <assembly name="assembly-18">
+            <physvol name="assembly-18.veto1">
+                <volumeref ref="assembly-17"/>
+                <position name="assembly-18.veto1.position" x="-212.0" unit="mm"/>
             </physvol>
-            <physvol name="assembly-14.veto2">
-                <volumeref ref="assembly-13"/>
-                <position name="assembly-14.veto2.position" unit="mm"/>
+            <physvol name="assembly-18.veto2">
+                <volumeref ref="assembly-17"/>
+                <position name="assembly-18.veto2.position" unit="mm"/>
             </physvol>
-            <physvol name="assembly-14.veto3">
-                <volumeref ref="assembly-13"/>
-                <position name="assembly-14.veto3.position" x="212.0" unit="mm"/>
+            <physvol name="assembly-18.veto3">
+                <volumeref ref="assembly-17"/>
+                <position name="assembly-18.veto3.position" x="212.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-15">
+        <assembly name="assembly-19">
             <physvol name="vetoLayerRight1">
-                <volumeref ref="assembly-14"/>
+                <volumeref ref="assembly-18"/>
                 <position name="vetoLayerRight1.position" x="-0.0" unit="mm"/>
                 <rotation name="vetoLayerRight1.rotation" x="180.0" z="-90.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerRight2">
-                <volumeref ref="assembly-14"/>
+                <volumeref ref="assembly-18"/>
                 <position name="vetoLayerRight2.position" x="-74.0" unit="mm"/>
                 <rotation name="vetoLayerRight2.rotation" x="180.0" z="-90.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerRight3">
-                <volumeref ref="assembly-14"/>
+                <volumeref ref="assembly-18"/>
                 <position name="vetoLayerRight3.position" x="-148.0" unit="mm"/>
                 <rotation name="vetoLayerRight3.rotation" x="180.0" z="-90.0" unit="deg"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-16">
-            <physvol name="scintillatorVolume-1500.0mm-f1a5df6c">
+        <assembly name="assembly-20">
+            <physvol name="scintillatorVolume-1500.0mm-f1a5df85">
                 <volumeref ref="scintillatorVolume-1500.0mm"/>
             </physvol>
-            <physvol name="scintillatorWrappingSolid-1500.0mm-f1a5df6d">
+            <physvol name="scintillatorWrappingSolid-1500.0mm-f1a5df86">
                 <volumeref ref="scintillatorWrappingSolid-1500.0mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-1500.0mm-f1a5df6e">
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df87">
                 <volumeref ref="captureLayerVolume-1500.0mm"/>
-                <position name="captureLayerVolume-1500.0mm-f1a5df6e.position" y="26.5" unit="mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df87.position" y="26.5" unit="mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-1500.0mm-f1a5df6f">
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df88">
                 <volumeref ref="captureLayerVolume-1500.0mm"/>
-                <position name="captureLayerVolume-1500.0mm-f1a5df6f.position" y="-26.5" unit="mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df88.position" y="-26.5" unit="mm"/>
             </physvol>
-            <physvol name="scintillatorLightGuideVolume-1500.0mm-f1a5df70">
+            <physvol name="scintillatorLightGuideVolume-1500.0mm-f1a5df89">
                 <volumeref ref="scintillatorLightGuideVolume-1500.0mm"/>
-                <position name="scintillatorLightGuideVolume-1500.0mm-f1a5df70.position" z="-815.0" unit="mm"/>
+                <position name="scintillatorLightGuideVolume-1500.0mm-f1a5df89.position" z="-815.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-17">
-            <physvol name="assembly-17.veto1">
-                <volumeref ref="assembly-16"/>
-                <position name="assembly-17.veto1.position" x="-212.0" unit="mm"/>
+        <assembly name="assembly-21">
+            <physvol name="assembly-21.veto1">
+                <volumeref ref="assembly-20"/>
+                <position name="assembly-21.veto1.position" x="-212.0" unit="mm"/>
             </physvol>
-            <physvol name="assembly-17.veto2">
-                <volumeref ref="assembly-16"/>
-                <position name="assembly-17.veto2.position" unit="mm"/>
+            <physvol name="assembly-21.veto2">
+                <volumeref ref="assembly-20"/>
+                <position name="assembly-21.veto2.position" unit="mm"/>
             </physvol>
-            <physvol name="assembly-17.veto3">
-                <volumeref ref="assembly-16"/>
-                <position name="assembly-17.veto3.position" x="212.0" unit="mm"/>
+            <physvol name="assembly-21.veto3">
+                <volumeref ref="assembly-20"/>
+                <position name="assembly-21.veto3.position" x="212.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-18">
+        <assembly name="assembly-22">
             <physvol name="vetoLayerLeft1">
-                <volumeref ref="assembly-17"/>
+                <volumeref ref="assembly-21"/>
                 <position name="vetoLayerLeft1.position" unit="mm"/>
                 <rotation name="vetoLayerLeft1.rotation" z="90.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerLeft2">
-                <volumeref ref="assembly-17"/>
+                <volumeref ref="assembly-21"/>
                 <position name="vetoLayerLeft2.position" x="74.0" unit="mm"/>
                 <rotation name="vetoLayerLeft2.rotation" z="90.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerLeft3">
-                <volumeref ref="assembly-17"/>
+                <volumeref ref="assembly-21"/>
                 <position name="vetoLayerLeft3.position" x="148.0" unit="mm"/>
                 <rotation name="vetoLayerLeft3.rotation" z="90.0" unit="deg"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-19">
-            <physvol name="scintillatorVolume-800.0mm-f1a5df6f">
+        <assembly name="assembly-23">
+            <physvol name="scintillatorVolume-800.0mm-f1a5df88">
                 <volumeref ref="scintillatorVolume-800.0mm"/>
             </physvol>
-            <physvol name="scintillatorWrappingSolid-800.0mm-f1a5df70">
+            <physvol name="scintillatorWrappingSolid-800.0mm-f1a5df89">
                 <volumeref ref="scintillatorWrappingSolid-800.0mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-800.0mm-f1a5df71">
+            <physvol name="captureLayerVolume-800.0mm-f1a5df8a">
                 <volumeref ref="captureLayerVolume-800.0mm"/>
-                <position name="captureLayerVolume-800.0mm-f1a5df71.position" y="26.5" unit="mm"/>
+                <position name="captureLayerVolume-800.0mm-f1a5df8a.position" y="26.5" unit="mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-800.0mm-f1a5df72">
+            <physvol name="captureLayerVolume-800.0mm-f1a5df8b">
                 <volumeref ref="captureLayerVolume-800.0mm"/>
-                <position name="captureLayerVolume-800.0mm-f1a5df72.position" y="-26.5" unit="mm"/>
+                <position name="captureLayerVolume-800.0mm-f1a5df8b.position" y="-26.5" unit="mm"/>
             </physvol>
-            <physvol name="scintillatorLightGuideVolume-800.0mm-f1a5df73">
+            <physvol name="scintillatorLightGuideVolume-800.0mm-f1a5df8c">
                 <volumeref ref="scintillatorLightGuideVolume-800.0mm"/>
-                <position name="scintillatorLightGuideVolume-800.0mm-f1a5df73.position" z="-465.0" unit="mm"/>
+                <position name="scintillatorLightGuideVolume-800.0mm-f1a5df8c.position" z="-465.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-20">
-            <physvol name="assembly-20.veto1">
-                <volumeref ref="assembly-19"/>
-                <position name="assembly-20.veto1.position" x="-212.0" unit="mm"/>
+        <assembly name="assembly-24">
+            <physvol name="assembly-24.veto1">
+                <volumeref ref="assembly-23"/>
+                <position name="assembly-24.veto1.position" x="-212.0" unit="mm"/>
             </physvol>
-            <physvol name="assembly-20.veto2">
-                <volumeref ref="assembly-19"/>
-                <position name="assembly-20.veto2.position" unit="mm"/>
+            <physvol name="assembly-24.veto2">
+                <volumeref ref="assembly-23"/>
+                <position name="assembly-24.veto2.position" unit="mm"/>
             </physvol>
-            <physvol name="assembly-20.veto3">
-                <volumeref ref="assembly-19"/>
-                <position name="assembly-20.veto3.position" x="212.0" unit="mm"/>
+            <physvol name="assembly-24.veto3">
+                <volumeref ref="assembly-23"/>
+                <position name="assembly-24.veto3.position" x="212.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-21">
-            <physvol name="vetoLayerBack1">
-                <volumeref ref="assembly-20"/>
-                <position name="vetoLayerBack1.position" z="-0.0" unit="mm"/>
-                <rotation name="vetoLayerBack1.rotation" x="-90.0" y="-90.0" unit="deg"/>
+        <assembly name="assembly-25">
+            <physvol name="vetoLayerBack3">
+                <volumeref ref="assembly-24"/>
+                <position name="vetoLayerBack3.position" z="-0.0" unit="mm"/>
+                <rotation name="vetoLayerBack3.rotation" x="-90.0" y="-90.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerBack2">
-                <volumeref ref="assembly-20"/>
+                <volumeref ref="assembly-24"/>
                 <position name="vetoLayerBack2.position" z="-74.0" unit="mm"/>
                 <rotation name="vetoLayerBack2.rotation" x="-90.0" y="-90.0" unit="deg"/>
             </physvol>
-            <physvol name="vetoLayerBack3">
-                <volumeref ref="assembly-20"/>
-                <position name="vetoLayerBack3.position" z="-148.0" unit="mm"/>
-                <rotation name="vetoLayerBack3.rotation" x="-90.0" y="-90.0" unit="deg"/>
+            <physvol name="vetoLayerBack1">
+                <volumeref ref="assembly-24"/>
+                <position name="vetoLayerBack1.position" z="-148.0" unit="mm"/>
+                <rotation name="vetoLayerBack1.rotation" x="-90.0" y="-90.0" unit="deg"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-22">
-            <physvol name="scintillatorVolume-800.0mm-f1a5df87">
+        <assembly name="assembly-26">
+            <physvol name="scintillatorVolume-800.0mm-f1a5df8b">
                 <volumeref ref="scintillatorVolume-800.0mm"/>
             </physvol>
-            <physvol name="scintillatorWrappingSolid-800.0mm-f1a5df88">
+            <physvol name="scintillatorWrappingSolid-800.0mm-f1a5df8c">
                 <volumeref ref="scintillatorWrappingSolid-800.0mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-800.0mm-f1a5df89">
+            <physvol name="captureLayerVolume-800.0mm-f1a5df8d">
                 <volumeref ref="captureLayerVolume-800.0mm"/>
-                <position name="captureLayerVolume-800.0mm-f1a5df89.position" y="26.5" unit="mm"/>
+                <position name="captureLayerVolume-800.0mm-f1a5df8d.position" y="26.5" unit="mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-800.0mm-f1a5df8a">
+            <physvol name="captureLayerVolume-800.0mm-f1a5df8e">
                 <volumeref ref="captureLayerVolume-800.0mm"/>
-                <position name="captureLayerVolume-800.0mm-f1a5df8a.position" y="-26.5" unit="mm"/>
+                <position name="captureLayerVolume-800.0mm-f1a5df8e.position" y="-26.5" unit="mm"/>
             </physvol>
-            <physvol name="scintillatorLightGuideVolume-800.0mm-f1a5df8b">
+            <physvol name="scintillatorLightGuideVolume-800.0mm-f1a5df8f">
                 <volumeref ref="scintillatorLightGuideVolume-800.0mm"/>
-                <position name="scintillatorLightGuideVolume-800.0mm-f1a5df8b.position" z="-465.0" unit="mm"/>
+                <position name="scintillatorLightGuideVolume-800.0mm-f1a5df8f.position" z="-465.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-23">
-            <physvol name="assembly-23.veto1">
-                <volumeref ref="assembly-22"/>
-                <position name="assembly-23.veto1.position" x="-212.0" unit="mm"/>
+        <assembly name="assembly-27">
+            <physvol name="assembly-27.veto1">
+                <volumeref ref="assembly-26"/>
+                <position name="assembly-27.veto1.position" x="-212.0" unit="mm"/>
             </physvol>
-            <physvol name="assembly-23.veto2">
-                <volumeref ref="assembly-22"/>
-                <position name="assembly-23.veto2.position" unit="mm"/>
+            <physvol name="assembly-27.veto2">
+                <volumeref ref="assembly-26"/>
+                <position name="assembly-27.veto2.position" unit="mm"/>
             </physvol>
-            <physvol name="assembly-23.veto3">
-                <volumeref ref="assembly-22"/>
-                <position name="assembly-23.veto3.position" x="212.0" unit="mm"/>
+            <physvol name="assembly-27.veto3">
+                <volumeref ref="assembly-26"/>
+                <position name="assembly-27.veto3.position" x="212.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-24">
+        <assembly name="assembly-28">
             <physvol name="vetoLayerFront1">
-                <volumeref ref="assembly-23"/>
+                <volumeref ref="assembly-27"/>
                 <position name="vetoLayerFront1.position" unit="mm"/>
                 <rotation name="vetoLayerFront1.rotation" x="-90.0" y="90.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerFront2">
-                <volumeref ref="assembly-23"/>
+                <volumeref ref="assembly-27"/>
                 <position name="vetoLayerFront2.position" z="74.0" unit="mm"/>
                 <rotation name="vetoLayerFront2.rotation" x="-90.0" y="90.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerFront3">
-                <volumeref ref="assembly-23"/>
+                <volumeref ref="assembly-27"/>
                 <position name="vetoLayerFront3.position" z="148.0" unit="mm"/>
                 <rotation name="vetoLayerFront3.rotation" x="-90.0" y="90.0" unit="deg"/>
             </physvol>
         </assembly>
         <assembly name="assembly-4">
             <physvol name="vetoSystemTop">
-                <volumeref ref="assembly-7"/>
+                <volumeref ref="assembly-9"/>
                 <position name="vetoSystemTop.position" y="327.0" z="19.5" unit="mm"/>
             </physvol>
             <physvol name="vetoSystemBottom">
-                <volumeref ref="assembly-12"/>
+                <volumeref ref="assembly-16"/>
                 <position name="vetoSystemBottom.position" y="-437.0" z="19.5" unit="mm"/>
             </physvol>
             <physvol name="vetoSystemRight">
-                <volumeref ref="assembly-15"/>
+                <volumeref ref="assembly-19"/>
                 <position name="vetoSystemRight.position" x="-387.0" z="119.5" unit="mm"/>
             </physvol>
             <physvol name="vetoSystemLeft">
-                <volumeref ref="assembly-18"/>
+                <volumeref ref="assembly-22"/>
                 <position name="vetoSystemLeft.position" x="387.0" z="-80.5" unit="mm"/>
             </physvol>
             <physvol name="vetoSystemBack">
-                <volumeref ref="assembly-21"/>
+                <volumeref ref="assembly-25"/>
                 <position name="vetoSystemBack.position" x="-65.0" z="-692.5" unit="mm"/>
             </physvol>
             <physvol name="vetoSystemFront">
-                <volumeref ref="assembly-24"/>
+                <volumeref ref="assembly-28"/>
                 <position name="vetoSystemFront.position" x="65.0" z="711.5" unit="mm"/>
             </physvol>
         </assembly>
diff --git a/gdml/IAXO-D1/DefaultXenon.gdml b/gdml/IAXO-D1/DefaultXenon.gdml
index 12dc920..8ba1cf0 100644
--- a/gdml/IAXO-D1/DefaultXenon.gdml
+++ b/gdml/IAXO-D1/DefaultXenon.gdml
@@ -3193,6 +3193,11 @@
             <fraction n="0.05" ref="G4_B"/>
             <fraction n="0.95" ref="G4_POLYETHYLENE"/>
         </material>
+        <material state="solid" name="BoratedHDPE1pct">
+            <D value="0.96" unit="g/cm3"/>
+            <fraction n="0.01" ref="G4_B"/>
+            <fraction n="0.99" ref="G4_POLYETHYLENE"/>
+        </material>
         <material state="solid" name="EJ254-5pct">
             <D value="1.026" unit="g/cm3"/>
             <fraction n="0.084647652" ref="G4_H"/>
diff --git a/gdml/IAXO-D1/DetectorPipe.gdml b/gdml/IAXO-D1/DetectorPipe.gdml
index 42dc093..614d0c9 100644
--- a/gdml/IAXO-D1/DetectorPipe.gdml
+++ b/gdml/IAXO-D1/DetectorPipe.gdml
@@ -3193,6 +3193,11 @@
             <fraction n="0.05" ref="G4_B"/>
             <fraction n="0.95" ref="G4_POLYETHYLENE"/>
         </material>
+        <material state="solid" name="BoratedHDPE1pct">
+            <D value="0.96" unit="g/cm3"/>
+            <fraction n="0.01" ref="G4_B"/>
+            <fraction n="0.99" ref="G4_POLYETHYLENE"/>
+        </material>
         <material state="solid" name="EJ254-5pct">
             <D value="1.026" unit="g/cm3"/>
             <fraction n="0.084647652" ref="G4_H"/>
diff --git a/gdml/IAXO-D1/NeutronShieldingTubes.gdml b/gdml/IAXO-D1/NeutronShieldingTubes.gdml
index e45ca24..e33df52 100644
--- a/gdml/IAXO-D1/NeutronShieldingTubes.gdml
+++ b/gdml/IAXO-D1/NeutronShieldingTubes.gdml
@@ -3193,6 +3193,11 @@
             <fraction n="0.05" ref="G4_B"/>
             <fraction n="0.95" ref="G4_POLYETHYLENE"/>
         </material>
+        <material state="solid" name="BoratedHDPE1pct">
+            <D value="0.96" unit="g/cm3"/>
+            <fraction n="0.01" ref="G4_B"/>
+            <fraction n="0.99" ref="G4_POLYETHYLENE"/>
+        </material>
         <material state="solid" name="EJ254-5pct">
             <D value="1.026" unit="g/cm3"/>
             <fraction n="0.084647652" ref="G4_H"/>
diff --git a/gdml/IAXO-D1/NeutronShieldingVetoes.gdml b/gdml/IAXO-D1/NeutronShieldingVetoes.gdml
index bbac284..001bc6f 100644
--- a/gdml/IAXO-D1/NeutronShieldingVetoes.gdml
+++ b/gdml/IAXO-D1/NeutronShieldingVetoes.gdml
@@ -3193,6 +3193,11 @@
             <fraction n="0.05" ref="G4_B"/>
             <fraction n="0.95" ref="G4_POLYETHYLENE"/>
         </material>
+        <material state="solid" name="BoratedHDPE1pct">
+            <D value="0.96" unit="g/cm3"/>
+            <fraction n="0.01" ref="G4_B"/>
+            <fraction n="0.99" ref="G4_POLYETHYLENE"/>
+        </material>
         <material state="solid" name="EJ254-5pct">
             <D value="1.026" unit="g/cm3"/>
             <fraction n="0.084647652" ref="G4_H"/>
diff --git a/gdml/IAXO-D1/NoVetoes.gdml b/gdml/IAXO-D1/NoVetoes.gdml
index ffb61f7..b82084b 100644
--- a/gdml/IAXO-D1/NoVetoes.gdml
+++ b/gdml/IAXO-D1/NoVetoes.gdml
@@ -3193,6 +3193,11 @@
             <fraction n="0.05" ref="G4_B"/>
             <fraction n="0.95" ref="G4_POLYETHYLENE"/>
         </material>
+        <material state="solid" name="BoratedHDPE1pct">
+            <D value="0.96" unit="g/cm3"/>
+            <fraction n="0.01" ref="G4_B"/>
+            <fraction n="0.99" ref="G4_POLYETHYLENE"/>
+        </material>
         <material state="solid" name="EJ254-5pct">
             <D value="1.026" unit="g/cm3"/>
             <fraction n="0.084647652" ref="G4_H"/>
diff --git a/gdml/IAXO-D1/NoVetoesGasNotSplit.gdml b/gdml/IAXO-D1/NoVetoesGasNotSplit.gdml
index 961f358..5ced3b1 100644
--- a/gdml/IAXO-D1/NoVetoesGasNotSplit.gdml
+++ b/gdml/IAXO-D1/NoVetoesGasNotSplit.gdml
@@ -3193,6 +3193,11 @@
             <fraction n="0.05" ref="G4_B"/>
             <fraction n="0.95" ref="G4_POLYETHYLENE"/>
         </material>
+        <material state="solid" name="BoratedHDPE1pct">
+            <D value="0.96" unit="g/cm3"/>
+            <fraction n="0.01" ref="G4_B"/>
+            <fraction n="0.99" ref="G4_POLYETHYLENE"/>
+        </material>
         <material state="solid" name="EJ254-5pct">
             <D value="1.026" unit="g/cm3"/>
             <fraction n="0.084647652" ref="G4_H"/>
diff --git a/gdml/IAXO-D1/Shielding.gdml b/gdml/IAXO-D1/Shielding.gdml
index 0d38abc..67bbf3b 100644
--- a/gdml/IAXO-D1/Shielding.gdml
+++ b/gdml/IAXO-D1/Shielding.gdml
@@ -3193,6 +3193,11 @@
             <fraction n="0.05" ref="G4_B"/>
             <fraction n="0.95" ref="G4_POLYETHYLENE"/>
         </material>
+        <material state="solid" name="BoratedHDPE1pct">
+            <D value="0.96" unit="g/cm3"/>
+            <fraction n="0.01" ref="G4_B"/>
+            <fraction n="0.99" ref="G4_POLYETHYLENE"/>
+        </material>
         <material state="solid" name="EJ254-5pct">
             <D value="1.026" unit="g/cm3"/>
             <fraction n="0.084647652" ref="G4_H"/>
diff --git a/gdml/IAXO-D1/ShieldingLayers.gdml b/gdml/IAXO-D1/ShieldingLayers.gdml
index 36cc6ca..4ed2dd8 100644
--- a/gdml/IAXO-D1/ShieldingLayers.gdml
+++ b/gdml/IAXO-D1/ShieldingLayers.gdml
@@ -3193,6 +3193,11 @@
             <fraction n="0.05" ref="G4_B"/>
             <fraction n="0.95" ref="G4_POLYETHYLENE"/>
         </material>
+        <material state="solid" name="BoratedHDPE1pct">
+            <D value="0.96" unit="g/cm3"/>
+            <fraction n="0.01" ref="G4_B"/>
+            <fraction n="0.99" ref="G4_POLYETHYLENE"/>
+        </material>
         <material state="solid" name="EJ254-5pct">
             <D value="1.026" unit="g/cm3"/>
             <fraction n="0.084647652" ref="G4_H"/>
diff --git a/gdml/IAXO-D1/ShieldingLayersNoCopperBox.gdml b/gdml/IAXO-D1/ShieldingLayersNoCopperBox.gdml
index 93b9b38..5d3c52b 100644
--- a/gdml/IAXO-D1/ShieldingLayersNoCopperBox.gdml
+++ b/gdml/IAXO-D1/ShieldingLayersNoCopperBox.gdml
@@ -3193,6 +3193,11 @@
             <fraction n="0.05" ref="G4_B"/>
             <fraction n="0.95" ref="G4_POLYETHYLENE"/>
         </material>
+        <material state="solid" name="BoratedHDPE1pct">
+            <D value="0.96" unit="g/cm3"/>
+            <fraction n="0.01" ref="G4_B"/>
+            <fraction n="0.99" ref="G4_POLYETHYLENE"/>
+        </material>
         <material state="solid" name="EJ254-5pct">
             <D value="1.026" unit="g/cm3"/>
             <fraction n="0.084647652" ref="G4_H"/>
diff --git a/gdml/IAXO-D1/Veto.gdml b/gdml/IAXO-D1/Veto.gdml
index 4239a92..a9e25b9 100644
--- a/gdml/IAXO-D1/Veto.gdml
+++ b/gdml/IAXO-D1/Veto.gdml
@@ -3193,6 +3193,11 @@
             <fraction n="0.05" ref="G4_B"/>
             <fraction n="0.95" ref="G4_POLYETHYLENE"/>
         </material>
+        <material state="solid" name="BoratedHDPE1pct">
+            <D value="0.96" unit="g/cm3"/>
+            <fraction n="0.01" ref="G4_B"/>
+            <fraction n="0.99" ref="G4_POLYETHYLENE"/>
+        </material>
         <material state="solid" name="EJ254-5pct">
             <D value="1.026" unit="g/cm3"/>
             <fraction n="0.084647652" ref="G4_H"/>
diff --git a/gdml/IAXO-D1/VetoSystem.gdml b/gdml/IAXO-D1/VetoSystem.gdml
index 86311e0..5a508ce 100644
--- a/gdml/IAXO-D1/VetoSystem.gdml
+++ b/gdml/IAXO-D1/VetoSystem.gdml
@@ -3193,6 +3193,11 @@
             <fraction n="0.05" ref="G4_B"/>
             <fraction n="0.95" ref="G4_POLYETHYLENE"/>
         </material>
+        <material state="solid" name="BoratedHDPE1pct">
+            <D value="0.96" unit="g/cm3"/>
+            <fraction n="0.01" ref="G4_B"/>
+            <fraction n="0.99" ref="G4_POLYETHYLENE"/>
+        </material>
         <material state="solid" name="EJ254-5pct">
             <D value="1.026" unit="g/cm3"/>
             <fraction n="0.084647652" ref="G4_H"/>
@@ -4080,6 +4085,44 @@
                 <position name="assembly-2.veto4.position" x="310.5" unit="mm"/>
             </physvol>
         </assembly>
+        <assembly name="assembly-3">
+            <physvol name="scintillatorVolume-1500.0mm-7326620c">
+                <volumeref ref="scintillatorVolume-1500.0mm"/>
+            </physvol>
+            <physvol name="scintillatorWrappingSolid-1500.0mm-7326620d">
+                <volumeref ref="scintillatorWrappingSolid-1500.0mm"/>
+            </physvol>
+            <physvol name="captureLayerVolume-1500.0mm-7326620e">
+                <volumeref ref="captureLayerVolume-1500.0mm"/>
+                <position name="captureLayerVolume-1500.0mm-7326620e.position" y="26.5" unit="mm"/>
+            </physvol>
+            <physvol name="captureLayerVolume-1500.0mm-7326620f">
+                <volumeref ref="captureLayerVolume-1500.0mm"/>
+                <position name="captureLayerVolume-1500.0mm-7326620f.position" y="-26.5" unit="mm"/>
+            </physvol>
+            <physvol name="scintillatorLightGuideVolume-1500.0mm-73266210">
+                <volumeref ref="scintillatorLightGuideVolume-1500.0mm"/>
+                <position name="scintillatorLightGuideVolume-1500.0mm-73266210.position" z="-815.0" unit="mm"/>
+            </physvol>
+        </assembly>
+        <assembly name="assembly-4">
+            <physvol name="assembly-4.veto1">
+                <volumeref ref="assembly-3"/>
+                <position name="assembly-4.veto1.position" x="-310.5" unit="mm"/>
+            </physvol>
+            <physvol name="assembly-4.veto2">
+                <volumeref ref="assembly-3"/>
+                <position name="assembly-4.veto2.position" x="-103.5" unit="mm"/>
+            </physvol>
+            <physvol name="assembly-4.veto3">
+                <volumeref ref="assembly-3"/>
+                <position name="assembly-4.veto3.position" x="103.5" unit="mm"/>
+            </physvol>
+            <physvol name="assembly-4.veto4">
+                <volumeref ref="assembly-3"/>
+                <position name="assembly-4.veto4.position" x="310.5" unit="mm"/>
+            </physvol>
+        </assembly>
         <volume name="scintillatorVolume-800.0mm">
             <materialref ref="BC408"/>
             <solidref ref="scintillatorSolid-800.0mm"/>
@@ -4096,48 +4139,48 @@
             <materialref ref="G4_LUCITE"/>
             <solidref ref="scintillatorLightGuideSolid-800.0mm"/>
         </volume>
-        <assembly name="assembly-4">
-            <physvol name="scintillatorVolume-800.0mm-7326620d">
+        <assembly name="assembly-6">
+            <physvol name="scintillatorVolume-800.0mm-7326620f">
                 <volumeref ref="scintillatorVolume-800.0mm"/>
             </physvol>
-            <physvol name="scintillatorWrappingSolid-800.0mm-7326620e">
+            <physvol name="scintillatorWrappingSolid-800.0mm-73266210">
                 <volumeref ref="scintillatorWrappingSolid-800.0mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-800.0mm-7326620f">
+            <physvol name="captureLayerVolume-800.0mm-73266211">
                 <volumeref ref="captureLayerVolume-800.0mm"/>
-                <position name="captureLayerVolume-800.0mm-7326620f.position" y="26.5" unit="mm"/>
+                <position name="captureLayerVolume-800.0mm-73266211.position" y="26.5" unit="mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-800.0mm-73266210">
+            <physvol name="captureLayerVolume-800.0mm-73266212">
                 <volumeref ref="captureLayerVolume-800.0mm"/>
-                <position name="captureLayerVolume-800.0mm-73266210.position" y="-26.5" unit="mm"/>
+                <position name="captureLayerVolume-800.0mm-73266212.position" y="-26.5" unit="mm"/>
             </physvol>
-            <physvol name="scintillatorLightGuideVolume-800.0mm-73266211">
+            <physvol name="scintillatorLightGuideVolume-800.0mm-73266213">
                 <volumeref ref="scintillatorLightGuideVolume-800.0mm"/>
-                <position name="scintillatorLightGuideVolume-800.0mm-73266211.position" z="-465.0" unit="mm"/>
+                <position name="scintillatorLightGuideVolume-800.0mm-73266213.position" z="-465.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-5">
-            <physvol name="assembly-5.veto1">
-                <volumeref ref="assembly-4"/>
-                <position name="assembly-5.veto1.position" x="-207.0" unit="mm"/>
+        <assembly name="assembly-7">
+            <physvol name="assembly-7.veto1">
+                <volumeref ref="assembly-6"/>
+                <position name="assembly-7.veto1.position" x="-207.0" unit="mm"/>
             </physvol>
-            <physvol name="assembly-5.veto2">
-                <volumeref ref="assembly-4"/>
-                <position name="assembly-5.veto2.position" unit="mm"/>
+            <physvol name="assembly-7.veto2">
+                <volumeref ref="assembly-6"/>
+                <position name="assembly-7.veto2.position" unit="mm"/>
             </physvol>
-            <physvol name="assembly-5.veto3">
-                <volumeref ref="assembly-4"/>
-                <position name="assembly-5.veto3.position" x="207.0" unit="mm"/>
+            <physvol name="assembly-7.veto3">
+                <volumeref ref="assembly-6"/>
+                <position name="assembly-7.veto3.position" x="207.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-3">
+        <assembly name="assembly-5">
             <physvol name="vetoLayerTop1">
-                <volumeref ref="assembly-5"/>
+                <volumeref ref="assembly-7"/>
                 <position name="vetoLayerTop1.position" y="-35.0" z="-240.0" unit="mm"/>
                 <rotation name="vetoLayerTop1.rotation" y="180.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerTop2">
-                <volumeref ref="assembly-2"/>
+                <volumeref ref="assembly-4"/>
                 <position name="vetoLayerTop2.position" y="59.0" unit="mm"/>
                 <rotation name="vetoLayerTop2.rotation" y="360.0" unit="deg"/>
             </physvol>
@@ -4147,288 +4190,326 @@
                 <rotation name="vetoLayerTop3.rotation" y="540.0" unit="deg"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-6">
-            <physvol name="scintillatorVolume-1500.0mm-7326620f">
+        <assembly name="assembly-8">
+            <physvol name="scintillatorVolume-1500.0mm-73266211">
                 <volumeref ref="scintillatorVolume-1500.0mm"/>
             </physvol>
-            <physvol name="scintillatorWrappingSolid-1500.0mm-73266210">
+            <physvol name="scintillatorWrappingSolid-1500.0mm-73266212">
                 <volumeref ref="scintillatorWrappingSolid-1500.0mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-1500.0mm-73266211">
+            <physvol name="captureLayerVolume-1500.0mm-73266213">
                 <volumeref ref="captureLayerVolume-1500.0mm"/>
-                <position name="captureLayerVolume-1500.0mm-73266211.position" y="26.5" unit="mm"/>
+                <position name="captureLayerVolume-1500.0mm-73266213.position" y="26.5" unit="mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-1500.0mm-73266212">
+            <physvol name="captureLayerVolume-1500.0mm-73266214">
                 <volumeref ref="captureLayerVolume-1500.0mm"/>
-                <position name="captureLayerVolume-1500.0mm-73266212.position" y="-26.5" unit="mm"/>
+                <position name="captureLayerVolume-1500.0mm-73266214.position" y="-26.5" unit="mm"/>
             </physvol>
-            <physvol name="scintillatorLightGuideVolume-1500.0mm-73266213">
+            <physvol name="scintillatorLightGuideVolume-1500.0mm-73266215">
                 <volumeref ref="scintillatorLightGuideVolume-1500.0mm"/>
-                <position name="scintillatorLightGuideVolume-1500.0mm-73266213.position" z="-815.0" unit="mm"/>
+                <position name="scintillatorLightGuideVolume-1500.0mm-73266215.position" z="-815.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-7">
-            <physvol name="assembly-7.veto1">
-                <volumeref ref="assembly-6"/>
-                <position name="assembly-7.veto1.position" x="-310.5" unit="mm"/>
+        <assembly name="assembly-9">
+            <physvol name="assembly-9.veto1">
+                <volumeref ref="assembly-8"/>
+                <position name="assembly-9.veto1.position" x="-310.5" unit="mm"/>
             </physvol>
-            <physvol name="assembly-7.veto2">
-                <volumeref ref="assembly-6"/>
-                <position name="assembly-7.veto2.position" x="-103.5" unit="mm"/>
+            <physvol name="assembly-9.veto2">
+                <volumeref ref="assembly-8"/>
+                <position name="assembly-9.veto2.position" x="-103.5" unit="mm"/>
             </physvol>
-            <physvol name="assembly-7.veto3">
-                <volumeref ref="assembly-6"/>
-                <position name="assembly-7.veto3.position" x="103.5" unit="mm"/>
+            <physvol name="assembly-9.veto3">
+                <volumeref ref="assembly-8"/>
+                <position name="assembly-9.veto3.position" x="103.5" unit="mm"/>
             </physvol>
-            <physvol name="assembly-7.veto4">
-                <volumeref ref="assembly-6"/>
-                <position name="assembly-7.veto4.position" x="310.5" unit="mm"/>
+            <physvol name="assembly-9.veto4">
+                <volumeref ref="assembly-8"/>
+                <position name="assembly-9.veto4.position" x="310.5" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-8">
+        <assembly name="assembly-10">
+            <physvol name="scintillatorVolume-1500.0mm-f1a5df66">
+                <volumeref ref="scintillatorVolume-1500.0mm"/>
+            </physvol>
+            <physvol name="scintillatorWrappingSolid-1500.0mm-f1a5df67">
+                <volumeref ref="scintillatorWrappingSolid-1500.0mm"/>
+            </physvol>
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df68">
+                <volumeref ref="captureLayerVolume-1500.0mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df68.position" y="26.5" unit="mm"/>
+            </physvol>
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df69">
+                <volumeref ref="captureLayerVolume-1500.0mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df69.position" y="-26.5" unit="mm"/>
+            </physvol>
+            <physvol name="scintillatorLightGuideVolume-1500.0mm-f1a5df6a">
+                <volumeref ref="scintillatorLightGuideVolume-1500.0mm"/>
+                <position name="scintillatorLightGuideVolume-1500.0mm-f1a5df6a.position" z="-815.0" unit="mm"/>
+            </physvol>
+        </assembly>
+        <assembly name="assembly-11">
+            <physvol name="assembly-11.veto1">
+                <volumeref ref="assembly-10"/>
+                <position name="assembly-11.veto1.position" x="-310.5" unit="mm"/>
+            </physvol>
+            <physvol name="assembly-11.veto2">
+                <volumeref ref="assembly-10"/>
+                <position name="assembly-11.veto2.position" x="-103.5" unit="mm"/>
+            </physvol>
+            <physvol name="assembly-11.veto3">
+                <volumeref ref="assembly-10"/>
+                <position name="assembly-11.veto3.position" x="103.5" unit="mm"/>
+            </physvol>
+            <physvol name="assembly-11.veto4">
+                <volumeref ref="assembly-10"/>
+                <position name="assembly-11.veto4.position" x="310.5" unit="mm"/>
+            </physvol>
+        </assembly>
+        <assembly name="assembly-12">
             <physvol name="vetoLayerBottom1">
-                <volumeref ref="assembly-7"/>
+                <volumeref ref="assembly-9"/>
                 <position name="vetoLayerBottom1.position" y="20.0" unit="mm"/>
                 <rotation name="vetoLayerBottom1.rotation" y="360.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerBottom2">
-                <volumeref ref="assembly-7"/>
+                <volumeref ref="assembly-11"/>
                 <position name="vetoLayerBottom2.position" y="-59.0" unit="mm"/>
                 <rotation name="vetoLayerBottom2.rotation" y="540.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerBottom3">
-                <volumeref ref="assembly-7"/>
+                <volumeref ref="assembly-9"/>
                 <position name="vetoLayerBottom3.position" y="-118.0" unit="mm"/>
                 <rotation name="vetoLayerBottom3.rotation" y="720.0" unit="deg"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-9">
-            <physvol name="scintillatorVolume-1500.0mm-73266212">
+        <assembly name="assembly-13">
+            <physvol name="scintillatorVolume-1500.0mm-f1a5df69">
                 <volumeref ref="scintillatorVolume-1500.0mm"/>
             </physvol>
-            <physvol name="scintillatorWrappingSolid-1500.0mm-73266213">
+            <physvol name="scintillatorWrappingSolid-1500.0mm-f1a5df6a">
                 <volumeref ref="scintillatorWrappingSolid-1500.0mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-1500.0mm-73266214">
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df6b">
                 <volumeref ref="captureLayerVolume-1500.0mm"/>
-                <position name="captureLayerVolume-1500.0mm-73266214.position" y="26.5" unit="mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df6b.position" y="26.5" unit="mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-1500.0mm-73266215">
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df6c">
                 <volumeref ref="captureLayerVolume-1500.0mm"/>
-                <position name="captureLayerVolume-1500.0mm-73266215.position" y="-26.5" unit="mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df6c.position" y="-26.5" unit="mm"/>
             </physvol>
-            <physvol name="scintillatorLightGuideVolume-1500.0mm-73266216">
+            <physvol name="scintillatorLightGuideVolume-1500.0mm-f1a5df6d">
                 <volumeref ref="scintillatorLightGuideVolume-1500.0mm"/>
-                <position name="scintillatorLightGuideVolume-1500.0mm-73266216.position" z="-815.0" unit="mm"/>
+                <position name="scintillatorLightGuideVolume-1500.0mm-f1a5df6d.position" z="-815.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-10">
-            <physvol name="assembly-10.veto1">
-                <volumeref ref="assembly-9"/>
-                <position name="assembly-10.veto1.position" x="-212.0" unit="mm"/>
+        <assembly name="assembly-14">
+            <physvol name="assembly-14.veto1">
+                <volumeref ref="assembly-13"/>
+                <position name="assembly-14.veto1.position" x="-212.0" unit="mm"/>
             </physvol>
-            <physvol name="assembly-10.veto2">
-                <volumeref ref="assembly-9"/>
-                <position name="assembly-10.veto2.position" unit="mm"/>
+            <physvol name="assembly-14.veto2">
+                <volumeref ref="assembly-13"/>
+                <position name="assembly-14.veto2.position" unit="mm"/>
             </physvol>
-            <physvol name="assembly-10.veto3">
-                <volumeref ref="assembly-9"/>
-                <position name="assembly-10.veto3.position" x="212.0" unit="mm"/>
+            <physvol name="assembly-14.veto3">
+                <volumeref ref="assembly-13"/>
+                <position name="assembly-14.veto3.position" x="212.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-11">
+        <assembly name="assembly-15">
             <physvol name="vetoLayerRight1">
-                <volumeref ref="assembly-10"/>
+                <volumeref ref="assembly-14"/>
                 <position name="vetoLayerRight1.position" x="-0.0" unit="mm"/>
                 <rotation name="vetoLayerRight1.rotation" x="180.0" z="-90.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerRight2">
-                <volumeref ref="assembly-10"/>
+                <volumeref ref="assembly-14"/>
                 <position name="vetoLayerRight2.position" x="-74.0" unit="mm"/>
                 <rotation name="vetoLayerRight2.rotation" x="180.0" z="-90.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerRight3">
-                <volumeref ref="assembly-10"/>
+                <volumeref ref="assembly-14"/>
                 <position name="vetoLayerRight3.position" x="-148.0" unit="mm"/>
                 <rotation name="vetoLayerRight3.rotation" x="180.0" z="-90.0" unit="deg"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-12">
-            <physvol name="scintillatorVolume-1500.0mm-f1a5df68">
+        <assembly name="assembly-16">
+            <physvol name="scintillatorVolume-1500.0mm-f1a5df6c">
                 <volumeref ref="scintillatorVolume-1500.0mm"/>
             </physvol>
-            <physvol name="scintillatorWrappingSolid-1500.0mm-f1a5df69">
+            <physvol name="scintillatorWrappingSolid-1500.0mm-f1a5df6d">
                 <volumeref ref="scintillatorWrappingSolid-1500.0mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-1500.0mm-f1a5df6a">
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df6e">
                 <volumeref ref="captureLayerVolume-1500.0mm"/>
-                <position name="captureLayerVolume-1500.0mm-f1a5df6a.position" y="26.5" unit="mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df6e.position" y="26.5" unit="mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-1500.0mm-f1a5df6b">
+            <physvol name="captureLayerVolume-1500.0mm-f1a5df6f">
                 <volumeref ref="captureLayerVolume-1500.0mm"/>
-                <position name="captureLayerVolume-1500.0mm-f1a5df6b.position" y="-26.5" unit="mm"/>
+                <position name="captureLayerVolume-1500.0mm-f1a5df6f.position" y="-26.5" unit="mm"/>
             </physvol>
-            <physvol name="scintillatorLightGuideVolume-1500.0mm-f1a5df6c">
+            <physvol name="scintillatorLightGuideVolume-1500.0mm-f1a5df70">
                 <volumeref ref="scintillatorLightGuideVolume-1500.0mm"/>
-                <position name="scintillatorLightGuideVolume-1500.0mm-f1a5df6c.position" z="-815.0" unit="mm"/>
+                <position name="scintillatorLightGuideVolume-1500.0mm-f1a5df70.position" z="-815.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-13">
-            <physvol name="assembly-13.veto1">
-                <volumeref ref="assembly-12"/>
-                <position name="assembly-13.veto1.position" x="-212.0" unit="mm"/>
+        <assembly name="assembly-17">
+            <physvol name="assembly-17.veto1">
+                <volumeref ref="assembly-16"/>
+                <position name="assembly-17.veto1.position" x="-212.0" unit="mm"/>
             </physvol>
-            <physvol name="assembly-13.veto2">
-                <volumeref ref="assembly-12"/>
-                <position name="assembly-13.veto2.position" unit="mm"/>
+            <physvol name="assembly-17.veto2">
+                <volumeref ref="assembly-16"/>
+                <position name="assembly-17.veto2.position" unit="mm"/>
             </physvol>
-            <physvol name="assembly-13.veto3">
-                <volumeref ref="assembly-12"/>
-                <position name="assembly-13.veto3.position" x="212.0" unit="mm"/>
+            <physvol name="assembly-17.veto3">
+                <volumeref ref="assembly-16"/>
+                <position name="assembly-17.veto3.position" x="212.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-14">
+        <assembly name="assembly-18">
             <physvol name="vetoLayerLeft1">
-                <volumeref ref="assembly-13"/>
+                <volumeref ref="assembly-17"/>
                 <position name="vetoLayerLeft1.position" unit="mm"/>
                 <rotation name="vetoLayerLeft1.rotation" z="90.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerLeft2">
-                <volumeref ref="assembly-13"/>
+                <volumeref ref="assembly-17"/>
                 <position name="vetoLayerLeft2.position" x="74.0" unit="mm"/>
                 <rotation name="vetoLayerLeft2.rotation" z="90.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerLeft3">
-                <volumeref ref="assembly-13"/>
+                <volumeref ref="assembly-17"/>
                 <position name="vetoLayerLeft3.position" x="148.0" unit="mm"/>
                 <rotation name="vetoLayerLeft3.rotation" z="90.0" unit="deg"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-15">
-            <physvol name="scintillatorVolume-800.0mm-f1a5df6b">
+        <assembly name="assembly-19">
+            <physvol name="scintillatorVolume-800.0mm-f1a5df6f">
                 <volumeref ref="scintillatorVolume-800.0mm"/>
             </physvol>
-            <physvol name="scintillatorWrappingSolid-800.0mm-f1a5df6c">
+            <physvol name="scintillatorWrappingSolid-800.0mm-f1a5df70">
                 <volumeref ref="scintillatorWrappingSolid-800.0mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-800.0mm-f1a5df6d">
+            <physvol name="captureLayerVolume-800.0mm-f1a5df71">
                 <volumeref ref="captureLayerVolume-800.0mm"/>
-                <position name="captureLayerVolume-800.0mm-f1a5df6d.position" y="26.5" unit="mm"/>
+                <position name="captureLayerVolume-800.0mm-f1a5df71.position" y="26.5" unit="mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-800.0mm-f1a5df6e">
+            <physvol name="captureLayerVolume-800.0mm-f1a5df72">
                 <volumeref ref="captureLayerVolume-800.0mm"/>
-                <position name="captureLayerVolume-800.0mm-f1a5df6e.position" y="-26.5" unit="mm"/>
+                <position name="captureLayerVolume-800.0mm-f1a5df72.position" y="-26.5" unit="mm"/>
             </physvol>
-            <physvol name="scintillatorLightGuideVolume-800.0mm-f1a5df6f">
+            <physvol name="scintillatorLightGuideVolume-800.0mm-f1a5df73">
                 <volumeref ref="scintillatorLightGuideVolume-800.0mm"/>
-                <position name="scintillatorLightGuideVolume-800.0mm-f1a5df6f.position" z="-465.0" unit="mm"/>
+                <position name="scintillatorLightGuideVolume-800.0mm-f1a5df73.position" z="-465.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-16">
-            <physvol name="assembly-16.veto1">
-                <volumeref ref="assembly-15"/>
-                <position name="assembly-16.veto1.position" x="-212.0" unit="mm"/>
+        <assembly name="assembly-20">
+            <physvol name="assembly-20.veto1">
+                <volumeref ref="assembly-19"/>
+                <position name="assembly-20.veto1.position" x="-212.0" unit="mm"/>
             </physvol>
-            <physvol name="assembly-16.veto2">
-                <volumeref ref="assembly-15"/>
-                <position name="assembly-16.veto2.position" unit="mm"/>
+            <physvol name="assembly-20.veto2">
+                <volumeref ref="assembly-19"/>
+                <position name="assembly-20.veto2.position" unit="mm"/>
             </physvol>
-            <physvol name="assembly-16.veto3">
-                <volumeref ref="assembly-15"/>
-                <position name="assembly-16.veto3.position" x="212.0" unit="mm"/>
+            <physvol name="assembly-20.veto3">
+                <volumeref ref="assembly-19"/>
+                <position name="assembly-20.veto3.position" x="212.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-17">
-            <physvol name="vetoLayerBack1">
-                <volumeref ref="assembly-16"/>
-                <position name="vetoLayerBack1.position" z="-0.0" unit="mm"/>
-                <rotation name="vetoLayerBack1.rotation" x="-90.0" y="-90.0" unit="deg"/>
+        <assembly name="assembly-21">
+            <physvol name="vetoLayerBack3">
+                <volumeref ref="assembly-20"/>
+                <position name="vetoLayerBack3.position" z="-0.0" unit="mm"/>
+                <rotation name="vetoLayerBack3.rotation" x="-90.0" y="-90.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerBack2">
-                <volumeref ref="assembly-16"/>
+                <volumeref ref="assembly-20"/>
                 <position name="vetoLayerBack2.position" z="-74.0" unit="mm"/>
                 <rotation name="vetoLayerBack2.rotation" x="-90.0" y="-90.0" unit="deg"/>
             </physvol>
-            <physvol name="vetoLayerBack3">
-                <volumeref ref="assembly-16"/>
-                <position name="vetoLayerBack3.position" z="-148.0" unit="mm"/>
-                <rotation name="vetoLayerBack3.rotation" x="-90.0" y="-90.0" unit="deg"/>
+            <physvol name="vetoLayerBack1">
+                <volumeref ref="assembly-20"/>
+                <position name="vetoLayerBack1.position" z="-148.0" unit="mm"/>
+                <rotation name="vetoLayerBack1.rotation" x="-90.0" y="-90.0" unit="deg"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-18">
-            <physvol name="scintillatorVolume-800.0mm-f1a5df6e">
+        <assembly name="assembly-22">
+            <physvol name="scintillatorVolume-800.0mm-f1a5df87">
                 <volumeref ref="scintillatorVolume-800.0mm"/>
             </physvol>
-            <physvol name="scintillatorWrappingSolid-800.0mm-f1a5df6f">
+            <physvol name="scintillatorWrappingSolid-800.0mm-f1a5df88">
                 <volumeref ref="scintillatorWrappingSolid-800.0mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-800.0mm-f1a5df70">
+            <physvol name="captureLayerVolume-800.0mm-f1a5df89">
                 <volumeref ref="captureLayerVolume-800.0mm"/>
-                <position name="captureLayerVolume-800.0mm-f1a5df70.position" y="26.5" unit="mm"/>
+                <position name="captureLayerVolume-800.0mm-f1a5df89.position" y="26.5" unit="mm"/>
             </physvol>
-            <physvol name="captureLayerVolume-800.0mm-f1a5df71">
+            <physvol name="captureLayerVolume-800.0mm-f1a5df8a">
                 <volumeref ref="captureLayerVolume-800.0mm"/>
-                <position name="captureLayerVolume-800.0mm-f1a5df71.position" y="-26.5" unit="mm"/>
+                <position name="captureLayerVolume-800.0mm-f1a5df8a.position" y="-26.5" unit="mm"/>
             </physvol>
-            <physvol name="scintillatorLightGuideVolume-800.0mm-f1a5df72">
+            <physvol name="scintillatorLightGuideVolume-800.0mm-f1a5df8b">
                 <volumeref ref="scintillatorLightGuideVolume-800.0mm"/>
-                <position name="scintillatorLightGuideVolume-800.0mm-f1a5df72.position" z="-465.0" unit="mm"/>
+                <position name="scintillatorLightGuideVolume-800.0mm-f1a5df8b.position" z="-465.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-19">
-            <physvol name="assembly-19.veto1">
-                <volumeref ref="assembly-18"/>
-                <position name="assembly-19.veto1.position" x="-212.0" unit="mm"/>
+        <assembly name="assembly-23">
+            <physvol name="assembly-23.veto1">
+                <volumeref ref="assembly-22"/>
+                <position name="assembly-23.veto1.position" x="-212.0" unit="mm"/>
             </physvol>
-            <physvol name="assembly-19.veto2">
-                <volumeref ref="assembly-18"/>
-                <position name="assembly-19.veto2.position" unit="mm"/>
+            <physvol name="assembly-23.veto2">
+                <volumeref ref="assembly-22"/>
+                <position name="assembly-23.veto2.position" unit="mm"/>
             </physvol>
-            <physvol name="assembly-19.veto3">
-                <volumeref ref="assembly-18"/>
-                <position name="assembly-19.veto3.position" x="212.0" unit="mm"/>
+            <physvol name="assembly-23.veto3">
+                <volumeref ref="assembly-22"/>
+                <position name="assembly-23.veto3.position" x="212.0" unit="mm"/>
             </physvol>
         </assembly>
-        <assembly name="assembly-20">
+        <assembly name="assembly-24">
             <physvol name="vetoLayerFront1">
-                <volumeref ref="assembly-19"/>
+                <volumeref ref="assembly-23"/>
                 <position name="vetoLayerFront1.position" unit="mm"/>
                 <rotation name="vetoLayerFront1.rotation" x="-90.0" y="90.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerFront2">
-                <volumeref ref="assembly-19"/>
+                <volumeref ref="assembly-23"/>
                 <position name="vetoLayerFront2.position" z="74.0" unit="mm"/>
                 <rotation name="vetoLayerFront2.rotation" x="-90.0" y="90.0" unit="deg"/>
             </physvol>
             <physvol name="vetoLayerFront3">
-                <volumeref ref="assembly-19"/>
+                <volumeref ref="assembly-23"/>
                 <position name="vetoLayerFront3.position" z="148.0" unit="mm"/>
                 <rotation name="vetoLayerFront3.rotation" x="-90.0" y="90.0" unit="deg"/>
             </physvol>
         </assembly>
         <assembly name="assembly-0">
             <physvol name="vetoSystemTop">
-                <volumeref ref="assembly-3"/>
+                <volumeref ref="assembly-5"/>
                 <position name="vetoSystemTop.position" y="327.0" z="19.5" unit="mm"/>
             </physvol>
             <physvol name="vetoSystemBottom">
-                <volumeref ref="assembly-8"/>
+                <volumeref ref="assembly-12"/>
                 <position name="vetoSystemBottom.position" y="-437.0" z="19.5" unit="mm"/>
             </physvol>
             <physvol name="vetoSystemRight">
-                <volumeref ref="assembly-11"/>
+                <volumeref ref="assembly-15"/>
                 <position name="vetoSystemRight.position" x="-387.0" z="119.5" unit="mm"/>
             </physvol>
             <physvol name="vetoSystemLeft">
-                <volumeref ref="assembly-14"/>
+                <volumeref ref="assembly-18"/>
                 <position name="vetoSystemLeft.position" x="387.0" z="-80.5" unit="mm"/>
             </physvol>
             <physvol name="vetoSystemBack">
-                <volumeref ref="assembly-17"/>
+                <volumeref ref="assembly-21"/>
                 <position name="vetoSystemBack.position" x="-65.0" z="-692.5" unit="mm"/>
             </physvol>
             <physvol name="vetoSystemFront">
-                <volumeref ref="assembly-20"/>
+                <volumeref ref="assembly-24"/>
                 <position name="vetoSystemFront.position" x="65.0" z="711.5" unit="mm"/>
             </physvol>
         </assembly>
diff --git a/gdml/IAXO-LiquidO/Default.gdml b/gdml/IAXO-LiquidO/Default.gdml
index 5121589..ebb33ac 100644
--- a/gdml/IAXO-LiquidO/Default.gdml
+++ b/gdml/IAXO-LiquidO/Default.gdml
@@ -3193,6 +3193,11 @@
             <fraction n="0.05" ref="G4_B"/>
             <fraction n="0.95" ref="G4_POLYETHYLENE"/>
         </material>
+        <material state="solid" name="BoratedHDPE1pct">
+            <D value="0.96" unit="g/cm3"/>
+            <fraction n="0.01" ref="G4_B"/>
+            <fraction n="0.99" ref="G4_POLYETHYLENE"/>
+        </material>
         <material state="solid" name="EJ254-5pct">
             <D value="1.026" unit="g/cm3"/>
             <fraction n="0.084647652" ref="G4_H"/>