diff --git a/compact/central_tracker.xml b/compact/central_tracker.xml
index e3b33bab807af3c0dcd5d3e8da80f821fa92e5e9..bef580d8aee42710ee1e86db817a38e552b84a9e 100644
--- a/compact/central_tracker.xml
+++ b/compact/central_tracker.xml
@@ -12,27 +12,39 @@
 
     Note: initial implementation with hard-coded values,
     TODO: add parametrization
-  </comment>
 
-  <define>
+    ----
+    Aug 04, 2021, Shujie Li
+    
+    udpated stave material budget for the baseline design.
+    see https://eicweb.phy.anl.gov/EIC/detectors/athena/-/issues/63
+    
+    ITS3 sensor thickness: 40um, pixel size: 10um (segmentation)
+    total X0 0.55% per layer:
+      0.4 mm aluminum ~ 0.44% X0. 
+      2 x carbonfiber (RL ~ 25) 0.1 mm to match Si (RL~9) of 0.04mm
 
-    <constant name="TrackerBarrelSpaceFrame_width"   value="4.0*cm"/>
-    <constant name="TrackerBarrelSpaceFrame_height"  value="2.5*cm"/>
-    <constant name="TrackerSensor_thickness"         value="0.03*mm"/>
-    <constant name="TrackerBarrel_thickness"         value="0.55/100*9.37*cm"/>
-    <constant name="TrackerBarrelService_thickness"  value="TrackerBarrel_thickness-TrackerSensor_thickness"/>
+  </comment>
 
+  <define>
     <comment>
       Layer_rOffset is used to add inside space so the _rmin value is the nominal sensor radius.
+      TrackerBarrelSpaceFrame_height must be smaller than {_rmin2 - _rmin1 - Layer_rOffset - 1mm - stave_thickness}
     </comment>
+
     <constant name="TrackerBarrelLayer_rOffset"     value="0.5*cm"/>
-    <constant name="TrackerBarrelInner_rmin1"       value="21.0*cm"/>
-    <constant name="TrackerBarrelInner_rmin2"       value="TrackerBarrelInner_rmin1 + TrackerBarrelSpaceFrame_width"/>
+    <constant name="TrackerBarrelSpaceFrame_width"   value="4.0*cm"/>
+    <constant name="TrackerBarrelSpaceFrame_height"  value="1.0835*cm"/>
+    <constant name="TrackerSensor_thickness"         value="0.04*mm"/> 
+
+    <constant name="TrackerBarrelInner_rmin1"       value="21.0*cm"/>    
+    <constant name="TrackerBarrelInner_rmin2"       value="22.68*cm"/>
     <constant name="TrackerBarrelInner_length1"     value="54.0*cm"/>
     <constant name="TrackerBarrelInner_length2"     value="60.0*cm"/>
 
     <constant name="TrackerBarrelOuter_rmin1"       value="39.3*cm"/>
-    <constant name="TrackerBarrelOuter_rmin2"       value="TrackerBarrelOuter_rmin1 + TrackerBarrelSpaceFrame_width"/>
+    <constant name="TrackerBarrelOuter_rmin2"       value="43.23*cm"/>
+
     <constant name="TrackerBarrelOuter_length1"     value="105.0*cm"/>
     <constant name="TrackerBarrelOuter_length2"     value="114.0*cm"/>
 
@@ -46,8 +58,8 @@
     <comment>
       Here we are assuming the two endcaps (P and N) are symmetric.
     </comment>
-    <constant name="TrackerEndcap_thickness"        value="0.25/100*9.37*cm"/>
-    <constant name="TrackerEndcapService_thickness" value="TrackerEndcap_thickness-TrackerSensor_thickness"/>
+    <!-- <constant name="TrackerEndcap_thickness"        value="0.24/100*9.37*cm"/> -->
+    <!-- <constant name="TrackerEndcapService_thickness" value="TrackerEndcap_thickness-TrackerSensor_thickness"/> -->
 
     <constant name="TrackerEndcapInner_nLayers"          value="1"/>
     <constant name="TrackerEndcapOuter_nLayers"          value="3"/>
@@ -69,14 +81,14 @@
       This is a limitation of ACTS geometry which will likely go away in the future.</comment>
 
     <constant name="TrackerEndcapInner_rmin1" value="Beampipe_rmax+1.0*cm"/>
-    <constant name="TrackerEndcapInner_rmin2" value="Beampipe_rmax+1.0*cm"/>
+    <!-- <constant name="TrackerEndcapInner_rmin2" value="Beampipe_rmax+1.0*cm"/> -->
 
     <constant name="TrackerEndcapOuter_rmin1" value="3.18*cm + 1.2*cm * 1"/>
     <constant name="TrackerEndcapOuter_rmin2" value="3.18*cm + 1.2*cm * 1"/>
     <constant name="TrackerEndcapOuter_rmin3" value="3.18*cm + 1.2*cm * 2"/>
 
     <constant name="TrackerEndcapInner_rmax1" value="TrackerBarrelOuter_rmin1-5.0*mm"/>
-    <constant name="TrackerEndcapInner_rmax2" value="TrackerBarrelOuter_rmin1-5.0*mm"/>
+    <!-- <constant name="TrackerEndcapInner_rmax2" value="TrackerBarrelOuter_rmin1-5.0*mm"/> -->
 
     <constant name="TrackerEndcapOuter_rmax1"  value="43.23*cm"/>
     <constant name="TrackerEndcapOuter_rmax2"  value="43.23*cm"/>
@@ -124,7 +136,7 @@
       insideTrackingVolume="true">
       <dimensions
         rmin="TrackerBarrelInner_rmin1-TrackerBarrelLayer_rOffset"
-        rmax="TrackerBarrelInner_rmin2-TrackerBarrelLayer_rOffset + TrackerBarrelInner_thickness"
+        rmax="TrackerBarrelInner_rmin2-TrackerBarrelLayer_rOffset + TrackerBarrelInner_thickness" 
         length="TrackerBarrelInner_length"/>
       <comment>
         Tracker Barrel Modules
@@ -135,15 +147,13 @@
           height="TrackerBarrelSpaceFrame_height" 
           length="TrackerBarrelInner_length1"
           thickness="0.1*mm" />
-        <module_component name="peek1" material="PEEK" sensitive="false"
-          width="TrackerBarrelSpaceFrame_width" length="TrackerBarrelInner_length1-4*mm" thickness="2.0*mm" />
+        <module_component name="aluminum1" material="Aluminum" sensitive="false"
+          width="TrackerBarrelSpaceFrame_width" length="TrackerBarrelInner_length1-4*mm" thickness="0.4*mm" />
         <module_component name="silicon" 
           width="TrackerBarrelSpaceFrame_width"
-          length="TrackerBarrelInner_length1-5*mm" thickness="0.05*mm" material="Silicon" sensitive="true">
+          length="TrackerBarrelInner_length1-5*mm" thickness="TrackerSensor_thickness" material="Silicon" sensitive="true">
           <!--position z="-0.025*mm" y="0*mm"/-->
         </module_component>
-        <module_component name="peek1" material="PEEK" sensitive="false"
-          width="TrackerBarrelSpaceFrame_width" length="TrackerBarrelInner_length1-6*mm" thickness="2.0*mm" />
       </module>
       <module name="TrackerBarrelInner_Module2" vis="TrackerModuleVis">
         <frame material="CarbonFiber_25percent" vis="TrackerSupportVis" 
@@ -151,15 +161,13 @@
           height="TrackerBarrelSpaceFrame_height" 
           length="TrackerBarrelInner_length2"
           thickness="0.1*mm" />
-        <module_component name="peek1" material="PEEK" sensitive="false"
-          width="TrackerBarrelSpaceFrame_width" length="TrackerBarrelInner_length2-4*mm" thickness="2.0*mm" />
+        <module_component name="aluminum1" material="Aluminum" sensitive="false"
+          width="TrackerBarrelSpaceFrame_width" length="TrackerBarrelInner_length2-4*mm" thickness="0.4*mm" />
         <module_component name="silicon" 
           width="TrackerBarrelSpaceFrame_width"
-          length="TrackerBarrelInner_length2-5*mm" thickness="0.05*mm" material="Silicon" sensitive="true">
+          length="TrackerBarrelInner_length2-5*mm" thickness="TrackerSensor_thickness" material="Silicon" sensitive="true">
           <!--position z="-0.025*mm" y="0*mm"/-->
         </module_component>
-        <module_component name="peek1" material="PEEK" sensitive="false"
-          width="TrackerBarrelSpaceFrame_width" length="TrackerBarrelInner_length2-6*mm" thickness="2.0*mm" />
       </module>
       <comment>
         Tracker Barrel Inner Layers
@@ -197,7 +205,7 @@
       <layer id="1">
         <envelope  vis="AnlRed"
           rmin="TrackerEndcapInner_rmin1"
-          rmax="TrackerEndcapInner_rmax2"
+          rmax="TrackerEndcapInner_rmax1"
           length="TrackerEndcapInnerLayer_dz"
           zstart="TrackerEndcapInner_zmin" />
         <ring vis="AnlRed"
@@ -222,7 +230,7 @@
       <layer id="1">
         <envelope  vis="AnlRed"
           rmin="TrackerEndcapInner_rmin1"
-          rmax="TrackerEndcapInner_rmax2"
+          rmax="TrackerEndcapInner_rmax1"
           length="TrackerEndcapInnerLayer_dz"
           zstart="TrackerEndcapInner_zmin" />
         <ring vis="AnlRed"
@@ -256,15 +264,13 @@
           height="TrackerBarrelSpaceFrame_height" 
           length="TrackerBarrelOuter_length1"
           thickness="0.1*mm" />
-        <module_component name="peek1" material="PEEK" sensitive="false"
-          width="TrackerBarrelSpaceFrame_width" length="TrackerBarrelOuter_length1-0.1*mm" thickness="2.0*mm" />
+        <module_component name="aluminum1" material="Aluminum" sensitive="false"
+          width="TrackerBarrelSpaceFrame_width" length="TrackerBarrelOuter_length1-0.1*mm" thickness="0.40*mm" />
         <module_component name="silicon" 
           width="TrackerBarrelSpaceFrame_width"
           length="TrackerBarrelOuter_length1-0.1*mm" 
-          thickness="0.05*mm" material="Silicon" sensitive="true">
+          thickness="TrackerSensor_thickness" material="Silicon" sensitive="true">
         </module_component>
-        <module_component name="peek2" material="PEEK" sensitive="false"
-          width="TrackerBarrelSpaceFrame_width" length="TrackerBarrelOuter_length1-0.1*mm" thickness="2.0*mm" />
       </module>
       <module name="TrackerBarrelOuter_Module2" vis="PurpleVis">
         <frame  material="CarbonFiber_25percent" vis="BlueGreenVis"
@@ -272,15 +278,13 @@
           height="TrackerBarrelSpaceFrame_height" 
           length="TrackerBarrelOuter_length2"
           thickness="0.1*mm" />
-        <module_component name="peek1" material="PEEK" sensitive="false"
-          width="TrackerBarrelSpaceFrame_width" length="TrackerBarrelOuter_length2-0.1*mm" thickness="2.0*mm" />
+        <module_component name="aluminum1" material="Aluminum" sensitive="false"
+          width="TrackerBarrelSpaceFrame_width" length="TrackerBarrelOuter_length2-0.1*mm" thickness="0.40*mm" />
         <module_component name="silicon" 
           width="TrackerBarrelSpaceFrame_width"
           length="TrackerBarrelOuter_length1-0.1*mm" 
-          thickness="0.05*mm" material="Silicon" sensitive="true">
+          thickness="TrackerSensor_thickness" material="Silicon" sensitive="true">
         </module_component>
-        <module_component name="peek2" material="PEEK" sensitive="false"
-          width="TrackerBarrelSpaceFrame_width" length="TrackerBarrelOuter_length1-0.1*mm" thickness="2.0*mm" />
       </module>
       <comment>
         Tracker Barrel Inner Layers
@@ -421,12 +425,14 @@
 
   <readouts>
     <readout name="TrackerBarrelHits">
-      <segmentation type="CartesianGridXY" grid_size_x="0.150*mm" grid_size_y="0.150*mm" />
+      <segmentation type="CartesianGridXY" grid_size_x="0.010*mm" grid_size_y="0.010*mm" />
       <id>system:8,barrel:2,layer:4,module:12,sensor:2,x:32:-16,y:-16</id>
     </readout>
     <readout name="TrackerEndcapHits">
-      <segmentation type="CartesianGridXZ" grid_size_x="0.20*mm" grid_size_z="0.20*mm" />
+      <segmentation type="CartesianGridXZ" grid_size_x="0.010*mm" grid_size_z="0.010*mm" />
       <id>system:8,barrel:2,layer:4,module:12,sensor:2,x:32:-16,z:-16</id>
+
+
     </readout>
   </readouts>