diff --git a/Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_07.xml b/Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_07.xml
index e7893973d192d1e0094bcfc0f830398eef565693..5c6653a4adefe63464d89df7ff70733808fac2fe 100644
--- a/Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_07.xml
+++ b/Detector/DetCRD/compact/CRD_common_v02/Beampipe_v01_07.xml
@@ -61,7 +61,7 @@
 
       <section type ="Center" name="IPInnerTube" zStart="0" zEnd="BeamPipe_BeAl_zmin" rStart="0">
 	<layer material="beam" thickness="BeamPipe_Central_inner_radius" vis="VacVis"/>
-	<layer material="Au" thickness="0.005*mm" vis="VacVis"/>
+	<layer material="Au" thickness="0.010*mm" vis="VacVis"/>
 	<layer material="G4_Be" thickness="BeamPipe_Be_inner_thickness" vis="TubeVis"/>
 	<layer material="G4_WATER" thickness="BeamPipe_Cooling_thickness" vis="GrayVis"/>
 	<layer material="G4_Be" thickness="BeamPipe_Be_outer_thickness" vis="TubeVis"/>
@@ -199,15 +199,15 @@
       </section>
       <section type="Legs" name="SRMask1" zStart="BeamPipe_SR_Mask_z1" zEnd="BeamPipe_SR_Mask_z2" rStart="0">
         <layer material="beam" thickness="BeamPipe_Fork_inner_radius" thicknessEnd="BeamPipe_Mask_inner_radius" vis="VacVis"/>
-        <layer material="G4_Cu" thickness="BeamPipe_Cu_thickness" thicknessEnd="BeamPipe_Cu_thickness_SR_Mask_mid" vis="TubeVis"/>
+        <layer material="G4_Cu" thickness="BeamPipe_Cu_thickness" thicknessEnd="BeamPipe_Cu_thickness+BeamPipe_Fork_inner_radius-BeamPipe_Mask_inner_radius" vis="TubeVis"/>
       </section>
       <section type="Legs" name="SRMask2" zStart="BeamPipe_SR_Mask_z2" zEnd="BeamPipe_SR_Mask_z3" rStart="0">
-        <layer material="beam" thickness="BeamPipe_Mask_inner_radius" vis="VacVis"/>
-        <layer material="G4_Cu" thickness="BeamPipe_Cu_thickness_SR_Mask_mid" vis="TubeVis"/>
+        <layer material="beam" thickness="BeamPipe_Mask_inner_radius" thicknessEnd="BeamPipe_Cu_thickness_SR_Mask_mid" vis="VacVis"/>
+        <layer material="G4_Cu" thickness="BeamPipe_Cu_thickness+BeamPipe_Fork_inner_radius-BeamPipe_Mask_inner_radius" thicknessEnd="BeamPipe_Cu_thickness+BeamPipe_Fork_inner_radius-BeamPipe_Cu_thickness_SR_Mask_mid" vis="TubeVis"/>
       </section>
       <section type="Legs" name="SRMask3" zStart="BeamPipe_SR_Mask_z3" zEnd="BeamPipe_Q1a_zmin" rStart="0">
-        <layer material="beam" thickness="BeamPipe_Mask_inner_radius" thicknessEnd="BeamPipe_Fork_inner_radius"  vis="VacVis"/>
-        <layer material="G4_Cu" thickness="BeamPipe_Cu_thickness_SR_Mask_mid" thicknessEnd="BeamPipe_Cu_thickness"  vis="TubeVis"/>
+        <layer material="beam" thickness="BeamPipe_Cu_thickness_SR_Mask_mid" thicknessEnd="BeamPipe_Fork_inner_radius"  vis="VacVis"/>
+        <layer material="G4_Cu" thickness="BeamPipe_Cu_thickness+BeamPipe_Fork_inner_radius-BeamPipe_Cu_thickness_SR_Mask_mid" thicknessEnd="BeamPipe_Cu_thickness"  vis="TubeVis"/>
       </section>
       <section type="Legs" name="Q1a" zStart="BeamPipe_Q1a_zmin" zEnd="BeamPipe_Q1a_zmax" rStart="0">
         <layer material="beam" thickness="BeamPipe_Q1a_inner_radius" vis="VacVis"/>
diff --git a/Detector/DetCRD/compact/TDR_o1_v01/TDR_Dimensions_v01_01.xml b/Detector/DetCRD/compact/TDR_o1_v01/TDR_Dimensions_v01_01.xml
index d004669fdb53742918229c37c235bad75a699f61..102a1d089f650ec207d901ccee595d6f8e8daac5 100644
--- a/Detector/DetCRD/compact/TDR_o1_v01/TDR_Dimensions_v01_01.xml
+++ b/Detector/DetCRD/compact/TDR_o1_v01/TDR_Dimensions_v01_01.xml
@@ -104,7 +104,7 @@
     <constant name="BeamPipe_FirstExpand_width"     value="35*mm"/>
     <constant name="BeamPipe_SecondExpand_width"    value="39*mm"/>
     <constant name="BeamPipe_Mask_inner_radius"     value="6*mm"/>
-    <constant name="BeamPipe_Cu_thickness_SR_Mask_mid" value="7*mm"/>
+    <constant name="BeamPipe_Cu_thickness_SR_Mask_mid" value="8*mm"/>
     <constant name="BeamPipe_Q1a_inner_radius"      value="BeamPipe_Fork_inner_radius"/>
     <constant name="BeamPipe_Q1b_inner_radius"      value="11.5*mm"/>
     <constant name="BeamPipe_QF1_inner_radius"      value="16*mm"/>