diff --git a/compact/tof_barrel.xml b/compact/tof_barrel.xml
index fa8e28c96bb8a7e8c59952ab0d136e76f849bb34..7a36a9e4dfc6ac283898fef680cc4351ccacce49 100644
--- a/compact/tof_barrel.xml
+++ b/compact/tof_barrel.xml
@@ -5,8 +5,8 @@
 
     <constant name="BarrelTOFSpaceFrame_width"   value="40.0*mm"/>
     <constant name="BarrelTOFSpaceFrame_height"  value="sqrt(3.0)*32.0*mm/2.0"/>
-    <constant name="BarrelTOFSensor_thickness"   value="0.03*mm"/>
-    <constant name="BarrelTOFModule_thickness"   value="0.55/100*9.37*cm"/>
+    <constant name="BarrelTOFSensor_thickness"   value="0.3*mm"/>
+    <constant name="BarrelTOFModule_thickness"   value="2.00/100*9.37*cm"/>
     <constant name="BarrelTOFService_thickness"  value="BarrelTOFModule_thickness-BarrelTOFSensor_thickness"/>
 
     <comment>
@@ -50,15 +50,11 @@
           height="BarrelTOFSpaceFrame_height"
           length="BarrelTOF_length1"
           thickness="0.1*mm" />
-        <module_component name="peek1" material="PEEK" sensitive="false"
-          width="BarrelTOFSpaceFrame_width" length="BarrelTOF_length1-0.1*mm" thickness="2.0*mm" />
-        <module_component name="silicon"
-          width="BarrelTOFSpaceFrame_width"
-          length="BarrelTOF_length1-0.1*mm"
-          thickness="0.05*mm" material="Silicon" sensitive="true">
+        <module_component name="silicon" material="Silicon" sensitive="true"
+          width="BarrelTOFSpaceFrame_width" length="BarrelTOF_length1-0.1*mm" thickness="BarrelTOFSensor_thickness" >
         </module_component>
-        <module_component name="peek2" material="PEEK" sensitive="false"
-          width="BarrelTOFSpaceFrame_width" length="BarrelTOF_length1-0.1*mm" thickness="2.0*mm" />
+        <module_component name="service" material="Silicon" sensitive="false"
+          width="BarrelTOFSpaceFrame_width" length="BarrelTOF_length1-0.1*mm" thickness="BarrelTOFService_thickness" />
       </module>
       <layer module="BarrelTOF_Module1" id="1" vis="TOFVis">
         <barrel_envelope
diff --git a/compact/tof_endcap.xml b/compact/tof_endcap.xml
index 98ea3702ac16c604582fcc495361aba20fbe25a9..295fb7d0437e09bbb88c14976f9669dfd84ecf48 100644
--- a/compact/tof_endcap.xml
+++ b/compact/tof_endcap.xml
@@ -7,8 +7,8 @@
       --------------------------
     </comment>
     
-    <constant name="TOFEndcapSensor_thickness"  value="0.03*mm"/>
-    <constant name="TOFEndcap_thickness"        value="0.25/100*9.37*cm"/>
+    <constant name="TOFEndcapSensor_thickness"  value="0.3*mm"/>
+    <constant name="TOFEndcap_thickness"        value="2.00/100*9.37*cm"/>
     <constant name="TOFEndcapService_thickness" value="TOFEndcap_thickness-TOFEndcapSensor_thickness"/>
     <constant name="TOFEndcap_nLayers"          value="2"/>