diff --git a/Detector/DetCRD/compact/CRD_common_v01/TPC_Simple_v10_02.xml b/Detector/DetCRD/compact/CRD_common_v01/TPC_Simple_v10_02.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8b2ba26d9503ca770bff18c753b296d9ca4f568b
--- /dev/null
+++ b/Detector/DetCRD/compact/CRD_common_v01/TPC_Simple_v10_02.xml
@@ -0,0 +1,76 @@
+<lccdd>
+  <detectors>
+    <detector name="TPC" type="TPC10" vis="TPCVis" id="DetID_TPC" limits="tracker_limits" readout="TPCCollection" insideTrackingVolume="true">
+      <envelope vis="TPCVis">
+        <shape type="Tube" rmin="TPC_inner_radius" rmax="TPC_outer_radius" dz="TPC_half_length" material="Air"/>
+      </envelope>
+      
+      <type_flags type="DetType_TRACKER +  DetType_BARREL + DetType_GASEOUS "/>
+      <!--from CDR baseline-->
+      <global TPC_pad_height="6*mm" TPC_pad_width="1*mm"  TPC_max_step_length="5*mm" dr_InnerWall="25*mm"
+              dr_InnerServiceArea="30*mm" dr_OuterServiceArea="30*mm"
+              dr_OuterWall="60*mm" dz_Cathode="0.06*mm" dz_Readout="25*mm" dz_Endplate="100*mm"
+              chamber_Gas="TDR_gas" sensitive_threshold_eV="32*eV"  />
+      <cathode dz_Cathode_Insulator="0.0275*mm" dz_Cathode_Conductor="0.0025*mm" material_Cathode_Insulator="G4_KAPTON"
+               material_Cathode_Conductor="G4_Cu" dr_Cathode_Grip="20*mm" dz_Cathode_Grip="15*mm" material_Cathode_Grip="SiC_foam"  />
+      <innerWall>
+        <row dr="0.01*mm" material="G4_Cu"  />
+        <row dr="0.05*mm" material="Kapton"  />
+        <row dr="0.3*mm" material="g10-TPC"  />
+	<row dr="0.07*mm" material="Aramid"  />
+        <row dr="23.5*mm" material="AramidHoneycomb"  />
+        <row dr="0.3*mm" material="g10-TPC"  />
+        <row dr="0.0125*mm" material="Kapton"  />
+	<row dr="0.035*mm" material="Copper80P"  />
+	<row dr="0.05*mm" material="Kapton"  />
+        <row dr="0.035*mm" material="Copper80P"  />
+	<row dr="0.042*mm" material="epoxy"  />
+      </innerWall>
+
+      <outerWall>
+	<row dr="0.035*mm" material="Copper80P"  />
+	<row dr="0.05*mm" material="Kapton"  />
+	<row dr="0.035*mm" material="Copper80P"  />
+	<row dr="0.0125*mm" material="Kapton"  />
+	<row dr="0.3*mm" material="g10-TPC"  />
+        <row dr="58.22*mm" material="AramidHoneycomb"  />
+	<row dr="0.07*mm" material="Aramid"  />
+        <row dr="0.3*mm" material="g10-TPC"  />
+        <row dr="0.05*mm" material="Kapton"  />
+        <row dr="0.01*mm" material="G4_Cu"  />
+	<row dr="0.042*mm" material="epoxy"  />
+      </outerWall>
+
+      <readout>
+        <row dz="0.003*mm" material="G4_Cu" comment="gating"  />
+        <row dz="0.03*mm" material="G4_KAPTON" comment="gating"  />
+	<row dz="0.003*mm" material="G4_Cu" comment="gating"  />
+        <row dz="4.447*mm" material="TDR_gas" comment="gating"  />
+        <row dz="0.003*mm" material="G4_Cu" comment="mpgd"  />
+        <row dz="0.03*mm" material="G4_KAPTON" comment="mpgd"  />
+        <row dz="0.003*mm" material="G4_Cu" comment="mpgd"  />
+        <row dz="4.447*mm" material="TDR_gas" comment="mpgd"  />
+        <row dz="0.003*mm" material="G4_Cu" comment="mpgd"  />
+	<row dz="0.03*mm" material="G4_KAPTON" comment="mpgd"  />
+        <row dz="0.003*mm" material="G4_Cu" comment="mpgd"  />
+        <row dz="4.447*mm" material="TDR_gas" comment="mpgd"  />
+        <row dz="0.05*mm" material="G4_Cu" comment="pads"  />
+        <row dz="2*mm" material="g10" comment="structural"  />
+        <row dz="0.5*mm" material="G4_Si" comment="electronics"  />
+        <row dz="2*mm" material="epoxy" comment="structural"  />
+	<row dz="1*mm" material="G4_KAPTON" comment="structural"  />
+	<row dz="2*mm" material="G4_Al" comment="Cooling"  />
+        <row dz="1*mm" material="G4_KAPTON" comment="structural"  />
+        <row dz="3*mm" material="CarbonFiber" comment="structural"  />
+      </readout>
+
+    </detector>
+  </detectors>
+
+  <readouts>
+    <readout name="TPCCollection">
+      <id>system:5,side:-2,layer:13,module:6,sensor:6</id>
+    </readout>
+  </readouts>
+
+</lccdd>
diff --git a/Detector/DetCRD/compact/CRD_common_v02/Coil_Simple_v01_02.xml b/Detector/DetCRD/compact/CRD_common_v02/Coil_Simple_v01_02.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e9b30abbe6a865e20d8c39a049e20ce6f2eaa803
--- /dev/null
+++ b/Detector/DetCRD/compact/CRD_common_v02/Coil_Simple_v01_02.xml
@@ -0,0 +1,76 @@
+<lccdd>
+  <detectors>
+    <!--detector name="Coil" type="DD4hep_Solenoid_o1_v01" id="DetID_COIL" insideTrackingVolume="false" readout="COILCollection">
+      <envelope>
+	<shape type="Tube" rmin="Solenoid_inner_radius" rmax="Solenoid_outer_radius" dz="Solenoid_half_length-15*mm" material="Vacuum"/>
+      </envelope>
+  
+      <type_flags type=" DetType_SUPPORT + DetType_COIL " />
+      
+      <layer id="0" inner_r="Solenoid_inner_radius" outer_z="Solenoid_half_length-15*mm" vis="ShellVis">
+	<slice material="g10" thickness="3*mm" vis="ShellVis"/>
+	<slice material="Vacuum" thickness="6*mm" vis="Invisible"/>
+	<slice material="G4_Al" thickness="6*mm" vis="ShellVis"/>
+      </layer>
+
+      <layer id="1" inner_r="SolenoidCoil_radius" outer_z="SolenoidCoil_half_length" vis="SOLVis">
+	<slice material="G4_Al" thickness="260*mm" vis="SOLVis"/>
+      </layer>
+
+      <layer id="2" inner_r="Solenoid_outer_radius-27*mm" outer_z="Solenoid_half_length-15*mm" vis="OrangeVis">
+        <slice material="G4_Al" thickness="6*mm" vis="OrangeVis"/>
+        <slice material="Vacuum" thickness="6*mm" vis="Invisible"/>
+        <slice material="G4_Al" thickness="15*mm" vis="OrangeVis"/>
+      </layer>
+    </detector-->
+
+    <detector name="CoilInnerShell" type="DD4hep_TubeSegment" material="G4_Al" vis="ShellVis">
+      <material name="Iron" />
+      <tubs rmin="Solenoid_inner_radius" rmax="Solenoid_inner_radius+15*mm" zhalf="Solenoid_half_length-15*mm"/>
+      <position x="0" y="0" z="0"/>
+      <rotation x="0" y="0" z="0"/>
+    </detector>
+
+    <detector name="CoilOuterShell" type="DD4hep_TubeSegment" material="G4_Al" vis="ShellVis">
+      <material name="Iron" />
+      <tubs rmin="Solenoid_outer_radius-27*mm" rmax="Solenoid_outer_radius" zhalf="Solenoid_half_length-15*mm"/>
+      <position x="0" y="0" z="0"/>
+      <rotation x="0" y="0" z="0"/>
+    </detector>
+
+    <detector name="Coil" type="DD4hep_TubeSegment" material="G4_Al" vis="SOLVis">
+      <material name="Iron" />
+      <tubs rmin="SolenoidCoil_radius" rmax="SolenoidCoil_radius+260*mm" zhalf="SolenoidCoil_half_length"/>
+      <position x="0" y="0" z="0"/>
+      <rotation x="0" y="0" z="0"/>
+    </detector>
+
+    <detector name="CoilLeftShell" type="DD4hep_TubeSegment" material="G4_Al" vis="ShellVis">
+      <material name="Iron" />
+      <tubs rmin="Solenoid_inner_radius" rmax="Solenoid_outer_radius" zhalf="15*mm"/>
+      <position x="0" y="0" z="Solenoid_half_length"/>
+      <rotation x="0" y="0" z="0"/>
+    </detector>
+
+    <detector name="CoilRightShell" type="DD4hep_TubeSegment" material="G4_Al" vis="ShellVis">
+      <material name="Iron" />
+      <tubs rmin="Solenoid_inner_radius" rmax="Solenoid_outer_radius" zhalf="15*mm"/>
+      <position x="0" y="0" z="-Solenoid_half_length"/>
+      <rotation x="0" y="0" z="0"/>
+    </detector>
+    <!--detector name="CoilShell" type="DD4hep_CylinderShell" id="DetID_COIL" material="G4_Al" vis="ShellVis">
+      <type_flags type=" DetType_SUPPORT + DetType_COIL " />
+
+      <module>
+	<zplane rmin="Solenoid_inner_radius" rmax="Solenoid_outer_radius" z="Solenoid_half_length*2-30*mm"/>
+	<zplane rmin="Solenoid_inner_radius" rmax="Solenoid_outer_radius" z="Solenoid_half_length*2"/>
+      </module>
+    </detector-->
+  </detectors>
+
+  <!--readouts>
+    <readout name="COILCollection">
+      <id>system:5,side:-2,layer:9,slice:8,sensor:8,barrelside:-2</id>
+    </readout>
+  </readouts-->
+</lccdd>
diff --git a/Detector/DetCRD/compact/CRD_common_v02/FTD_SkewRing_v01_04.xml b/Detector/DetCRD/compact/CRD_common_v02/FTD_SkewRing_v01_04.xml
new file mode 100644
index 0000000000000000000000000000000000000000..44c3378af654b7946be479c5eb7a792c6d6491f9
--- /dev/null
+++ b/Detector/DetCRD/compact/CRD_common_v02/FTD_SkewRing_v01_04.xml
@@ -0,0 +1,67 @@
+<lccdd>
+  <define>
+    <constant name="SiliconThickness" value="1.0*mm"/>
+    <constant name="SupportThickness" value="2.0*mm"/>
+    <constant name="ModuleZGap"       value="2.0*mm"/>
+    <constant name="ModuleRPhiGap"    value="-10*mm"/>
+    <constant name="FTDPetalNumber"   value="16"/>
+  </define>
+
+  <detectors>
+    <detector id="DetID_FTD" name="FTD" type="SiTrackerSkewRing_v01" vis="FTDVis" readout="FTDCollection" insideTrackingVolume="true" reflect="true">
+      <envelope>
+	<shape type="Assembly"/>
+      </envelope>
+
+      <type_flags type="DetType_TRACKER +  DetType_ENDCAP  + DetType_PIXEL "/>
+
+      <reconstruction strip_width="0.05*mm" strip_length="92*mm" strip_pitch="0" strip_angle="0"/>
+
+      <layer id="0" z="SiTracker_endcap_z1" dz="0.5*ModuleZGap" inner_r="SiTracker_endcap_z1*tan(acos(Global_endcap_costheta))*cos(pi/FTDPetalNumber)" outer_r="SiTracker_endcap_outer_radius1"
+	     phi0="0" gap="ModuleRPhiGap" is_pixel="true" nmodules="FTDPetalNumber" vis="SeeThrough">
+	<component material="G4_Si"       thickness="SiliconThickness" vis="FTDSensitiveVis" sensitive="yes"/>
+	<component material="CarbonFiber" thickness="SupportThickness" vis="FTDSupportVis"/>
+      </layer>
+      <layer id="1" z="SiTracker_endcap_z2" dz="0.5*ModuleZGap" inner_r="SiTracker_endcap_z2*tan(acos(Global_endcap_costheta))*cos(pi/FTDPetalNumber)" outer_r="SiTracker_endcap_outer_radius2"
+	     phi0="0" gap="ModuleRPhiGap" is_pixel="true" nmodules="FTDPetalNumber" vis="SeeThrough">
+        <component material="G4_Si"       thickness="SiliconThickness" vis="FTDSensitiveVis" sensitive="yes"/>
+        <component material="CarbonFiber" thickness="SupportThickness" vis="FTDSupportVis"/>
+      </layer>
+      <layer id="2" z="SiTracker_endcap_z3" dz="0.5*ModuleZGap" inner_r="SiTracker_endcap_z3*tan(acos(Global_endcap_costheta))*cos(pi/FTDPetalNumber)" outer_r="SiTracker_endcap_outer_radius3"
+             phi0="0" gap="ModuleRPhiGap" is_pixel="true" nmodules="FTDPetalNumber" vis="SeeThrough">
+        <component material="G4_Si"       thickness="SiliconThickness" vis="FTDSensitiveVis" sensitive="yes"/>
+        <component material="CarbonFiber" thickness="SupportThickness" vis="FTDSupportVis"/>
+      </layer>
+      <layer id="3" z="SiTracker_endcap_z4" dz="0.5*ModuleZGap" inner_r="SiTracker_endcap_z4*tan(acos(Global_endcap_costheta))*cos(pi/FTDPetalNumber)" outer_r="SiTracker_endcap_outer_radius4"
+             phi0="0" gap="ModuleRPhiGap" is_pixel="true" nmodules="FTDPetalNumber" vis="SeeThrough">
+        <component material="G4_Si"       thickness="SiliconThickness" vis="FTDSensitiveVis" sensitive="yes"/>
+        <component material="CarbonFiber" thickness="SupportThickness" vis="FTDSupportVis"/>
+      </layer>
+      <layer id="4" z="SiTracker_endcap_z5" dz="0.5*ModuleZGap" inner_r="SiTracker_endcap_z4*tan(acos(Global_endcap_costheta))*cos(pi/FTDPetalNumber)" outer_r="SiTracker_endcap_outer_radius5"
+	     phi0="0" gap="ModuleRPhiGap" is_pixel="true" nmodules="FTDPetalNumber" vis="SeeThrough">
+        <component material="G4_Si"       thickness="SiliconThickness" vis="FTDSensitiveVis" sensitive="yes"/>
+        <component material="CarbonFiber" thickness="SupportThickness" vis="FTDSupportVis"/>
+      </layer>
+      <layer id="5" z="SiTracker_endcap_z6" dz="0.5*ModuleZGap" inner_r="SiTracker_endcap_z4*tan(acos(Global_endcap_costheta))*cos(pi/FTDPetalNumber)" outer_r="SiTracker_endcap_outer_radius6"
+             phi0="0" gap="ModuleRPhiGap" is_pixel="true" nmodules="FTDPetalNumber" vis="SeeThrough">
+        <component material="G4_Si"       thickness="SiliconThickness" vis="FTDSensitiveVis" sensitive="yes"/>
+        <component material="CarbonFiber" thickness="SupportThickness" vis="FTDSupportVis"/>
+      </layer>
+      <layer id="6" z="SiTracker_endcap_z7" dz="0.5*ModuleZGap" inner_r="Ecal_endcap_inner_radius" outer_r="SiTracker_endcap_outer_radius7"
+	     phi0="0" gap="ModuleRPhiGap" is_pixel="true" nmodules="FTDPetalNumber" vis="SeeThrough">
+        <component material="G4_Si"       thickness="SiliconThickness" vis="FTDSensitiveVis" sensitive="yes"/>
+        <component material="CarbonFiber" thickness="SupportThickness" vis="FTDSupportVis"/>
+      </layer>
+
+    </detector>
+  </detectors>
+
+  <readouts>
+    <readout name="FTDCollection">
+      <!--segmentation type="CartesianGridXY" grid_size_x="0.025*mm" grid_size_y="0.300*mm"/-->
+      <!--id>system:5,side:-2,layer:9,module:8,sensor:8,x:-16,y:-16</id-->
+      <id>system:5,side:-2,layer:9,module:8,sensor:8</id>
+    </readout>
+  </readouts>
+
+</lccdd>
diff --git a/Detector/DetCRD/compact/CRD_common_v02/VXD_StaggeredLadder_v02_01.xml b/Detector/DetCRD/compact/CRD_common_v02/VXD_StaggeredLadder_v02_01.xml
new file mode 100644
index 0000000000000000000000000000000000000000..85d76f19e2db9c085bf817a8b901fde2e13f1749
--- /dev/null
+++ b/Detector/DetCRD/compact/CRD_common_v02/VXD_StaggeredLadder_v02_01.xml
@@ -0,0 +1,136 @@
+<lccdd>
+  <info name="VXD_StaggeredLadder_v02_01"
+        title="CepC VXD with staggered ladders"
+        author=""
+        url="http://cepc.ihep.ac.cn"
+        status="developing"
+        version="v01">
+    <comment>CepC vertex detector</comment>
+  </info>
+  <define>
+    <constant name="VXD_inner_radius" value="Vertex_inner_radius"/>
+    <constant name="VXD_outer_radius" value="Vertex_outer_radius"/>
+    <constant name="VXD_half_length"  value="Vertex_half_length"/>
+    <constant name="VXDLayer1_length" value="257*mm" />
+    <constant name="VXDLayer2_length" value="489*mm" />
+    <constant name="VXDLayer3_length" value="746*mm" />
+    <constant name="VXD_sensor_length" value="20*mm" />
+  </define>
+
+  <detectors>
+    <detector id="DetID_VXD" name="VXD" type="SiTrackerStaggeredLadder_v01" vis="VXDVis" readout="VXDCollection" insideTrackingVolume="true">
+      <envelope>
+	<shape type="BooleanShape" operation="Subtraction" material="Air" >
+	  <shape type="BooleanShape" operation="Subtraction" material="Air" >
+            <shape type="Tube" rmin="VXD_inner_radius" rmax="VXD_outer_radius" dz="VXD_half_length" />
+            <shape type="Cone" rmin1="0" rmax1="BeamPipe_VertexRegion_rmax" rmin2="0" rmax2="Vertex_Side_rmin" z="(VXD_half_length-BeamPipe_CentralAl_zmax)/2." />
+            <position x="0" y="0" z="VXD_half_length-(VXD_half_length-BeamPipe_CentralAl_zmax)/2."/>
+          </shape>
+	  <shape type="Cone" rmin1="0" rmax1="BeamPipe_VertexRegion_rmax" rmin2="0" rmax2="Vertex_Side_rmin" z="(VXD_half_length-BeamPipe_CentralAl_zmax)/2." />
+          <position x="0" y="0" z="-(VXD_half_length-(VXD_half_length-BeamPipe_CentralAl_zmax)/2.)"/>
+          <rotation x="0" y="180.*deg" z="0" />
+	</shape>
+      </envelope>
+
+      <type_flags type="DetType_TRACKER + DetType_BARREL + DetType_PIXEL "/>
+
+      <global sensitive_thickness="VXD_sensitive_thickness" support_thickness="VXD_support_thickness" sensor_length="VXD_sensor_length"
+              sensitive_mat="G4_Si" support_mat="G4_C" sensitive_threshold_KeV="64*keV"  />
+      <display ladder="SeeThrough" support="VXDSupportVis" flex="VXDFlexVis" sens_env="SeeThrough" sens="GrayVis" deadsensor="GreenVis" deadwire="RedVis"/>
+
+      <layer layer_id="0" ladder_radius="12.0*mm" ladder_offset="(8.4+0.231123)*mm" n_ladders="8" n_sensors_per_side="0">
+        <ladder isDoubleSided="true">
+          <ladderSupport height="2*mm" length="VXDLayer1_length+1*mm" thickness="250*um" width="16.8*mm" mat="CFRP_CMS"/>
+          <flex>
+	    <slice length="VXDLayer1_length" thickness="12.5*um" width="16.8*mm" mat="Acrylicglue"/> <!--glue between flex and sensor/support-->
+            <slice length="VXDLayer1_length" thickness="12.5*um" width="16.8*mm" mat="Kapton"/>
+            <slice length="VXDLayer1_length" thickness="12.5*um" width="16.8*mm" mat="Acrylicglue"/>
+            <slice length="VXDLayer1_length" thickness=" 8.0*um" width="16.8*mm" mat="G4_Al"/>
+            <slice length="VXDLayer1_length" thickness="13.0*um" width="16.8*mm" mat="Kapton"/>
+            <slice length="VXDLayer1_length" thickness="12.5*um" width="16.8*mm" mat="Acrylicglue"/>
+            <slice length="VXDLayer1_length" thickness="12.0*um" width="16.8*mm" mat="G4_Al"/>
+            <slice length="VXDLayer1_length" thickness="25.0*um" width="16.8*mm" mat="Kapton"/>
+            <slice length="VXDLayer1_length" thickness="12.0*um" width="16.8*mm" mat="G4_Al"/>
+            <slice length="VXDLayer1_length" thickness="12.5*um" width="16.8*mm" mat="Acrylicglue"/>
+            <slice length="VXDLayer1_length" thickness="13.0*um" width="16.8*mm" mat="Kapton"/>
+            <slice length="VXDLayer1_length" thickness=" 8.0*um" width="16.8*mm" mat="G4_Al"/>
+            <slice length="VXDLayer1_length" thickness="12.5*um" width="16.8*mm" mat="Acrylicglue"/>
+            <slice length="VXDLayer1_length" thickness="12.5*um" width="16.8*mm" mat="Kapton"/>
+            <slice length="VXDLayer1_length" thickness="12.5*um" width="16.8*mm" mat="Acrylicglue"/> <!--glue between flex and sensor/support-->
+          </flex>
+          <sensor n_sensors="10" gap="0.1*mm" thickness="50*um" active_length="25.6*mm" active_width="12.8*mm" dead_width="2*mm" sensor_mat="G4_Si"
+                  deadwire_length="(10*(25.6+0.1)-0.1)*mm" deadwire_width="2*mm" deadwire_thickness="(50/10)*um" deadwire_mat="G4_Al"/>
+        </ladder>
+      </layer>
+      <layer layer_id="1" ladder_radius="30*mm" ladder_offset="(8.4+7.041272)*mm" n_ladders="16" n_sensors_per_side="0">
+        <ladder isDoubleSided="true">
+          <ladderSupport height="2*mm" length="VXDLayer2_length+1*mm" thickness="250*um" width="16.8*mm" mat="CFRP_CMS"/>
+          <flex>
+	    <slice length="VXDLayer2_length" thickness="12.5*um" width="16.8*mm" mat="Acrylicglue"/> <!--glue between flex and sensor/support-->
+            <slice length="VXDLayer2_length" thickness="12.5*um" width="16.8*mm" mat="Kapton"/>
+            <slice length="VXDLayer2_length" thickness="12.5*um" width="16.8*mm" mat="Acrylicglue"/>
+            <slice length="VXDLayer2_length" thickness=" 8.0*um" width="16.8*mm" mat="G4_Al"/>
+            <slice length="VXDLayer2_length" thickness="13.0*um" width="16.8*mm" mat="Kapton"/>
+            <slice length="VXDLayer2_length" thickness="12.5*um" width="16.8*mm" mat="Acrylicglue"/>
+            <slice length="VXDLayer2_length" thickness="12.0*um" width="16.8*mm" mat="G4_Al"/>
+            <slice length="VXDLayer2_length" thickness="25.0*um" width="16.8*mm" mat="Kapton"/>
+            <slice length="VXDLayer2_length" thickness="12.0*um" width="16.8*mm" mat="G4_Al"/>
+            <slice length="VXDLayer2_length" thickness="12.5*um" width="16.8*mm" mat="Acrylicglue"/>
+            <slice length="VXDLayer2_length" thickness="13.0*um" width="16.8*mm" mat="Kapton"/>
+            <slice length="VXDLayer2_length" thickness=" 8.0*um" width="16.8*mm" mat="G4_Al"/>
+            <slice length="VXDLayer2_length" thickness="12.5*um" width="16.8*mm" mat="Acrylicglue"/>
+            <slice length="VXDLayer2_length" thickness="12.5*um" width="16.8*mm" mat="Kapton"/>
+            <slice length="VXDLayer2_length" thickness="12.5*um" width="16.8*mm" mat="Acrylicglue"/> <!--glue between flex and sensor/support-->
+          </flex>
+          <sensor n_sensors="19" gap="0.1*mm" thickness="50*um" active_length="25.6*mm" active_width="12.8*mm" dead_width="2*mm" sensor_mat="G4_Si"
+                  deadwire_length="(19*(25.6+0.1)-0.1)*mm" deadwire_width="2*mm" deadwire_thickness="(50/10)*um" deadwire_mat="G4_Al"/>
+        </ladder>
+      </layer>
+      <layer layer_id="2" ladder_radius="48*mm" ladder_offset="(8.4+10.213840)*mm" n_ladders="24" n_sensors_per_side="0">
+        <ladder isDoubleSided="true">
+          <ladderSupport height="3*mm" length="VXDLayer3_length+1*mm" thickness="250*um" width="16.8*mm" mat="CFRP_CMS"/>
+          <flex>
+	    <slice length="VXDLayer3_length" thickness="12.5*um" width="16.8*mm" mat="Acrylicglue"/> <!--glue between flex and sensor/support-->
+            <slice length="VXDLayer3_length" thickness="12.5*um" width="16.8*mm" mat="Kapton"/>
+            <slice length="VXDLayer3_length" thickness="12.5*um" width="16.8*mm" mat="Acrylicglue"/>
+            <slice length="VXDLayer3_length" thickness=" 8.0*um" width="16.8*mm" mat="G4_Al"/>
+            <slice length="VXDLayer3_length" thickness="13.0*um" width="16.8*mm" mat="Kapton"/>
+            <slice length="VXDLayer3_length" thickness="12.5*um" width="16.8*mm" mat="Acrylicglue"/>
+            <slice length="VXDLayer3_length" thickness="12.0*um" width="16.8*mm" mat="G4_Al"/>
+            <slice length="VXDLayer3_length" thickness="25.0*um" width="16.8*mm" mat="Kapton"/>
+            <slice length="VXDLayer3_length" thickness="12.0*um" width="16.8*mm" mat="G4_Al"/>
+            <slice length="VXDLayer3_length" thickness="12.5*um" width="16.8*mm" mat="Acrylicglue"/>
+            <slice length="VXDLayer3_length" thickness="13.0*um" width="16.8*mm" mat="Kapton"/>
+            <slice length="VXDLayer3_length" thickness=" 8.0*um" width="16.8*mm" mat="G4_Al"/>
+            <slice length="VXDLayer3_length" thickness="12.5*um" width="16.8*mm" mat="Acrylicglue"/>
+            <slice length="VXDLayer3_length" thickness="12.5*um" width="16.8*mm" mat="Kapton"/>
+            <slice length="VXDLayer3_length" thickness="12.5*um" width="16.8*mm" mat="Acrylicglue"/> <!--glue between flex and sensor/support-->
+          </flex>
+          <sensor n_sensors="29" gap="0.1*mm" thickness="50*um" active_length="25.6*mm" active_width="12.8*mm" dead_width="2*mm" sensor_mat="G4_Si"
+                  deadwire_length="(29*(25.6+0.1)-0.1)*mm" deadwire_width="2*mm" deadwire_thickness="(50/10)*um" deadwire_mat="G4_Al"/>
+        </ladder>
+      </layer>
+    </detector>
+
+    <detector name="VXDShell" type="DD4hep_Solenoid_o1_v01" id="DetID_NOTUSED" insideTrackingVolume="true">
+      <envelope>
+        <shape type="Tube" rmin="70*mm" rmax="72.5*mm" dz="510*mm" material="Air"/>
+	<position x="0" y="0" z="0*mm"/>
+      </envelope>
+
+      <type_flags type="DetType_SUPPORT"/>
+
+      <layer id="0" inner_r="70*mm" outer_z="510*mm" vis="SeeThrough">
+        <slice material="CFRP_CMS" thickness="2.5*mm" vis="ShellVis"/>
+      </layer>
+    </detector>
+  </detectors>
+  
+  <readouts>
+    <readout name="VXDCollection">
+      <!--segmentation type="CartesianGridYZ" grid_size_y="0.016*mm" grid_size_z="0.016*mm"/>
+      <id>system:5,side:-2,layer:9,module:8,active:8,sensor:8,y:-12,z:-12</id-->
+      <id>system:5,side:-2,layer:9,module:8,active:8,sensor:8</id>
+    </readout>
+  </readouts>
+</lccdd>
diff --git a/Detector/DetCRD/compact/CRD_common_v02/VXD_StaggeredLadder_v02_02.xml b/Detector/DetCRD/compact/CRD_common_v02/VXD_StaggeredLadder_v02_02.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b161b0bb71c29aa1d8a79f07d4868c2895456b6f
--- /dev/null
+++ b/Detector/DetCRD/compact/CRD_common_v02/VXD_StaggeredLadder_v02_02.xml
@@ -0,0 +1,137 @@
+<lccdd>
+  <info name="VXD_StaggeredLadder_v02_02"
+        title="CepC VXD with staggered ladders"
+        author=""
+        url="http://cepc.ihep.ac.cn"
+        status="developing"
+        version="v01">
+    <comment>CepC vertex detector</comment>
+  </info>
+  <define>
+    <constant name="VXD_inner_radius" value="Vertex_inner_radius"/>
+    <constant name="VXD_outer_radius" value="Vertex_outer_radius"/>
+    <constant name="VXD_half_length"  value="Vertex_half_length"/>
+    <constant name="VXDLayer1_length" value="257*mm" />
+    <constant name="VXDLayer2_length" value="257*mm" />
+    <constant name="VXDLayer3_length" value="257*mm" />
+    <constant name="VXD_sensor_length" value="20*mm" />
+  </define>
+
+  <detectors>
+    <detector id="DetID_VXD" name="VXD" type="SiTrackerStaggeredLadder_v01" vis="VXDVis" readout="VXDCollection" insideTrackingVolume="true">
+      <envelope>
+	<shape type="BooleanShape" operation="Subtraction" material="Air" >
+	  <shape type="BooleanShape" operation="Subtraction" material="Air" >
+            <shape type="Tube" rmin="VXD_inner_radius" rmax="VXD_outer_radius" dz="VXD_half_length" />
+            <shape type="Cone" rmin1="0" rmax1="BeamPipe_VertexRegion_rmax" rmin2="0" rmax2="Vertex_Side_rmin" z="(VXD_half_length-BeamPipe_CentralAl_zmax)/2." />
+            <position x="0" y="0" z="VXD_half_length-(VXD_half_length-BeamPipe_CentralAl_zmax)/2."/>
+          </shape>
+	  <shape type="Cone" rmin1="0" rmax1="BeamPipe_VertexRegion_rmax" rmin2="0" rmax2="Vertex_Side_rmin" z="(VXD_half_length-BeamPipe_CentralAl_zmax)/2." />
+          <position x="0" y="0" z="-(VXD_half_length-(VXD_half_length-BeamPipe_CentralAl_zmax)/2.)"/>
+          <rotation x="0" y="180.*deg" z="0" />
+	</shape>
+      </envelope>
+
+      <type_flags type="DetType_TRACKER + DetType_BARREL + DetType_PIXEL "/>
+
+      <global sensitive_thickness="VXD_sensitive_thickness" support_thickness="VXD_support_thickness" sensor_length="VXD_sensor_length"
+              sensitive_mat="G4_Si" support_mat="G4_C" sensitive_threshold_KeV="64*keV"  />
+      <display ladder="SeeThrough" support="VXDSupportVis" flex="VXDFlexVis" sens_env="SeeThrough" sens="GrayVis" deadsensor="GreenVis" deadwire="RedVis"/>
+
+      <layer layer_id="0" ladder_radius="12.0*mm" ladder_offset="(8.4+0.231123)*mm" n_ladders="8" n_sensors_per_side="0">
+        <ladder isDoubleSided="true">
+          <ladderSupport height="2*mm" length="VXDLayer1_length+1*mm" thickness="250*um" width="16.8*mm" mat="CFRP_CMS"/>
+          <flex>
+	    <slice length="VXDLayer1_length" thickness="12.5*um" width="16.8*mm" mat="Acrylicglue"/> <!--glue between flex and sensor/support-->
+            <slice length="VXDLayer1_length" thickness="12.5*um" width="16.8*mm" mat="Kapton"/>
+            <slice length="VXDLayer1_length" thickness="12.5*um" width="16.8*mm" mat="Acrylicglue"/>
+            <slice length="VXDLayer1_length" thickness=" 8.0*um" width="16.8*mm" mat="G4_Al"/>
+            <slice length="VXDLayer1_length" thickness="13.0*um" width="16.8*mm" mat="Kapton"/>
+            <slice length="VXDLayer1_length" thickness="12.5*um" width="16.8*mm" mat="Acrylicglue"/>
+            <slice length="VXDLayer1_length" thickness="12.0*um" width="16.8*mm" mat="G4_Al"/>
+            <slice length="VXDLayer1_length" thickness="25.0*um" width="16.8*mm" mat="Kapton"/>
+            <slice length="VXDLayer1_length" thickness="12.0*um" width="16.8*mm" mat="G4_Al"/>
+            <slice length="VXDLayer1_length" thickness="12.5*um" width="16.8*mm" mat="Acrylicglue"/>
+            <slice length="VXDLayer1_length" thickness="13.0*um" width="16.8*mm" mat="Kapton"/>
+            <slice length="VXDLayer1_length" thickness=" 8.0*um" width="16.8*mm" mat="G4_Al"/>
+            <slice length="VXDLayer1_length" thickness="12.5*um" width="16.8*mm" mat="Acrylicglue"/>
+            <slice length="VXDLayer1_length" thickness="12.5*um" width="16.8*mm" mat="Kapton"/>
+            <slice length="VXDLayer1_length" thickness="12.5*um" width="16.8*mm" mat="Acrylicglue"/> <!--glue between flex and sensor/support-->
+          </flex>
+          <sensor n_sensors="10" gap="0.1*mm" thickness="50*um" active_length="25.6*mm" active_width="12.8*mm" dead_width="2*mm" sensor_mat="G4_Si"
+                  deadwire_length="(10*(25.6+0.1)-0.1)*mm" deadwire_width="2*mm" deadwire_thickness="(50/10)*um" deadwire_mat="G4_Al"/>
+        </ladder>
+      </layer>
+      <layer layer_id="1" ladder_radius="30*mm" ladder_offset="(8.4+7.041272)*mm" n_ladders="16" n_sensors_per_side="0">
+        <ladder isDoubleSided="true">
+          <ladderSupport height="2*mm" length="VXDLayer2_length+1*mm" thickness="250*um" width="16.8*mm" mat="CFRP_CMS"/>
+          <flex>
+	    <slice length="VXDLayer2_length" thickness="12.5*um" width="16.8*mm" mat="Acrylicglue"/> <!--glue between flex and sensor/support-->
+            <slice length="VXDLayer2_length" thickness="12.5*um" width="16.8*mm" mat="Kapton"/>
+            <slice length="VXDLayer2_length" thickness="12.5*um" width="16.8*mm" mat="Acrylicglue"/>
+            <slice length="VXDLayer2_length" thickness=" 8.0*um" width="16.8*mm" mat="G4_Al"/>
+            <slice length="VXDLayer2_length" thickness="13.0*um" width="16.8*mm" mat="Kapton"/>
+            <slice length="VXDLayer2_length" thickness="12.5*um" width="16.8*mm" mat="Acrylicglue"/>
+            <slice length="VXDLayer2_length" thickness="12.0*um" width="16.8*mm" mat="G4_Al"/>
+            <slice length="VXDLayer2_length" thickness="25.0*um" width="16.8*mm" mat="Kapton"/>
+            <slice length="VXDLayer2_length" thickness="12.0*um" width="16.8*mm" mat="G4_Al"/>
+            <slice length="VXDLayer2_length" thickness="12.5*um" width="16.8*mm" mat="Acrylicglue"/>
+            <slice length="VXDLayer2_length" thickness="13.0*um" width="16.8*mm" mat="Kapton"/>
+            <slice length="VXDLayer2_length" thickness=" 8.0*um" width="16.8*mm" mat="G4_Al"/>
+            <slice length="VXDLayer2_length" thickness="12.5*um" width="16.8*mm" mat="Acrylicglue"/>
+            <slice length="VXDLayer2_length" thickness="12.5*um" width="16.8*mm" mat="Kapton"/>
+            <slice length="VXDLayer2_length" thickness="12.5*um" width="16.8*mm" mat="Acrylicglue"/> <!--glue between flex and sensor/support-->
+          </flex>
+          <sensor n_sensors="10" gap="0.1*mm" thickness="50*um" active_length="25.6*mm" active_width="12.8*mm" dead_width="2*mm" sensor_mat="G4_Si"
+                  deadwire_length="(19*(25.6+0.1)-0.1)*mm" deadwire_width="2*mm" deadwire_thickness="(50/10)*um" deadwire_mat="G4_Al"/>
+        </ladder>
+      </layer>
+      <layer layer_id="2" ladder_radius="48*mm" ladder_offset="(8.4+10.213840)*mm" n_ladders="24" n_sensors_per_side="0">
+        <ladder isDoubleSided="true">
+          <ladderSupport height="3*mm" length="VXDLayer3_length+1*mm" thickness="250*um" width="16.8*mm" mat="CFRP_CMS"/>
+          <flex>
+	    <slice length="VXDLayer3_length" thickness="12.5*um" width="16.8*mm" mat="Acrylicglue"/> <!--glue between flex and sensor/support-->
+            <slice length="VXDLayer3_length" thickness="12.5*um" width="16.8*mm" mat="Kapton"/>
+            <slice length="VXDLayer3_length" thickness="12.5*um" width="16.8*mm" mat="Acrylicglue"/>
+            <slice length="VXDLayer3_length" thickness=" 8.0*um" width="16.8*mm" mat="G4_Al"/>
+            <slice length="VXDLayer3_length" thickness="13.0*um" width="16.8*mm" mat="Kapton"/>
+            <slice length="VXDLayer3_length" thickness="12.5*um" width="16.8*mm" mat="Acrylicglue"/>
+            <slice length="VXDLayer3_length" thickness="12.0*um" width="16.8*mm" mat="G4_Al"/>
+            <slice length="VXDLayer3_length" thickness="25.0*um" width="16.8*mm" mat="Kapton"/>
+            <slice length="VXDLayer3_length" thickness="12.0*um" width="16.8*mm" mat="G4_Al"/>
+            <slice length="VXDLayer3_length" thickness="12.5*um" width="16.8*mm" mat="Acrylicglue"/>
+            <slice length="VXDLayer3_length" thickness="13.0*um" width="16.8*mm" mat="Kapton"/>
+            <slice length="VXDLayer3_length" thickness=" 8.0*um" width="16.8*mm" mat="G4_Al"/>
+            <slice length="VXDLayer3_length" thickness="12.5*um" width="16.8*mm" mat="Acrylicglue"/>
+            <slice length="VXDLayer3_length" thickness="12.5*um" width="16.8*mm" mat="Kapton"/>
+            <slice length="VXDLayer3_length" thickness="12.5*um" width="16.8*mm" mat="Acrylicglue"/> <!--glue between flex and sensor/support-->
+          </flex>
+          <sensor n_sensors="10" gap="0.1*mm" thickness="50*um" active_length="25.6*mm" active_width="12.8*mm" dead_width="2*mm" sensor_mat="G4_Si"
+                  deadwire_length="(10*(25.6+0.1)-0.1)*mm" deadwire_width="2*mm" deadwire_thickness="(50/10)*um" deadwire_mat="G4_Al"/>
+        </ladder>
+      </layer>
+    </detector>
+
+    <!--TODO: move into SiTrackerStaggeredLadder_v01/-->
+    <detector name="VXDShell" type="DD4hep_Solenoid_o1_v01" id="DetID_NOTUSED" insideTrackingVolume="true">
+      <envelope>
+        <shape type="Tube" rmin="70*mm" rmax="72.5*mm" dz="210*mm" material="Air"/>
+	<position x="0" y="0" z="0*mm"/>
+      </envelope>
+
+      <type_flags type="DetType_SUPPORT"/>
+
+      <layer id="0" inner_r="70*mm" outer_z="210*mm" vis="SeeThrough">
+        <slice material="CFRP_CMS" thickness="2.5*mm" vis="ShellVis"/>
+      </layer>
+    </detector>
+  </detectors>
+  
+  <readouts>
+    <readout name="VXDCollection">
+      <!--segmentation type="CartesianGridYZ" grid_size_y="0.016*mm" grid_size_z="0.016*mm"/>
+      <id>system:5,side:-2,layer:9,module:8,active:8,sensor:8,y:-12,z:-12</id-->
+      <id>system:5,side:-2,layer:9,module:8,active:8,sensor:8</id>
+    </readout>
+  </readouts>
+</lccdd>
diff --git a/Detector/DetCRD/compact/CRD_common_v02/Yoke_Polyhedra_Barrel_v01_01.xml b/Detector/DetCRD/compact/CRD_common_v02/Yoke_Polyhedra_Barrel_v01_01.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a919b1028ef44f5b9031cce9cb51fb54fc4e5936
--- /dev/null
+++ b/Detector/DetCRD/compact/CRD_common_v02/Yoke_Polyhedra_Barrel_v01_01.xml
@@ -0,0 +1,60 @@
+<lccdd>
+  <define>
+    <constant name="Yoke_cells_size" value="30*mm"/> 
+  </define>
+
+  <detectors>
+    <detector name="YokeBarrel" type="DD4hep_PolyhedraBarrelCalorimeter2" id="DetID_YOKE" readout="MuonBarrelCollection" vis="SeeThrough" gap="10*mm" >
+      <comment>Yoke Barrel</comment>
+      <type_flags type=" DetType_CALORIMETER + DetType_BARREL + DetType_MUON " />
+
+      <dimensions numsides="Yoke_barrel_symmetry" z="Yoke_barrel_half_length*2" rmin="Yoke_barrel_inner_radius"/>
+
+      <staves vis="YOKEVis"/>
+
+      <layer repeat="1" vis="SeeThrough">
+        <slice material="stainless_steel" thickness="100*mm"                    vis="YOKEVis"/>
+      </layer>
+      <layer repeat="5" vis="SeeThrough">
+	<slice material="Air"             thickness="0.5*mm"                    vis="SeeThrough" />
+	<slice material="G4_Al"           thickness="0.5*mm"                    vis="SeeThrough" />
+	<slice material="FloatGlass"      thickness="20*mm"                     vis="GrayVis" />
+	<slice material="G4_Al"           thickness="1.0*mm"                    vis="SeeThrough" />
+	<slice material="FloatGlass"      thickness="20*mm"                     vis="GrayVis" />
+	<slice material="G4_Al"           thickness="0.5*mm"                    vis="SeeThrough" />
+	<slice material="Air"             thickness="7.5*mm"                    vis="SeeThrough" />
+        <slice material="stainless_steel" thickness="100*mm"                    vis="YOKEVis"/>
+      </layer>
+      <layer repeat="1" vis="SeeThrough">
+	<slice material="Air"             thickness="0.5*mm"                    vis="SeeThrough" />
+        <slice material="G4_Al"           thickness="0.5*mm"                    vis="SeeThrough" />
+        <slice material="FloatGlass"      thickness="20*mm"                     vis="GrayVis" />
+        <slice material="G4_Al"           thickness="1.0*mm"                    vis="SeeThrough" />
+        <slice material="FloatGlass"      thickness="20*mm"                     vis="GrayVis" />
+        <slice material="G4_Al"           thickness="0.5*mm"                    vis="SeeThrough" />
+        <slice material="Air"             thickness="7.5*mm"                    vis="SeeThrough" />
+        <slice material="stainless_steel" thickness="150*mm"                    vis="YOKEVis"/>
+      </layer>
+      <layer repeat="2" vis="SeeThrough">
+	<slice material="Air"             thickness="0.5*mm"                    vis="SeeThrough" />
+        <slice material="G4_Al"           thickness="0.5*mm"                    vis="SeeThrough" />
+        <slice material="FloatGlass"      thickness="20*mm"                     vis="GrayVis" />
+        <slice material="G4_Al"           thickness="1.0*mm"                    vis="SeeThrough" />
+        <slice material="FloatGlass"      thickness="20*mm"                     vis="GrayVis" />
+        <slice material="G4_Al"           thickness="0.5*mm"                    vis="SeeThrough" />
+        <slice material="Air"             thickness="7.5*mm"                    vis="SeeThrough" />
+        <slice material="stainless_steel" thickness="300*mm"                    vis="YOKEVis"/>
+      </layer>
+    </detector>
+  </detectors>
+
+  <readouts>
+    <readout name="MuonBarrelCollection">
+      <!--segmentation type="TiledLayerGridXY" grid_size_x="Yoke_cells_size" grid_size_y="Yoke_cells_size"/-->
+      <!--id>system:5,module:3,stave:4,tower:5,layer:6,slice:4,x:32:-16,y:-16</id-->
+      <segmentation type="CartesianGridXY" grid_size_x="Yoke_cells_size" grid_size_y="Yoke_cells_size"/>
+      <id>system:5,barrel:1,module:3,stave:4,layer:6,slice:4,x:32:-16,y:-16</id>
+    </readout>
+  </readouts>
+
+</lccdd>
diff --git a/Detector/DetCRD/compact/CRD_common_v02/Yoke_Polyhedra_Endcaps_v01_01.xml b/Detector/DetCRD/compact/CRD_common_v02/Yoke_Polyhedra_Endcaps_v01_01.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e2127e0c89eaf9a98ba1188fce3fcbec6a822510
--- /dev/null
+++ b/Detector/DetCRD/compact/CRD_common_v02/Yoke_Polyhedra_Endcaps_v01_01.xml
@@ -0,0 +1,58 @@
+<lccdd>
+  <define>
+    <constant name="Hcal_Yoke_plug_gap"      value="25*mm"/>
+    <constant name="YokeEndcapPlug_symmetry" value="Yoke_endcap_outer_symmetry"/>
+  </define>
+  <detectors>
+    <detector name="YokeEndcap" type="DD4hep_PolyhedraEndcapCalorimeter2" id="DetID_YOKE_ENDCAP" readout="MuonEndcapsCollection" vis="YOKEVis" insideTrackingVolume="false" >
+      <envelope>
+	<shape type="Assembly"/>
+      </envelope>
+
+      <type_flags type=" DetType_CALORIMETER + DetType_ENDCAP + DetType_MUON " />
+
+      <dimensions numsides="Yoke_endcap_outer_symmetry" rmin="Yoke_endcap_inner_radius" rmax="Yoke_endcap_outer_radius/cos(pi/Yoke_endcap_outer_symmetry)" zmin="Yoke_endcap_zmin" />
+      <layer repeat="1" vis="SeeThrough">
+	<slice material="stainless_steel" thickness="100.0*mm"                  vis="YOKEVis"   />
+      </layer>
+      <layer repeat="5" vis="SeeThrough">
+        <slice material="Air"             thickness="0.5*mm"                    vis="SeeThrough" />
+        <slice material="G4_Al"           thickness="0.5*mm"                    vis="SeeThrough" />
+        <slice material="FloatGlass"      thickness="20*mm"                     vis="GrayVis" />
+        <slice material="G4_Al"           thickness="1.0*mm"                    vis="SeeThrough" />
+        <slice material="FloatGlass"      thickness="20*mm"                     vis="GrayVis" />
+        <slice material="G4_Al"           thickness="0.5*mm"                    vis="SeeThrough" />
+        <slice material="Air"             thickness="7.5*mm"                    vis="SeeThrough" />
+        <slice material="stainless_steel" thickness="100*mm"                    vis="YOKEVis"/>
+      </layer>
+      <layer repeat="1" vis="SeeThrough">
+        <slice material="Air"             thickness="0.5*mm"                    vis="SeeThrough" />
+        <slice material="G4_Al"           thickness="0.5*mm"                    vis="SeeThrough" />
+        <slice material="FloatGlass"      thickness="20*mm"                     vis="GrayVis" />
+        <slice material="G4_Al"           thickness="1.0*mm"                    vis="SeeThrough" />
+        <slice material="FloatGlass"      thickness="20*mm"                     vis="GrayVis" />
+        <slice material="G4_Al"           thickness="0.5*mm"                    vis="SeeThrough" />
+        <slice material="Air"             thickness="7.5*mm"                    vis="SeeThrough" />
+        <slice material="stainless_steel" thickness="150*mm"                    vis="YOKEVis"/>
+      </layer>
+      <layer repeat="2" vis="SeeThrough">
+        <slice material="Air"             thickness="0.5*mm"                    vis="SeeThrough" />
+        <slice material="G4_Al"           thickness="0.5*mm"                    vis="SeeThrough" />
+        <slice material="FloatGlass"      thickness="20*mm"                     vis="GrayVis" />
+        <slice material="G4_Al"           thickness="1.0*mm"                    vis="SeeThrough" />
+        <slice material="FloatGlass"      thickness="20*mm"                     vis="GrayVis" />
+        <slice material="G4_Al"           thickness="0.5*mm"                    vis="SeeThrough" />
+        <slice material="Air"             thickness="7.5*mm"                    vis="SeeThrough" />
+        <slice material="stainless_steel" thickness="300*mm"                    vis="YOKEVis"/>
+      </layer>
+    </detector>
+  </detectors>
+
+  <readouts>
+    <readout name="MuonEndcapsCollection">
+      <segmentation type="CartesianGridXY" grid_size_x="Yoke_cells_size" grid_size_y="Yoke_cells_size"/>
+      <id>system:5,side:2,module:3,stave:4,barrel:3,layer:6,slice:4,x:32:-16,y:-16</id>
+    </readout>
+  </readouts>
+
+</lccdd>
diff --git a/Detector/DetCRD/compact/CRD_common_v02/materials.xml b/Detector/DetCRD/compact/CRD_common_v02/materials.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b7205315712174e04014ed02459f627dd8bc9f28
--- /dev/null
+++ b/Detector/DetCRD/compact/CRD_common_v02/materials.xml
@@ -0,0 +1,645 @@
+  <materials>
+    <isotope N="1" Z="1" name="H1">
+      <atom unit="g/mole" value="1.00782503081372"/>
+    </isotope>
+    <isotope N="2" Z="1" name="H2">
+      <atom unit="g/mole" value="2.01410199966617"/>
+    </isotope>
+    <element name="H">
+      <fraction n="0.999885" ref="H1"/>
+      <fraction n="0.000115" ref="H2"/>
+    </element>
+    <material name="G4_H" state="gas">
+      <D unit="g/cm3" value="8.3748e-05"/>
+      <fraction n="1" ref="H"/>
+    </material>
+    <isotope N="12" Z="6" name="C12">
+      <atom unit="g/mole" value="12"/>
+    </isotope>
+    <isotope N="13" Z="6" name="C13">
+      <atom unit="g/mole" value="13.0034"/>
+    </isotope>
+    <element name="C">
+      <fraction n="0.9893" ref="C12"/>
+      <fraction n="0.0107" ref="C13"/>
+    </element>
+    <isotope N="14" Z="7" name="N14">
+      <atom unit="g/mole" value="14.0031"/>
+    </isotope>
+    <isotope N="15" Z="7" name="N15">
+      <atom unit="g/mole" value="15.0001"/>
+    </isotope>
+    <element name="N">
+      <fraction n="0.99632" ref="N14"/>
+      <fraction n="0.00368" ref="N15"/>
+    </element>
+    <isotope N="16" Z="8" name="O16">
+      <atom unit="g/mole" value="15.9949"/>
+    </isotope>
+    <isotope N="17" Z="8" name="O17">
+      <atom unit="g/mole" value="16.9991"/>
+    </isotope>
+    <isotope N="18" Z="8" name="O18">
+      <atom unit="g/mole" value="17.9992"/>
+    </isotope>
+    <element name="O">
+      <fraction n="0.99757" ref="O16"/>
+      <fraction n="0.00038" ref="O17"/>
+      <fraction n="0.00205" ref="O18"/>
+    </element>
+    <material name="G4_KAPTON" state="solid">
+      <MEE unit="eV" value="79.6"/>
+      <D unit="g/cm3" value="1.42"/>
+      <fraction n="0.026362" ref="H"/>
+      <fraction n="0.691133" ref="C"/>
+      <fraction n="0.07327" ref="N"/>
+      <fraction n="0.209235" ref="O"/>
+    </material>
+    <isotope N="28" Z="14" name="Si28">
+      <atom unit="g/mole" value="27.9769"/>
+    </isotope>
+    <isotope N="29" Z="14" name="Si29">
+      <atom unit="g/mole" value="28.9765"/>
+    </isotope>
+    <isotope N="30" Z="14" name="Si30">
+      <atom unit="g/mole" value="29.9738"/>
+    </isotope>
+    <element name="Si">
+      <fraction n="0.922296077703922" ref="Si28"/>
+      <fraction n="0.0468319531680468" ref="Si29"/>
+      <fraction n="0.0308719691280309" ref="Si30"/>
+    </element>
+    <material name="SiC_foam" state="solid">
+      <MEE unit="eV" value="137.77733431141"/>
+      <D unit="g/cm3" value="0.19"/>
+      <fraction n="0.299548759813591" ref="C"/>
+      <fraction n="0.700451240186409" ref="Si"/>
+    </material>
+    <material Z="13" name="G4_Al" state="solid">
+      <MEE unit="eV" value="166"/>
+      <D unit="g/cm3" value="2.699"/>
+      <atom unit="g/mole" value="26.9815"/>
+      <fraction n="1" ref="Al"/>
+    </material>
+    <material name="G4_Si" state="solid">
+      <MEE unit="eV" value="173"/>
+      <D unit="g/cm3" value="2.33"/>
+      <fraction n="1" ref="Si"/>
+    </material>
+    <isotope N="63" Z="29" name="Cu63">
+      <atom unit="g/mole" value="62.9296"/>
+    </isotope>
+    <isotope N="65" Z="29" name="Cu65">
+      <atom unit="g/mole" value="64.9278"/>
+    </isotope>
+    <element name="Cu">
+      <fraction n="0.6917" ref="Cu63"/>
+      <fraction n="0.3083" ref="Cu65"/>
+    </element>
+    <material name="G4_Cu" state="solid">
+      <MEE unit="eV" value="322"/>
+      <D unit="g/cm3" value="8.96"/>
+      <fraction n="1" ref="Cu"/>
+    </material>
+    <material Z="4" name="G4_Be" state="solid">
+      <MEE unit="eV" value="63.7"/>
+      <D unit="g/cm3" value="1.848"/>
+      <atom unit="g/mole" value="9.01218"/>
+      <fraction n="1" ref="Be"/>
+    </material>
+    <isotope N="46" Z="22" name="Ti46">
+      <atom unit="g/mole" value="45.9526"/>
+    </isotope>
+    <isotope N="47" Z="22" name="Ti47">
+      <atom unit="g/mole" value="46.9518"/>
+    </isotope>
+    <isotope N="48" Z="22" name="Ti48">
+      <atom unit="g/mole" value="47.9479"/>
+    </isotope>
+    <isotope N="49" Z="22" name="Ti49">
+      <atom unit="g/mole" value="48.9479"/>
+    </isotope>
+    <isotope N="50" Z="22" name="Ti50">
+      <atom unit="g/mole" value="49.9448"/>
+    </isotope>
+    <element name="Ti">
+      <fraction n="0.0825" ref="Ti46"/>
+      <fraction n="0.0744" ref="Ti47"/>
+      <fraction n="0.7372" ref="Ti48"/>
+      <fraction n="0.0541" ref="Ti49"/>
+      <fraction n="0.0518" ref="Ti50"/>
+    </element>
+    <material name="G4_Ti" state="solid">
+      <MEE unit="eV" value="233"/>
+      <D unit="g/cm3" value="4.54"/>
+      <fraction n="1" ref="Ti"/>
+    </material>
+    <material name="styropor" state="solid">
+      <MEE unit="eV" value="65.9436601819466"/>
+      <D unit="g/cm3" value="0.025"/>
+      <fraction n="0.922577329294378" ref="C"/>
+      <fraction n="0.0774226707056217" ref="H"/>
+    </material>
+    <material name="GroundOrHVMix" state="solid">
+      <MEE unit="eV" value="259.806022507979"/>
+      <D unit="g/cm3" value="5.19"/>
+      <fraction n="0.00360636223506744" ref="H"/>
+      <fraction n="0.0945480597302505" ref="C"/>
+      <fraction n="0.0100234489402697" ref="N"/>
+      <fraction n="0.0286236705202312" ref="O"/>
+      <fraction n="0.863198458574181" ref="Cu"/>
+    </material>
+    <isotope N="35" Z="17" name="Cl35">
+      <atom unit="g/mole" value="34.9689"/>
+    </isotope>
+    <isotope N="37" Z="17" name="Cl37">
+      <atom unit="g/mole" value="36.9659"/>
+    </isotope>
+    <element name="Cl">
+      <fraction n="0.7578" ref="Cl35"/>
+      <fraction n="0.2422" ref="Cl37"/>
+    </element>
+    <material name="siPCBMix" state="solid">
+      <MEE unit="eV" value="262.475002085268"/>
+      <D unit="g/cm3" value="5.05076923076923"/>
+      <fraction n="0.014498933901919" ref="Cl"/>
+      <fraction n="0.083477099995865" ref="O"/>
+      <fraction n="0.0654857498400853" ref="Si"/>
+      <fraction n="0.00351122019083304" ref="H"/>
+      <fraction n="0.0142636698452849" ref="C"/>
+      <fraction n="0.818763326226013" ref="Cu"/>
+    </material>
+    <isotope N="36" Z="18" name="Ar36">
+      <atom unit="g/mole" value="35.9675"/>
+    </isotope>
+    <isotope N="38" Z="18" name="Ar38">
+      <atom unit="g/mole" value="37.9627"/>
+    </isotope>
+    <isotope N="40" Z="18" name="Ar40">
+      <atom unit="g/mole" value="39.9624"/>
+    </isotope>
+    <element name="Ar">
+      <fraction n="0.003365" ref="Ar36"/>
+      <fraction n="0.000632" ref="Ar38"/>
+      <fraction n="0.996003" ref="Ar40"/>
+    </element>
+    <material name="G4_AIR" state="gas">
+      <MEE unit="eV" value="85.7"/>
+      <D unit="g/cm3" value="0.00120479"/>
+      <fraction n="0.000124000124000124" ref="C"/>
+      <fraction n="0.755267755267755" ref="N"/>
+      <fraction n="0.231781231781232" ref="O"/>
+      <fraction n="0.0128270128270128" ref="Ar"/>
+    </material>
+    <material name="Vacuum" state="gas">
+      <D unit="g/cm3" value="0.00000000001"/>
+      <fraction n="1" ref="G4_AIR"/>
+    </material>
+    <material name="Air" state="gas">
+      <D unit="g/cm3" value="0.00120479"/>
+      <fraction n="1" ref="G4_AIR"/>
+    </material>
+    <material name="ThinAir" state="gas">
+      <D unit="g/cm3" value="0.00120479*1e-2"/>
+      <fraction n="1" ref="G4_AIR"/>
+    </material>
+    <isotope N="180" Z="74" name="W180">
+      <atom unit="g/mole" value="179.947"/>
+    </isotope>
+    <isotope N="182" Z="74" name="W182">
+      <atom unit="g/mole" value="181.948"/>
+    </isotope>
+    <isotope N="183" Z="74" name="W183">
+      <atom unit="g/mole" value="182.95"/>
+    </isotope>
+    <isotope N="184" Z="74" name="W184">
+      <atom unit="g/mole" value="183.951"/>
+    </isotope>
+    <isotope N="186" Z="74" name="W186">
+      <atom unit="g/mole" value="185.954"/>
+    </isotope>
+    <element name="W">
+      <fraction n="0.0012" ref="W180"/>
+      <fraction n="0.265" ref="W182"/>
+      <fraction n="0.1431" ref="W183"/>
+      <fraction n="0.3064" ref="W184"/>
+      <fraction n="0.2843" ref="W186"/>
+    </element>
+    <material name="G4_W" state="solid">
+      <MEE unit="eV" value="727"/>
+      <D unit="g/cm3" value="19.3"/>
+      <fraction n="1" ref="W"/>
+    </material>
+    <material name="g10" state="solid">
+      <MEE unit="eV" value="114.378463512112"/>
+      <D unit="g/cm3" value="1.7"/>
+      <fraction n="0.08" ref="Cl"/>
+      <fraction n="0.460597175271302" ref="O"/>
+      <fraction n="0.361327255" ref="Si"/>
+      <fraction n="0.0193736737588317" ref="H"/>
+      <fraction n="0.078701895969866" ref="C"/>
+    </material>
+    <isotope N="54" Z="26" name="Fe54">
+      <atom unit="g/mole" value="53.9396"/>
+    </isotope>
+    <isotope N="56" Z="26" name="Fe56">
+      <atom unit="g/mole" value="55.9349"/>
+    </isotope>
+    <isotope N="57" Z="26" name="Fe57">
+      <atom unit="g/mole" value="56.9354"/>
+    </isotope>
+    <isotope N="58" Z="26" name="Fe58">
+      <atom unit="g/mole" value="57.9333"/>
+    </isotope>
+    <element name="Fe">
+      <fraction n="0.05845" ref="Fe54"/>
+      <fraction n="0.91754" ref="Fe56"/>
+      <fraction n="0.02119" ref="Fe57"/>
+      <fraction n="0.00282" ref="Fe58"/>
+    </element>
+    <isotope N="50" Z="24" name="Cr50">
+      <atom unit="g/mole" value="49.946"/>
+    </isotope>
+    <isotope N="52" Z="24" name="Cr52">
+      <atom unit="g/mole" value="51.9405"/>
+    </isotope>
+    <isotope N="53" Z="24" name="Cr53">
+      <atom unit="g/mole" value="52.9407"/>
+    </isotope>
+    <isotope N="54" Z="24" name="Cr54">
+      <atom unit="g/mole" value="53.9389"/>
+    </isotope>
+    <element name="Cr">
+      <fraction n="0.04345" ref="Cr50"/>
+      <fraction n="0.83789" ref="Cr52"/>
+      <fraction n="0.09501" ref="Cr53"/>
+      <fraction n="0.02365" ref="Cr54"/>
+    </element>
+    <isotope N="58" Z="28" name="Ni58">
+      <atom unit="g/mole" value="57.9353"/>
+    </isotope>
+    <isotope N="60" Z="28" name="Ni60">
+      <atom unit="g/mole" value="59.9308"/>
+    </isotope>
+    <isotope N="61" Z="28" name="Ni61">
+      <atom unit="g/mole" value="60.9311"/>
+    </isotope>
+    <isotope N="62" Z="28" name="Ni62">
+      <atom unit="g/mole" value="61.9283"/>
+    </isotope>
+    <isotope N="64" Z="28" name="Ni64">
+      <atom unit="g/mole" value="63.928"/>
+    </isotope>
+    <element name="Ni">
+      <fraction n="0.680769" ref="Ni58"/>
+      <fraction n="0.262231" ref="Ni60"/>
+      <fraction n="0.011399" ref="Ni61"/>
+      <fraction n="0.036345" ref="Ni62"/>
+      <fraction n="0.009256" ref="Ni64"/>
+    </element>
+    <material name="stainless_steel" state="solid">
+      <MEE unit="eV" value="282.929693036223"/>
+      <D unit="g/cm3" value="7.87"/>
+      <fraction n="0.70611" ref="Fe"/>
+      <fraction n="0.18784" ref="Cr"/>
+      <fraction n="0.10605" ref="Ni"/>
+    </material>
+    <material name="fanele2" state="solid">
+      <MEE unit="eV" value="75.3984269235952"/>
+      <D unit="g/cm3" value="2.04"/>
+      <fraction n="0.0814736540216391" ref="H"/>
+      <fraction n="0.543350389498575" ref="C"/>
+      <fraction n="0.257623229207059" ref="O"/>
+      <fraction n="0.0266436363636364" ref="N"/>
+      <fraction n="0.0909090909090909" ref="Cu"/>
+    </material>
+    <material name="fanele1" state="solid">
+      <MEE unit="eV" value="83.6887639821308"/>
+      <D unit="g/cm3" value="2.61666666666667"/>
+      <fraction n="0.0746841828531692" ref="H"/>
+      <fraction n="0.498071190373694" ref="C"/>
+      <fraction n="0.236154626773137" ref="O"/>
+      <fraction n="0.0244233333333333" ref="N"/>
+      <fraction n="0.166666666666667" ref="Cu"/>
+    </material>
+    <material name="G4_POLYSTYRENE" state="solid">
+      <MEE unit="eV" value="68.7"/>
+      <D unit="g/cm3" value="1.06"/>
+      <fraction n="0.077418" ref="H"/>
+      <fraction n="0.922582" ref="C"/>
+    </material>
+    <isotope N="79" Z="35" name="Br79">
+      <atom unit="g/mole" value="78.9183"/>
+    </isotope>
+    <isotope N="81" Z="35" name="Br81">
+      <atom unit="g/mole" value="80.9163"/>
+    </isotope>
+    <element name="Br">
+      <fraction n="0.5069" ref="Br79"/>
+      <fraction n="0.4931" ref="Br81"/>
+    </element>
+    <material name="PCB" state="solid">
+      <MEE unit="eV" value="88.255598548367"/>
+      <D unit="g/cm3" value="1.7"/>
+      <fraction n="0.180774" ref="Si"/>
+      <fraction n="0.405633" ref="O"/>
+      <fraction n="0.278042" ref="C"/>
+      <fraction n="0.0684428" ref="H"/>
+      <fraction n="0.0671091" ref="Br"/>
+    </material>
+    <material name="G4_Fe" state="solid">
+      <MEE unit="eV" value="286"/>
+      <D unit="g/cm3" value="7.874"/>
+      <fraction n="1" ref="Fe"/>
+    </material>
+    <material name="beam" state="gas">
+      <P unit="pascal" value="6.25e-06"/>
+      <MEE unit="eV" value="38.5760755714278"/>
+      <D unit="g/cm3" value="1.7e-14"/>
+      <fraction n="0.36264" ref="H"/>
+      <fraction n="0.36276" ref="N"/>
+      <fraction n="0.117748421296248" ref="C"/>
+      <fraction n="0.156851578703752" ref="O"/>
+    </material>
+    <material name="TDR_gas" state="gas">
+      <MEE unit="eV" value="177.374841770826"/>
+      <D unit="g/cm3" value="0.001731"/>
+      <fraction n="0.95667" ref="Ar"/>
+      <fraction n="0.00519198196" ref="H"/>
+      <fraction n="0.02165502376" ref="C"/>
+      <fraction n="0.01648299428" ref="O"/>
+    </material>
+    <material name="epoxy" state="solid">
+      <MEE unit="eV" value="60.8292941662115"/>
+      <D unit="g/cm3" value="1.167"/>
+      <fraction n="0.131793699039672" ref="H"/>
+      <fraction n="0.535387047414054" ref="C"/>
+      <fraction n="0.332819253546274" ref="O"/>
+    </material>
+    <material name="G4_C" state="solid">
+      <MEE unit="eV" value="81"/>
+      <D unit="g/cm3" value="2"/>
+      <fraction n="1" ref="C"/>
+    </material>
+    <isotope N="27" Z="13" name="Al27">
+      <atom unit="g/mole" value="26.9815"/>
+    </isotope>
+    <element name="Al">
+      <fraction n="1" ref="Al27"/>
+    </element>
+
+<!-- 
+    <material name="TPC_endplate_mix">
+      <! D value="1.7" unit="g/cm3"/    >
+      <composite n="74" ref="G4_AIR"/>
+      <composite n="12" ref="g10"/>
+      <composite n="14" ref="G4_Al"/>
+    </material>
+-->
+ 
+    <material name="TPC_endplate_mix" state="solid">
+      <MEE unit="eV" value="97.0754229107761"/>
+      <D unit="g/cm3" value="0.5827515446"/>
+      <fraction n="0.00953598760814401" ref="C"/>
+      <fraction n="0.558898138898139" ref="N"/>
+      <fraction n="0.226789772550668" ref="O"/>
+      <fraction n="0.00949198949198949" ref="Ar"/>
+      <fraction n="0.14" ref="Al"/>
+      <fraction n="0.0096" ref="Cl"/>
+      <fraction n="0.0433592706" ref="Si"/>
+      <fraction n="0.00232484085105981" ref="H"/>
+    </material>
+    <material name="CarbonFiber" state="solid">
+      <MEE unit="eV" value="70.7270877537631"/>
+      <D unit="g/cm3" value="1.46666666666667"/>
+      <fraction n="0.794091986922138" ref="C"/>
+      <fraction n="0.058408571165309" ref="H"/>
+      <fraction n="0.147499441912553" ref="O"/>
+    </material>
+    <material name="CarbonFiber_25percent">
+      <D type="density" value="0.375" unit="g/cm3"/>
+      <fraction n="1.0" ref="CarbonFiber"/>
+    </material>
+    <material name="CarbonFiber_15percent">
+      <D type="density" value="0.225" unit="g/cm3"/>
+      <fraction n="1.0" ref="CarbonFiber"/>
+    </material>
+    <material name="G4_GRAPHITE" state="solid">
+      <MEE unit="eV" value="78"/>
+      <D unit="g/cm3" value="2.21"/>
+      <fraction n="1" ref="C"/>
+    </material>
+    <material name="diamond" state="solid">
+      <MEE unit="eV" value="81"/>
+      <D unit="g/cm3" value="3.51"/>
+      <fraction n="1" ref="C"/>
+    </material>
+    <material Z="79" name="G4_Au" state="solid">
+      <MEE unit="eV" value="790"/>
+      <D unit="g/cm3" value="19.32"/>
+      <atom unit="g/mole" value="196.967"/>
+    </material>
+    <material name="G4_POLYETHYLENE" state="solid">
+      <MEE unit="eV" value="57.4"/>
+      <D unit="g/cm3" value="0.94"/>
+      <fraction n="0.143711" ref="H"/>
+      <fraction n="0.856289" ref="C"/>
+    </material>
+    <isotope N="55" Z="25" name="Mn55">
+      <atom unit="g/mole" value="54.938"/>
+    </isotope>
+    <element name="Mn">
+      <fraction n="1" ref="Mn55"/>
+    </element>
+    <material name="Steel235" state="solid">
+      <MEE unit="eV" value="285.146562707739"/>
+      <D unit="g/cm3" value="7.87"/>
+      <fraction n="0.9843" ref="Fe"/>
+      <fraction n="0.0017" ref="C"/>
+      <fraction n="0.014" ref="Mn"/>
+    </material>
+
+    <material name="TungstenDens24">
+      <D value="17.8" unit="g/cm3"/>
+      <fraction n="0.93" ref="W"/>
+      <fraction n="0.061" ref="Ni"/>
+      <fraction n="0.009" ref="Fe"/>
+    </material>
+
+    <!-- 32.65cm radiation length for TPC-->
+    <material name="Kapton">
+      <D value="1.243" unit="g/cm3" />
+      <composite n="22" ref="C"/>
+      <composite n="10" ref="H" />
+      <composite n="2" ref="N" />
+      <composite n="5" ref="O" />
+    </material>
+
+    <comment> materials for the SemiDigital Hadronic calorimeter</comment>
+    <material name="RPCGAS2" >
+    <!-- C2H2F4 (TFE) 0.93% + IsoButane 0.05% + SF6 0.02% -->
+    <!--  <D value="0.00421" unit="g/cm3" /> -->
+      <D value="0.00449" unit="g/cm3" />
+      <fraction n="0.70828" ref="F"/>
+      <fraction n="0.26054" ref="C"/>
+      <fraction n="0.01928" ref="H"/>
+      <fraction n="0.00439" ref="S"/>
+    </material>
+
+    <material name="FloatGlass" >
+<!--      <D value="2.44" unit="g/cm3" /> -->
+      <D value="2.49" unit="g/cm3" />
+      <fraction n="0.46645" ref="O"/>
+      <fraction n="0.34125" ref="Si"/>
+      <fraction n="0.06432" ref="Ca"/>
+      <fraction n="0.02412" ref="Mg"/>
+      <fraction n="0.10386" ref="Na"/>
+    </material>
+
+    <material name="mylar">
+      <D value="1.4" unit="g/cm3" />
+      <fraction n="0.333025" ref="O"/>
+      <fraction n="0.041959" ref="H"/>
+      <fraction n="0.625016" ref="C"/>
+    </material>
+
+    <material name="Nylon" >
+    <!-- Nylon-6-6 -->
+<!--      <MEE unit="eV" value="63.9"/> -->
+      <D value="1.14" unit="g/cm3" />
+      <fraction n="0.097976" ref="H"/>
+      <fraction n="0.636856" ref="C"/>
+      <fraction n="0.123779" ref="N"/>
+      <fraction n="0.141389" ref="O"/>
+    </material>
+
+    <material name="PEEK-GF30" >
+      <D value="1.51" unit="g/cm3" />
+      <fraction n="0.554056" ref="C"/>
+      <fraction n="0.116535" ref="O"/>
+      <fraction n="0.029408" ref="H"/>
+      <fraction n="0.333333" ref="Si"/>
+    </material>
+
+    <material name="g10-RPC">
+      <D value="1.80" unit="g/cm3" />
+      <fraction n="0.07868" ref="C"/>
+      <fraction n="0.46056" ref="O"/>
+      <fraction n="0.02045" ref="H"/>
+      <fraction n="0.46056" ref="Si"/>
+      <fraction n="0.080"   ref="Cl"/>
+    </material>
+
+    <material name="g10-TPC">
+      <D value="1.74" unit="g/cm3" />
+      <composite n="1" ref="g10" />
+    </material>
+
+    <material name="graphite">
+      <MEE unit="eV" value="78"/>
+      <D value="2.21" unit="g/cm3" />
+      <fraction n="1.00" ref="C"/>
+    </material>
+
+    <material name="Steel304L">
+      <D type="density" value="8.00" unit="g/cm3" />
+      <fraction n="0.695" ref="Fe" />
+      <fraction n="0.185" ref="Cr" />
+      <fraction n="0.100" ref="Ni" />
+      <fraction n="0.020" ref="Mn" />
+    </material>
+
+    <!-- to model beampipe with 2mm Be + 0.7mm Cu cables (calc by DJeans) -->
+    <material name="BeampipeBeCableMix">
+      <D type="density" value="3.69" unit="g/cm3" />
+       <fraction n="0.806" ref="Be" />
+       <fraction n="0.194" ref="Cu" />
+    </material>
+
+    <material name="G4_PARAFFIN">
+      <D type="density" value="0.93" unit="g/cm3" />
+       <fraction n="0.148605" ref="H" />
+       <fraction n="0.851395" ref="C" />
+    </material>
+
+    <material name="G4_BGO" state="solid">
+      <MEE unit="eV" value="534.1"/>
+      <D value="7.13" unit="g/cm3" />
+      <fraction n="0.154126" ref="O"/>
+      <fraction n="0.174820" ref="Ge" />
+      <fraction n="0.671054" ref="Bi" />
+    </material>
+
+    <!-- Driftchamber: material for the drift chamber -->
+   <material name="GasHe_90Isob_10">
+     <D value="0.0003983999999999999" unit="g/cm3" />
+     <fraction n="0.3826373431212555" ref="He"/>
+     <fraction n="0.1070614182488552"   ref="H" />
+     <fraction n="0.5103012386298891" ref="C" />
+   </material>
+
+   <material name="superconductor">
+     <D type="density" value="6.78" unit="g/cm3" />
+     <fraction n="0.56" ref="Ni" />
+     <fraction n="0.44" ref="Ti" />
+   </material>
+
+   <material name="lN2">
+     <D type="density" value="0.807" unit="g/cm3" />
+     <fraction n="1" ref="N" />
+   </material>
+    
+   <material name="CH2OCN">
+     <D type="density" value="1.16" unit="g/cm3" />
+     <composite n="2" ref="C" />
+     <composite n="2" ref="H" />
+     <composite n="1" ref="O" />
+     <composite n="1" ref="N" />
+   </material>
+
+   <material name="CFRP_CMS">
+     <D type="density" value="1.43" unit="g/cm3" />
+     <fraction n="0.71" ref="C" />
+     <fraction n="0.29" ref="CH2OCN" />
+   </material>
+
+   <material name="Acrylicglue">
+     <D type="density" value="1.16" unit="g/cm3" />
+     <composite n="5" ref="C" />
+     <composite n="2" ref="O" />
+     <composite n="8" ref="H" />
+   </material>
+
+   <material name="Siliconeglue">
+     <D type="density" value="1.5" unit="g/cm3" />
+     <composite n="12" ref="C" />
+     <composite n="10" ref="H" />
+     <composite n="1"  ref="Si" />
+     <composite n="1"  ref="O" />
+   </material>
+
+   <material name="Aramid">
+     <D type="density" value="1.4" unit="g/cm3" />
+     <composite n="20" ref="C" />
+     <composite n="16" ref="H" />
+     <composite n="4"  ref="N" />
+     <composite n="2"  ref="O" />
+   </material>
+
+   <material name="AramidHoneycomb">
+     <D type="density" value="0.03" unit="g/cm3" />
+     <composite n="1" ref="Aramid" />
+   </material>
+
+   <material name="Copper80P">
+     <D type="density" value="7.168" unit="g/cm3" />
+     <composite n="1" ref="G4_Cu" />
+   </material>
+
+   <material name="G4_WATER">
+     <MEE unit="eV" value="78"/>
+     <D type="density" value="1.0" unit="g/cm3" />
+     <composite n="2" ref="H" />
+     <composite n="1"  ref="O" />
+   </material>
+  </materials>
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
new file mode 100644
index 0000000000000000000000000000000000000000..011b215fdb065ee2f9d50da2ae56c3cd815a7dd1
--- /dev/null
+++ b/Detector/DetCRD/compact/TDR_o1_v01/TDR_Dimensions_v01_01.xml
@@ -0,0 +1,248 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema"
+       xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+
+  <info name="CRDDimensions"
+       title="master file with includes and world dimension"
+       author=""
+       url="no"
+       status="development"
+       version="1.0">
+    <comment>
+      undeterminded parameters
+    </comment>
+  </info>
+
+  <define>
+    <constant name="CrossingAngle" value="0.033*rad"/>  
+
+    <constant name="Global_endcap_costheta" value="0.99"/>
+
+    <constant name="GlobalTrackerReadoutID_DCH" type="string" value="system:8,chamber:1,layer:7,phi:16"/>
+    <constant name="GlobalTrackerReadoutID" type="string" value="system:5,side:-2,layer:9,module:8,sensor:8,barrelside:-2"/>
+
+    <constant name="Field_nominal_value" value="3*tesla"/>
+    <constant name="Field_outer_nominal_value" value="-1.3*tesla"/>
+
+    <constant name="env_safety" value="0.1*mm"/>
+
+    <constant name="DetID_NOTUSED"      value="  0"/>
+    <constant name="DetID_VXD"          value="  1"/>
+    <constant name="DetID_SIT"          value="  2"/>
+    <constant name="DetID_FTD"          value="  3"/>
+    <constant name="DetID_TPC"          value="  4"/>
+    <constant name="DetID_SET"          value="  5"/>
+    <constant name="DetID_ETD"          value="  6"/>
+    
+    <constant name="DetID_ECAL"         value=" 20"/>
+    <constant name="DetID_ECAL_PLUG"    value=" 21"/>
+    <constant name="DetID_HCAL"         value=" 22"/>
+    <constant name="DetID_HCAL_RING"    value=" 23"/>
+    <constant name="DetID_LCAL"         value=" 24"/>
+    <constant name="DetID_BCAL"         value=" 25"/>
+    <constant name="DetID_LHCAL"        value=" 26"/>
+    <constant name="DetID_YOKE"         value=" 27"/>
+    <constant name="DetID_COIL"         value=" 28"/>
+    <constant name="DetID_ECAL_ENDCAP"  value=" 29"/>
+    <constant name="DetID_HCAL_ENDCAP"  value=" 30"/>
+    <constant name="DetID_YOKE_ENDCAP"  value=" 31"/>
+    
+    <constant name="DetID_bwd"       value="-1"/>
+    <constant name="DetID_barrel"    value=" 0"/>
+    <constant name="DetID_fwd"       value="+1"/>
+
+    <!-- FIXME:need to check/-->
+    <constant name="BeamPipe_Be_inner_thickness"   value="0.2*mm"/>
+    <constant name="BeamPipe_Cooling_thickness"    value="0.3*mm"/>
+    <constant name="BeamPipe_Be_outer_thickness"   value="0.15*mm"/>
+    <constant name="BeamPipe_Be_total_thickness"   value="BeamPipe_Be_inner_thickness+BeamPipe_Cooling_thickness+BeamPipe_Be_outer_thickness"/>
+    <constant name="BeamPipe_Al_thickness"         value="BeamPipe_Be_total_thickness"/>
+    <constant name="BeamPipe_Cu_thickness"         value="4.0*mm"/>
+
+    <constant name="BeamPipe_CentralBe_zmax"       value="85*mm"/>
+    <constant name="BeamPipe_CentralAl_zmax"       value="180*mm"/>
+    <constant name="BeamPipe_ExpandAl_zmax"        value="655*mm"/>
+    <constant name="BeamPipe_Linker_zmin"          value="700*mm"/>
+    <constant name="BeamPipe_Linker_zmax"          value="780*mm"/>
+    <constant name="BeamPipe_Waist_zmax"           value="805*mm"/>
+    <constant name="BeamPipe_Crotch_zmax"          value="855*mm"/>
+    <constant name="BeamPipe_FirstSeparated_zmax"  value="1110*mm"/>
+    <constant name="BeamPipe_Mask_zmin"            value="1210*mm"/>
+    <constant name="BeamPipe_Mask_zmax"            value="1230*mm"/>
+    <constant name="BeamPipe_SecondSeparated_zmax" value="2200*mm"/>
+    <constant name="BeamPipe_end_z"                value="7050*mm"/>
+
+    <constant name="BeamPipe_Central_inner_radius"  value="10*mm"/>
+    <constant name="BeamPipe_Fork_inner_radius"     value="10*mm"/>
+    <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_FrontLinker_rmax"      value="BeamPipe_FirstExpand_width/2+BeamPipe_Al_thickness"/>
+    <constant name="BeamPipe_ForwardRegion_rmax"    value="BeamPipe_SecondExpand_width/2+BeamPipe_Cu_thickness"/>
+
+    <constant name="Vertex_inner_radius" value="BeamPipe_Central_inner_radius+BeamPipe_Be_total_thickness"/>
+    <constant name="Vertex_outer_radius" value="70*mm"/>
+    <constant name="Vertex_half_length"  value="430*mm"/>
+
+    <constant name="BeamPipe_VertexRegion_rmax"     value="BeamPipe_Central_inner_radius+BeamPipe_Al_thickness
+	   +(BeamPipe_FirstExpand_width/2-BeamPipe_Central_inner_radius)/(BeamPipe_ExpandAl_zmax-BeamPipe_CentralAl_zmax)*(Vertex_half_length-BeamPipe_CentralAl_zmax)"/>
+    <constant name="Vertex_Side_rmin"    value="BeamPipe_VertexRegion_rmax"/>
+
+    <constant name="TPC_inner_radius" value="600*mm"/>
+    <constant name="TPC_outer_radius" value="1800*mm"/>
+    <constant name="TPC_half_length"  value="2905*mm"/>
+    <constant name="OuterTracker_half_length" value="TPC_half_length"/>
+
+    <constant name="SIT1_inner_radius"   value="150*mm"/>
+    <constant name="SIT2_inner_radius"   value="360*mm"/>
+    <constant name="SIT3_inner_radius"   value="580*mm"/>
+    <constant name="SIT1_half_length"    value="690*mm"/>
+    <constant name="SIT2_half_length"    value="1334*mm"/>
+    <constant name="SIT3_half_length"    value="1978*mm"/>
+
+    <constant name="SET_inner_radius"    value="1815*mm"/>
+
+    <constant name="SiTracker_endcap_barrel_zgap" value="5*mm"/>
+    <constant name="SiTracker_endcap_barrel_rgap" value="10*mm"/>
+    <constant name="SiTracker_endcap_gas_zgap"    value="70*mm"/>
+    <constant name="SiTracker_endcap_gas_rgap"    value="50*mm"/>
+    <constant name="SiTracker_endcap_z1" value="SIT1_half_length+SiTracker_endcap_barrel_zgap"/>
+    <constant name="SiTracker_endcap_z2" value="SIT2_half_length+SiTracker_endcap_barrel_zgap"/>
+    <constant name="SiTracker_endcap_z3" value="SIT3_half_length+SiTracker_endcap_barrel_zgap"/>
+    <constant name="SiTracker_endcap_z4" value="TPC_half_length+SiTracker_endcap_gas_zgap"/>
+    <constant name="SiTracker_endcap_outer_radius1" value="SIT1_inner_radius+SiTracker_endcap_barrel_rgap"/>
+    <constant name="SiTracker_endcap_outer_radius2" value="SIT2_inner_radius+SiTracker_endcap_barrel_rgap"/>
+    <constant name="SiTracker_endcap_outer_radius3" value="TPC_inner_radius-SiTracker_endcap_gas_rgap"/>
+    <constant name="SiTracker_endcap_outer_radius4" value="TPC_outer_radius+SiTracker_endcap_barrel_rgap*2"/>
+
+    <!--obseleted constance, used by old construct, should be removed while creating new constrcut-->
+    <constant name="TPC_Ecal_Hcal_barrel_halfZ"   value="TPC_half_length"/>
+
+    <constant name="Ecal_barrel_inner_radius" value="1900*mm"/>
+    <constant name="Ecal_barrel_thickness"    value="300*mm"/>
+    <constant name="Ecal_barrel_outer_radius" value="Ecal_barrel_inner_radius+Ecal_barrel_thickness"/>
+    <constant name="Ecal_barrel_half_length"  value="2950*mm"/>
+    <constant name="Ecal_barrel_symmetry"     value="32"/>
+    <constant name="Ecal_Tpc_gap"             value="Ecal_barrel_inner_radius-TPC_outer_radius"/>
+
+    <constant name="Ecal_endcap_inner_radius" value="350*mm"/>
+    <constant name="Ecal_endcap_outer_radius" value="Ecal_barrel_outer_radius"/>
+    <constant name="Ecal_endcap_zmin"         value="3050*mm"/>
+    <constant name="Ecal_endcap_zmax"         value="3350*mm"/>
+    <constant name="Ecal_endcap_symmetry"     value="32"/>
+
+    <constant name="Hcal_barrel_inner_radius" value="2215*mm"/>
+    <constant name="Hcal_barrel_outer_radius" value="3685*mm"/>
+    <constant name="Hcal_barrel_half_length"  value="3340*mm"/>
+    <constant name="Hcal_barrel_symmetry"    value="16"/>
+    
+    <constant name="Hcal_endcap_inner_radius" value="400*mm"/>
+    <constant name="Hcal_endcap_outer_radius" value="Hcal_barrel_outer_radius"/>
+    <constant name="Hcal_endcap_zmin" value="3360*mm"/>
+    <constant name="Hcal_endcap_zmax" value="4830*mm"/>
+    <constant name="Hcal_endcap_symmetry" value="16"/>
+
+    <constant name="Solenoid_inner_radius" value="3775*mm"/>
+    <constant name="Solenoid_outer_radius" value="4575*mm"/>
+    <constant name="Solenoid_half_length" value="4780*mm"/>
+    <constant name="SolenoidCoil_half_length" value="4167*mm"/>
+    <constant name="SolenoidCoil_radius" value="3905*mm"/>
+    <constant name="SolenoidCoil_center_radius" value="(Solenoid_inner_radius+Solenoid_outer_radius)/2"/>
+        
+    <constant name="Yoke_barrel_inner_radius" value="4590*mm"/>
+    <constant name="Yoke_barrel_outer_radius" value="6340*mm"/>
+    <constant name="Yoke_barrel_half_length" value="4880*mm"/>
+    <constant name="Yoke_barrel_symmetry" value="12"/>
+    
+    <constant name="Yoke_endcap_inner_radius" value="400*mm"/>
+    <constant name="Yoke_endcap_outer_radius" value="Yoke_barrel_outer_radius"/>
+    <constant name="Yoke_endcap_zmin" value="5130*mm"/>
+    <constant name="Yoke_endcap_zmax" value="6880*mm"/>
+    <constant name="Yoke_endcap_outer_symmetry" value="Yoke_barrel_symmetry"/>
+    <constant name="Yoke_endcap_inner_symmetry" value="0"/>
+
+    <!-- FIXME:need to check/--> 
+    <constant name="LumiCal_inner_radius" value="35.0*mm"/>
+    <constant name="LumiCal_outer_radius" value="100.0*mm"/>
+    <constant name="LumiCal_zmax" value="805*mm" />
+    <constant name="LumiCal_zmin" value="700*mm"/>
+    <constant name="LumiCal_thickness" value="(LumiCal_zmax-LumiCal_zmin)/2.0"/>
+        
+    <constant name="tracker_region_zmax" value="Ecal_endcap_zmin"/>
+    <constant name="tracker_region_rmax" value="Ecal_barrel_inner_radius"/>
+
+  </define>
+  
+  <limits>
+    <limitset name="cal_limits">
+      <limit name="step_length_max" particles="*" value="5.0" unit="mm" />
+    </limitset>
+    <limitset name="dc_limits">
+      <limit name="step_length_max" particles="*" value="10.0" unit="mm" />
+    </limitset>
+    <limitset name="tracker_limits">
+      <limit name="step_length_max" particles="*" value="5.0" unit="mm" />
+    </limitset>
+    <limitset name="detail_limits">
+      <limit name="step_length_max" particles="*" value="1.0" unit="mm" />
+    </limitset>
+    <limitset name="support_limits">
+      <limit name="step_length_max" particles="*" value="10.0" unit="mm" />
+    </limitset>
+  </limits>
+
+  <regions>
+    <region name="BeampipeRegion"/>
+    <region name="VertexRegion"/>
+    <region name="ForwardRegion"/>
+  </regions>
+
+  <display>
+    <vis name="VXDVis"           alpha="0.1" r="0.1"   g=".5"      b=".5"    showDaughters="true"  visible="true"/>
+    <vis name="VXDLayerVis"      alpha="1.0" r="0.1"   g=".5"      b=".5"    showDaughters="true"  visible="true"/>
+    <vis name="VXDSupportVis"    alpha="1.0" r="0.0"   g="1.0"     b="0.0"   showDaughters="true"  visible="true"/>
+    <vis name="FTDVis"           alpha="1.0" r="0.5"   g="0.87"    b="0.11"  showDaughters="true"  visible="true"/>
+    <vis name="FTDSupportVis"    alpha="1.0" r="0.3"   g="0.3"     b="1.0"   showDaughters="true"  visible="true"/>
+    <vis name="FTDSensitiveVis"  alpha="1.0" r="0.3"   g="0.5"     b="1.0"   showDaughters="true"  visible="true"/>
+    <vis name="DCVis"            alpha="1.0" r="0.96"  g="0.64"    b="0.90"  showDaughters="true"  visible="true"/>
+    <vis name="DCLayerVis"       alpha="1.0" r="0.96"  g="0.64"    b="0.90"  showDaughters="false" visible="true"/>
+    <vis name="TPCVis"           alpha="1.0" r="0.96"  g="0.64"    b="0.90"  showDaughters="true"  visible="true"/>
+    <vis name="TPCMotherVis"     alpha="1.0" r="0.96"  g="0.64"    b="0.90"  showDaughters="true"  visible="true"/>
+    <vis name="TPCGasVis"        alpha="1.0" r="0.96"  g="0.64"    b="0.90"  showDaughters="true"  visible="false"/>
+    <vis name="TPCCathodeVis"    alpha="1.0" r="0.6"   g="1.0"     b="0.80"  showDaughters="true"  visible="true"/>
+    <vis name="TPCCathodeGripVis" alpha="1." r="0.7"   g="0.7"     b="0.70"  showDaughters="true"  visible="true"/>
+    <vis name="TPCShellVis"      alpha="1.0" r="0.5"   g="0.5"     b="0.5"   showDaughters="true"  visible="true"/>
+    <vis name="SITVis"           alpha="0.0" r="0.54"  g="0.59"    b="0.93"  showDaughters="true"  visible="false"/>
+    <vis name="SITSupportVis"    alpha="1.0" r="0.0"   g="0.0"     b="1.0"   showDaughters="false" visible="true"/>
+    <vis name="SITSensitiveVis"  alpha="1.0" r="0.67"  g="0.99"    b="0.78"  showDaughters="false" visible="true"/>
+    <vis name="SETVis"           alpha="0.0" r="0.8"   g="0.8"     b="0.4"   showDaughters="true"  visible="false"/>
+    <vis name="SETSupportVis"    alpha="1.0" r="0.5"   g="0.3"     b="1.0"   showDaughters="true"  visible="true"/>
+    <vis name="SETSensitiveVis"  alpha="1.0" r="0.0"   g="0.60"    b="1.0"   showDaughters="true"  visible="true"/>
+    <vis name="ECALVis"          alpha="1.0" r="0.2"   g="0.6"     b="0"     showDaughters="true"  visible="true"/>
+    <vis name="HCALVis"          alpha="1.0" r="0.95"  g="0.78"    b="0.69"  showDaughters="true"  visible="true"/>
+    <vis name="SOLVis"           alpha="1.0" r="0.0"   g="0.0"     b="0.8"   showDaughters="true"  visible="true"/>
+    <vis name="YOKEVis"          alpha="1.0" r="0.64"  g="0.75"    b="0.99"  showDaughters="true" visible="true"/>
+    <vis name="LCALVis"          alpha="1.0" r="0.25"  g="0.88"    b="0.81"  showDaughters="true"  visible="true"/>
+    <vis name="SupportVis"       alpha="1.0" r="0.2"   g="0.2"     b="0.2"   showDaughters="true"  visible="true"/>
+    <vis name="ShellVis"         alpha="1.0" r="1.0"   g="1.0"     b="0.8"   showDaughters="false" visible="true"/>
+
+    <vis name="WhiteVis"         alpha="0.0" r=".96" g=".96"  b=".96"   showDaughters="true"  visible="true"/>
+    <vis name="LightGrayVis"     alpha="0.0" r=".75" g=".75"  b=".75"   showDaughters="true"  visible="true"/>
+    <vis name="Invisible"        alpha="0.0" r="0.0" g="0.0"  b="0.0"   showDaughters="false" visible="false"/>
+    <vis name="SeeThrough"       alpha="0.0" r="0.0" g="0.0"  b="0.0"   showDaughters="true"  visible="false"/>
+    <vis name="RedVis"           alpha="1.0" r="1.0" g="0.0"  b="0.0"   showDaughters="true"  visible="true"/>
+    <vis name="GreenVis"         alpha="1.0" r="0.0" g="1.0"  b="0.0"   showDaughters="true"  visible="true"/>
+    <vis name="BlueVis"          alpha="1.0" r="0.0" g="0.0"  b="1.0"   showDaughters="true"  visible="true"/>
+    <vis name="CyanVis"          alpha="1.0" r="0.0" g="1.0"  b="1.0"   showDaughters="true"  visible="true"/>
+    <vis name="MagentaVis"       alpha="1.0" r="1.0" g="0.0"  b="1.0"   showDaughters="true"  visible="true"/>
+    <vis name="VioletVis"        alpha="1.0" r=".83" g=".55"  b=".89"   showDaughters="true" visible="true"/>
+    <vis name="BlueVioletVis"    alpha="1.0" r=".55" g=".36"  b="1.0"   showDaughters="true"  visible="true"/>
+    <vis name="OrangeVis"        alpha="1.0" r="1.0" g="0.6"  b="0.0"   showDaughters="true"  visible="true"/>
+    <vis name="YellowVis"        alpha="1.0" r="1.0" g="1.0"  b="0.0"   showDaughters="true"  visible="true"/>
+    <vis name="BlackVis"         alpha="1.0" r="0.0" g="0.0"  b="0.0"   showDaughters="true"  visible="true"/>
+    <vis name="GrayVis"          alpha="1.0" r="0.5" g="0.5"  b="0.5"   showDaughters="true"  visible="true"/>
+  </display>
+
+</lccdd>
diff --git a/Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01-onlyTracker.xml b/Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01-onlyTracker.xml
new file mode 100644
index 0000000000000000000000000000000000000000..67d3e526700aca63ecd776fbc95d1873dd12cf85
--- /dev/null
+++ b/Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01-onlyTracker.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema"
+       xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+  <info name="TDR_o1_v01"
+        title="CepC reference detctor for TDR"
+        author=""
+        url="http://cepc.ihep.ac.cn"
+        status="developing"
+        version="v01">
+    <comment>CepC reference detector simulation models used for TDR </comment>
+  </info>
+  
+  <includes>
+    <gdmlFile  ref="${DD4hepINSTALL}/DDDetectors/compact/elements.xml"/>
+    <gdmlFile  ref="../CRD_common_v02/materials.xml"/>
+  </includes>
+  
+  <define>
+    <constant name="world_size" value="10*m"/>
+    <constant name="world_x" value="world_size"/>
+    <constant name="world_y" value="world_size"/>
+    <constant name="world_z" value="world_size"/>
+
+    <include ref="${DD4hepINSTALL}/DDDetectors/compact/detector_types.xml"/>
+  </define>
+
+  <include ref="./TDR_Dimensions_v01_01.xml"/>
+
+  <!--old version, should be check/-->
+  <include ref="../CRD_common_v01/Beampipe_v01_02.xml"/>
+  <!--preliminary vertex and tracker, to update/-->
+  <include ref="../CRD_common_v02/VXD_StaggeredLadder_v02_01.xml"/>
+  <include ref="../CRD_common_v01/FTD_SkewRing_v01_02.xml"/>
+  <include ref="../CRD_common_v01/SIT_SimplePixel_v01_02.xml"/>
+  <include ref="../CRD_common_v01/TPC_Simple_v10_02.xml"/>
+  <include ref="../CRD_common_v01/SET_SimplePixel_v01_01.xml"/>
+  
+  <fields>
+    <field name="InnerSolenoid" type="solenoid"
+           inner_field="Field_nominal_value"
+           outer_field="0"
+           zmax="SolenoidCoil_half_length"
+           inner_radius="SolenoidCoil_center_radius"
+           outer_radius="Solenoid_outer_radius">
+    </field>
+    <field name="OuterSolenoid" type="solenoid"
+           inner_field="0"
+           outer_field="Field_outer_nominal_value"
+           zmax="SolenoidCoil_half_length"
+           inner_radius="Solenoid_outer_radius"
+           outer_radius="Yoke_barrel_inner_radius">
+    </field>
+  </fields>
+
+</lccdd>
diff --git a/Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01.xml b/Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1915d12429c85b59175bf8dcad41d1c2bcdd8167
--- /dev/null
+++ b/Detector/DetCRD/compact/TDR_o1_v01/TDR_o1_v01.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema"
+       xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+  <info name="TDR_o1_v01"
+        title="CepC reference detctor for TDR"
+        author=""
+        url="http://cepc.ihep.ac.cn"
+        status="developing"
+        version="v01">
+    <comment>CepC reference detector simulation models used for TDR </comment>
+  </info>
+  
+  <includes>
+    <gdmlFile  ref="${DD4hepINSTALL}/DDDetectors/compact/elements.xml"/>
+    <gdmlFile  ref="../CRD_common_v02/materials.xml"/>
+  </includes>
+  
+  <define>
+    <constant name="world_size" value="10*m"/>
+    <constant name="world_x" value="world_size"/>
+    <constant name="world_y" value="world_size"/>
+    <constant name="world_z" value="world_size"/>
+
+    <include ref="${DD4hepINSTALL}/DDDetectors/compact/detector_types.xml"/>
+  </define>
+
+  <include ref="./TDR_Dimensions_v01_01.xml"/>
+
+  <!--old version, should be check/-->
+  <include ref="../CRD_common_v01/Beampipe_v01_02.xml"/>
+  <!--preliminary vertex and tracker, to update/-->
+  <include ref="../CRD_common_v02/VXD_StaggeredLadder_v02_01.xml"/>
+  <include ref="../CRD_common_v01/FTD_SkewRing_v01_02.xml"/>
+  <include ref="../CRD_common_v01/SIT_SimplePixel_v01_02.xml"/>
+  <include ref="../CRD_common_v01/TPC_Simple_v10_02.xml"/>
+  <include ref="../CRD_common_v01/SET_SimplePixel_v01_01.xml"/>
+  <!--TODO: Ecal and Hcal/-->
+
+  <!--preliminary Magnet, to update/-->
+  <include ref="../CRD_common_v02/Coil_Simple_v01_02.xml"/>
+  <!--preliminary Muon, to update/-->
+  <include ref="../CRD_common_v02/Yoke_Polyhedra_Barrel_v01_01.xml"/>
+  <include ref="../CRD_common_v02/Yoke_Polyhedra_Endcaps_v01_01.xml"/>
+  
+  <fields>
+    <field name="InnerSolenoid" type="solenoid"
+           inner_field="Field_nominal_value"
+           outer_field="0"
+           zmax="SolenoidCoil_half_length"
+           inner_radius="SolenoidCoil_center_radius"
+           outer_radius="Solenoid_outer_radius">
+    </field>
+    <field name="OuterSolenoid" type="solenoid"
+           inner_field="0"
+           outer_field="Field_outer_nominal_value"
+           zmax="SolenoidCoil_half_length"
+           inner_radius="Solenoid_outer_radius"
+           outer_radius="Yoke_barrel_inner_radius">
+    </field>
+  </fields>
+
+</lccdd>
diff --git a/Detector/DetCRD/compact/TDR_o1_v02/TDR_Dimensions_v01_02.xml b/Detector/DetCRD/compact/TDR_o1_v02/TDR_Dimensions_v01_02.xml
new file mode 100644
index 0000000000000000000000000000000000000000..65915aa7ba032b985a611cd9524971b439b4c469
--- /dev/null
+++ b/Detector/DetCRD/compact/TDR_o1_v02/TDR_Dimensions_v01_02.xml
@@ -0,0 +1,254 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema"
+       xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+
+  <info name="CRDDimensions"
+       title="master file with includes and world dimension"
+       author=""
+       url="no"
+       status="development"
+       version="1.0">
+    <comment>
+      undeterminded parameters
+    </comment>
+  </info>
+
+  <define>
+    <constant name="CrossingAngle" value="0.033*rad"/>  
+
+    <constant name="Global_endcap_costheta" value="0.99"/>
+
+    <constant name="GlobalTrackerReadoutID_DCH" type="string" value="system:8,chamber:1,layer:7,phi:16"/>
+    <constant name="GlobalTrackerReadoutID" type="string" value="system:5,side:-2,layer:9,module:8,sensor:8,barrelside:-2"/>
+
+    <constant name="Field_nominal_value" value="3*tesla"/>
+    <constant name="Field_outer_nominal_value" value="-1.3*tesla"/>
+
+    <constant name="env_safety" value="0.1*mm"/>
+
+    <constant name="DetID_NOTUSED"      value="  0"/>
+    <constant name="DetID_VXD"          value="  1"/>
+    <constant name="DetID_SIT"          value="  2"/>
+    <constant name="DetID_FTD"          value="  3"/>
+    <constant name="DetID_TPC"          value="  4"/>
+    <constant name="DetID_SET"          value="  5"/>
+    <constant name="DetID_ETD"          value="  6"/>
+    
+    <constant name="DetID_ECAL"         value=" 20"/>
+    <constant name="DetID_ECAL_PLUG"    value=" 21"/>
+    <constant name="DetID_HCAL"         value=" 22"/>
+    <constant name="DetID_HCAL_RING"    value=" 23"/>
+    <constant name="DetID_LCAL"         value=" 24"/>
+    <constant name="DetID_BCAL"         value=" 25"/>
+    <constant name="DetID_LHCAL"        value=" 26"/>
+    <constant name="DetID_YOKE"         value=" 27"/>
+    <constant name="DetID_COIL"         value=" 28"/>
+    <constant name="DetID_ECAL_ENDCAP"  value=" 29"/>
+    <constant name="DetID_HCAL_ENDCAP"  value=" 30"/>
+    <constant name="DetID_YOKE_ENDCAP"  value=" 31"/>
+    
+    <constant name="DetID_bwd"       value="-1"/>
+    <constant name="DetID_barrel"    value=" 0"/>
+    <constant name="DetID_fwd"       value="+1"/>
+
+    <!-- FIXME:need to check/-->
+    <constant name="BeamPipe_Be_inner_thickness"   value="0.2*mm"/>
+    <constant name="BeamPipe_Cooling_thickness"    value="0.3*mm"/>
+    <constant name="BeamPipe_Be_outer_thickness"   value="0.15*mm"/>
+    <constant name="BeamPipe_Be_total_thickness"   value="BeamPipe_Be_inner_thickness+BeamPipe_Cooling_thickness+BeamPipe_Be_outer_thickness"/>
+    <constant name="BeamPipe_Al_thickness"         value="BeamPipe_Be_total_thickness"/>
+    <constant name="BeamPipe_Cu_thickness"         value="4.0*mm"/>
+
+    <constant name="BeamPipe_CentralBe_zmax"       value="85*mm"/>
+    <constant name="BeamPipe_CentralAl_zmax"       value="180*mm"/>
+    <constant name="BeamPipe_ExpandAl_zmax"        value="655*mm"/>
+    <constant name="BeamPipe_Linker_zmin"          value="700*mm"/>
+    <constant name="BeamPipe_Linker_zmax"          value="780*mm"/>
+    <constant name="BeamPipe_Waist_zmax"           value="805*mm"/>
+    <constant name="BeamPipe_Crotch_zmax"          value="855*mm"/>
+    <constant name="BeamPipe_FirstSeparated_zmax"  value="1110*mm"/>
+    <constant name="BeamPipe_Mask_zmin"            value="1210*mm"/>
+    <constant name="BeamPipe_Mask_zmax"            value="1230*mm"/>
+    <constant name="BeamPipe_SecondSeparated_zmax" value="2200*mm"/>
+    <constant name="BeamPipe_end_z"                value="7050*mm"/>
+
+    <constant name="BeamPipe_Central_inner_radius"  value="10*mm"/>
+    <constant name="BeamPipe_Fork_inner_radius"     value="10*mm"/>
+    <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_FrontLinker_rmax"      value="BeamPipe_FirstExpand_width/2+BeamPipe_Al_thickness"/>
+    <constant name="BeamPipe_ForwardRegion_rmax"    value="BeamPipe_SecondExpand_width/2+BeamPipe_Cu_thickness"/>
+
+    <constant name="Vertex_inner_radius" value="BeamPipe_Central_inner_radius+BeamPipe_Be_total_thickness"/>
+    <constant name="Vertex_outer_radius" value="70*mm"/>
+    <constant name="Vertex_half_length"  value="430*mm"/>
+
+    <constant name="BeamPipe_VertexRegion_rmax"     value="BeamPipe_Central_inner_radius+BeamPipe_Al_thickness
+	   +(BeamPipe_FirstExpand_width/2-BeamPipe_Central_inner_radius)/(BeamPipe_ExpandAl_zmax-BeamPipe_CentralAl_zmax)*(Vertex_half_length-BeamPipe_CentralAl_zmax)"/>
+    <constant name="Vertex_Side_rmin"    value="BeamPipe_VertexRegion_rmax"/>
+
+    <constant name="TPC_inner_radius" value="600*mm"/>
+    <constant name="TPC_outer_radius" value="1800*mm"/>
+    <constant name="TPC_half_length"  value="2905*mm"/>
+    <constant name="OuterTracker_half_length" value="TPC_half_length"/>
+
+    <constant name="SIT1_inner_radius"   value="100*mm"/>
+    <constant name="SIT2_inner_radius"   value="300*mm"/>
+    <constant name="SIT3_inner_radius"   value="580*mm"/>
+    <constant name="SIT1_half_length"    value="368*mm"/>
+    <constant name="SIT2_half_length"    value="920*mm"/>
+    <constant name="SIT3_half_length"    value="2024*mm"/>
+
+    <constant name="SET_inner_radius"    value="1815*mm"/>
+
+    <constant name="SiTracker_endcap_barrel_zgap" value="5*mm"/>
+    <constant name="SiTracker_endcap_barrel_rgap" value="10*mm"/>
+    <constant name="SiTracker_endcap_gas_zgap"    value="70*mm"/>
+    <constant name="SiTracker_endcap_gas_rgap"    value="50*mm"/>
+    <constant name="SiTracker_endcap_z1" value="220*mm"/>
+    <constant name="SiTracker_endcap_z2" value="SIT1_half_length+SiTracker_endcap_barrel_zgap"/>
+    <constant name="SiTracker_endcap_z3" value="(SIT1_half_length+SIT2_half_length)/2"/>
+    <constant name="SiTracker_endcap_z4" value="SIT2_half_length+SiTracker_endcap_barrel_zgap"/>
+    <constant name="SiTracker_endcap_z5" value="1380*mm"/>
+    <constant name="SiTracker_endcap_z6" value="SIT3_half_length+SiTracker_endcap_barrel_zgap"/>
+    <constant name="SiTracker_endcap_z7" value="TPC_half_length+SiTracker_endcap_gas_zgap"/>
+    <constant name="SiTracker_endcap_outer_radius1" value="SIT1_inner_radius-SiTracker_endcap_barrel_rgap"/>
+    <constant name="SiTracker_endcap_outer_radius2" value="SIT1_inner_radius+SiTracker_endcap_barrel_rgap"/>
+    <constant name="SiTracker_endcap_outer_radius3" value="SIT2_inner_radius-SiTracker_endcap_barrel_rgap"/>
+    <constant name="SiTracker_endcap_outer_radius4" value="SIT2_inner_radius+SiTracker_endcap_barrel_rgap"/>
+    <constant name="SiTracker_endcap_outer_radius5" value="SIT3_inner_radius-SiTracker_endcap_barrel_rgap"/>
+    <constant name="SiTracker_endcap_outer_radius6" value="TPC_inner_radius-SiTracker_endcap_gas_rgap"/>
+    <constant name="SiTracker_endcap_outer_radius7" value="TPC_outer_radius+SiTracker_endcap_barrel_rgap*2"/>
+
+    <!--obseleted constance, used by old construct, should be removed while creating new constrcut-->
+    <constant name="TPC_Ecal_Hcal_barrel_halfZ"   value="TPC_half_length"/>
+
+    <constant name="Ecal_barrel_inner_radius" value="1900*mm"/>
+    <constant name="Ecal_barrel_thickness"    value="300*mm"/>
+    <constant name="Ecal_barrel_outer_radius" value="Ecal_barrel_inner_radius+Ecal_barrel_thickness"/>
+    <constant name="Ecal_barrel_half_length"  value="2950*mm"/>
+    <constant name="Ecal_barrel_symmetry"     value="32"/>
+    <constant name="Ecal_Tpc_gap"             value="Ecal_barrel_inner_radius-TPC_outer_radius"/>
+
+    <constant name="Ecal_endcap_inner_radius" value="350*mm"/>
+    <constant name="Ecal_endcap_outer_radius" value="Ecal_barrel_outer_radius"/>
+    <constant name="Ecal_endcap_zmin"         value="3050*mm"/>
+    <constant name="Ecal_endcap_zmax"         value="3350*mm"/>
+    <constant name="Ecal_endcap_symmetry"     value="32"/>
+
+    <constant name="Hcal_barrel_inner_radius" value="2215*mm"/>
+    <constant name="Hcal_barrel_outer_radius" value="3685*mm"/>
+    <constant name="Hcal_barrel_half_length"  value="3340*mm"/>
+    <constant name="Hcal_barrel_symmetry"    value="16"/>
+    
+    <constant name="Hcal_endcap_inner_radius" value="400*mm"/>
+    <constant name="Hcal_endcap_outer_radius" value="Hcal_barrel_outer_radius"/>
+    <constant name="Hcal_endcap_zmin" value="3360*mm"/>
+    <constant name="Hcal_endcap_zmax" value="4830*mm"/>
+    <constant name="Hcal_endcap_symmetry" value="16"/>
+
+    <constant name="Solenoid_inner_radius" value="3775*mm"/>
+    <constant name="Solenoid_outer_radius" value="4575*mm"/>
+    <constant name="Solenoid_half_length" value="4780*mm"/>
+    <constant name="SolenoidCoil_half_length" value="4167*mm"/>
+    <constant name="SolenoidCoil_radius" value="3905*mm"/>
+    <constant name="SolenoidCoil_center_radius" value="(Solenoid_inner_radius+Solenoid_outer_radius)/2"/>
+        
+    <constant name="Yoke_barrel_inner_radius" value="4590*mm"/>
+    <constant name="Yoke_barrel_outer_radius" value="6340*mm"/>
+    <constant name="Yoke_barrel_half_length" value="4880*mm"/>
+    <constant name="Yoke_barrel_symmetry" value="12"/>
+    
+    <constant name="Yoke_endcap_inner_radius" value="400*mm"/>
+    <constant name="Yoke_endcap_outer_radius" value="Yoke_barrel_outer_radius"/>
+    <constant name="Yoke_endcap_zmin" value="5130*mm"/>
+    <constant name="Yoke_endcap_zmax" value="6880*mm"/>
+    <constant name="Yoke_endcap_outer_symmetry" value="Yoke_barrel_symmetry"/>
+    <constant name="Yoke_endcap_inner_symmetry" value="0"/>
+
+    <!-- FIXME:need to check/--> 
+    <constant name="LumiCal_inner_radius" value="35.0*mm"/>
+    <constant name="LumiCal_outer_radius" value="100.0*mm"/>
+    <constant name="LumiCal_zmax" value="805*mm" />
+    <constant name="LumiCal_zmin" value="700*mm"/>
+    <constant name="LumiCal_thickness" value="(LumiCal_zmax-LumiCal_zmin)/2.0"/>
+        
+    <constant name="tracker_region_zmax" value="Ecal_endcap_zmin"/>
+    <constant name="tracker_region_rmax" value="Ecal_barrel_inner_radius"/>
+
+  </define>
+  
+  <limits>
+    <limitset name="cal_limits">
+      <limit name="step_length_max" particles="*" value="5.0" unit="mm" />
+    </limitset>
+    <limitset name="dc_limits">
+      <limit name="step_length_max" particles="*" value="10.0" unit="mm" />
+    </limitset>
+    <limitset name="tracker_limits">
+      <limit name="step_length_max" particles="*" value="5.0" unit="mm" />
+    </limitset>
+    <limitset name="detail_limits">
+      <limit name="step_length_max" particles="*" value="1.0" unit="mm" />
+    </limitset>
+    <limitset name="support_limits">
+      <limit name="step_length_max" particles="*" value="10.0" unit="mm" />
+    </limitset>
+  </limits>
+
+  <regions>
+    <region name="BeampipeRegion"/>
+    <region name="VertexRegion"/>
+    <region name="ForwardRegion"/>
+  </regions>
+
+  <display>
+    <vis name="VXDVis"           alpha="0.1" r="0.1"   g=".5"      b=".5"    showDaughters="true"  visible="true"/>
+    <vis name="VXDLayerVis"      alpha="1.0" r="0.1"   g=".5"      b=".5"    showDaughters="true"  visible="true"/>
+    <vis name="VXDSupportVis"    alpha="1.0" r="0.0"   g="1.0"     b="0.0"   showDaughters="true"  visible="true"/>
+    <vis name="FTDVis"           alpha="1.0" r="0.5"   g="0.87"    b="0.11"  showDaughters="true"  visible="true"/>
+    <vis name="FTDSupportVis"    alpha="1.0" r="0.3"   g="0.3"     b="1.0"   showDaughters="true"  visible="true"/>
+    <vis name="FTDSensitiveVis"  alpha="1.0" r="0.3"   g="0.5"     b="1.0"   showDaughters="true"  visible="true"/>
+    <vis name="DCVis"            alpha="1.0" r="0.96"  g="0.64"    b="0.90"  showDaughters="true"  visible="true"/>
+    <vis name="DCLayerVis"       alpha="1.0" r="0.96"  g="0.64"    b="0.90"  showDaughters="false" visible="true"/>
+    <vis name="TPCVis"           alpha="1.0" r="0.96"  g="0.64"    b="0.90"  showDaughters="true"  visible="true"/>
+    <vis name="TPCMotherVis"     alpha="1.0" r="0.96"  g="0.64"    b="0.90"  showDaughters="true"  visible="true"/>
+    <vis name="TPCGasVis"        alpha="1.0" r="0.96"  g="0.64"    b="0.90"  showDaughters="true"  visible="false"/>
+    <vis name="TPCCathodeVis"    alpha="1.0" r="0.6"   g="1.0"     b="0.80"  showDaughters="true"  visible="true"/>
+    <vis name="TPCCathodeGripVis" alpha="1." r="0.7"   g="0.7"     b="0.70"  showDaughters="true"  visible="true"/>
+    <vis name="TPCShellVis"      alpha="1.0" r="0.5"   g="0.5"     b="0.5"   showDaughters="true"  visible="true"/>
+    <vis name="SITVis"           alpha="0.0" r="0.54"  g="0.59"    b="0.93"  showDaughters="true"  visible="false"/>
+    <vis name="SITSupportVis"    alpha="1.0" r="0.0"   g="0.0"     b="1.0"   showDaughters="false" visible="true"/>
+    <vis name="SITSensitiveVis"  alpha="1.0" r="0.67"  g="0.99"    b="0.78"  showDaughters="false" visible="true"/>
+    <vis name="SETVis"           alpha="0.0" r="0.8"   g="0.8"     b="0.4"   showDaughters="true"  visible="false"/>
+    <vis name="SETSupportVis"    alpha="1.0" r="0.5"   g="0.3"     b="1.0"   showDaughters="true"  visible="true"/>
+    <vis name="SETSensitiveVis"  alpha="1.0" r="0.0"   g="0.60"    b="1.0"   showDaughters="true"  visible="true"/>
+    <vis name="ECALVis"          alpha="1.0" r="0.2"   g="0.6"     b="0"     showDaughters="true"  visible="true"/>
+    <vis name="HCALVis"          alpha="1.0" r="0.95"  g="0.78"    b="0.69"  showDaughters="true"  visible="true"/>
+    <vis name="SOLVis"           alpha="1.0" r="0.0"   g="0.0"     b="0.8"   showDaughters="true"  visible="true"/>
+    <vis name="YOKEVis"          alpha="1.0" r="0.64"  g="0.75"    b="0.99"  showDaughters="true" visible="true"/>
+    <vis name="LCALVis"          alpha="1.0" r="0.25"  g="0.88"    b="0.81"  showDaughters="true"  visible="true"/>
+    <vis name="SupportVis"       alpha="1.0" r="0.2"   g="0.2"     b="0.2"   showDaughters="true"  visible="true"/>
+    <vis name="ShellVis"         alpha="1.0" r="1.0"   g="1.0"     b="0.8"   showDaughters="false" visible="true"/>
+
+    <vis name="WhiteVis"         alpha="0.0" r=".96" g=".96"  b=".96"   showDaughters="true"  visible="true"/>
+    <vis name="LightGrayVis"     alpha="0.0" r=".75" g=".75"  b=".75"   showDaughters="true"  visible="true"/>
+    <vis name="Invisible"        alpha="0.0" r="0.0" g="0.0"  b="0.0"   showDaughters="false" visible="false"/>
+    <vis name="SeeThrough"       alpha="0.0" r="0.0" g="0.0"  b="0.0"   showDaughters="true"  visible="false"/>
+    <vis name="RedVis"           alpha="1.0" r="1.0" g="0.0"  b="0.0"   showDaughters="true"  visible="true"/>
+    <vis name="GreenVis"         alpha="1.0" r="0.0" g="1.0"  b="0.0"   showDaughters="true"  visible="true"/>
+    <vis name="BlueVis"          alpha="1.0" r="0.0" g="0.0"  b="1.0"   showDaughters="true"  visible="true"/>
+    <vis name="CyanVis"          alpha="1.0" r="0.0" g="1.0"  b="1.0"   showDaughters="true"  visible="true"/>
+    <vis name="MagentaVis"       alpha="1.0" r="1.0" g="0.0"  b="1.0"   showDaughters="true"  visible="true"/>
+    <vis name="VioletVis"        alpha="1.0" r=".83" g=".55"  b=".89"   showDaughters="true" visible="true"/>
+    <vis name="BlueVioletVis"    alpha="1.0" r=".55" g=".36"  b="1.0"   showDaughters="true"  visible="true"/>
+    <vis name="OrangeVis"        alpha="1.0" r="1.0" g="0.6"  b="0.0"   showDaughters="true"  visible="true"/>
+    <vis name="YellowVis"        alpha="1.0" r="1.0" g="1.0"  b="0.0"   showDaughters="true"  visible="true"/>
+    <vis name="BlackVis"         alpha="1.0" r="0.0" g="0.0"  b="0.0"   showDaughters="true"  visible="true"/>
+    <vis name="GrayVis"          alpha="1.0" r="0.5" g="0.5"  b="0.5"   showDaughters="true"  visible="true"/>
+  </display>
+
+</lccdd>
diff --git a/Detector/DetCRD/compact/TDR_o1_v02/TDR_o1_v02-onlyTracker.xml b/Detector/DetCRD/compact/TDR_o1_v02/TDR_o1_v02-onlyTracker.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f6d1d6e4fe13f717095826afe58288e858d60f97
--- /dev/null
+++ b/Detector/DetCRD/compact/TDR_o1_v02/TDR_o1_v02-onlyTracker.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema"
+       xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+  <info name="TDR_o1_v01"
+        title="CepC reference detctor for TDR"
+        author=""
+        url="http://cepc.ihep.ac.cn"
+        status="developing"
+        version="v01">
+    <comment>CepC reference detector simulation models used for TDR </comment>
+  </info>
+  
+  <includes>
+    <gdmlFile  ref="${DD4hepINSTALL}/DDDetectors/compact/elements.xml"/>
+    <gdmlFile  ref="../CRD_common_v02/materials.xml"/>
+  </includes>
+  
+  <define>
+    <constant name="world_size" value="10*m"/>
+    <constant name="world_x" value="world_size"/>
+    <constant name="world_y" value="world_size"/>
+    <constant name="world_z" value="world_size"/>
+
+    <include ref="${DD4hepINSTALL}/DDDetectors/compact/detector_types.xml"/>
+  </define>
+
+  <include ref="./TDR_Dimensions_v01_02.xml"/>
+
+  <!--old version, should be check/-->
+  <include ref="../CRD_common_v01/Beampipe_v01_02.xml"/>
+  <!--preliminary vertex and tracker, to update/-->
+  <include ref="../CRD_common_v02/VXD_StaggeredLadder_v02_01.xml"/>
+  <include ref="../CRD_common_v02/FTD_SkewRing_v01_04.xml"/>
+  <include ref="../CRD_common_v01/SIT_SimplePixel_v01_02.xml"/>
+  <include ref="../CRD_common_v01/TPC_Simple_v10_02.xml"/>
+  <include ref="../CRD_common_v01/SET_SimplePixel_v01_01.xml"/>
+  
+  <fields>
+    <field name="InnerSolenoid" type="solenoid"
+           inner_field="Field_nominal_value"
+           outer_field="0"
+           zmax="SolenoidCoil_half_length"
+           inner_radius="SolenoidCoil_center_radius"
+           outer_radius="Solenoid_outer_radius">
+    </field>
+    <field name="OuterSolenoid" type="solenoid"
+           inner_field="0"
+           outer_field="Field_outer_nominal_value"
+           zmax="SolenoidCoil_half_length"
+           inner_radius="Solenoid_outer_radius"
+           outer_radius="Yoke_barrel_inner_radius">
+    </field>
+  </fields>
+
+</lccdd>
diff --git a/Detector/DetCRD/compact/TDR_o1_v02/TDR_o1_v02.xml b/Detector/DetCRD/compact/TDR_o1_v02/TDR_o1_v02.xml
new file mode 100644
index 0000000000000000000000000000000000000000..75ad6b107ae80bfe767a27a5a8620028a313520a
--- /dev/null
+++ b/Detector/DetCRD/compact/TDR_o1_v02/TDR_o1_v02.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema"
+       xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+  <info name="TDR_o1_v02"
+        title="CepC reference detctor for TDR"
+        author=""
+        url="http://cepc.ihep.ac.cn"
+        status="developing"
+        version="v01">
+    <comment>CepC reference detector simulation models used for TDR </comment>
+  </info>
+  
+  <includes>
+    <gdmlFile  ref="${DD4hepINSTALL}/DDDetectors/compact/elements.xml"/>
+    <gdmlFile  ref="../CRD_common_v02/materials.xml"/>
+  </includes>
+  
+  <define>
+    <constant name="world_size" value="10*m"/>
+    <constant name="world_x" value="world_size"/>
+    <constant name="world_y" value="world_size"/>
+    <constant name="world_z" value="world_size"/>
+
+    <include ref="${DD4hepINSTALL}/DDDetectors/compact/detector_types.xml"/>
+  </define>
+
+  <include ref="./TDR_Dimensions_v01_02.xml"/>
+
+  <!--old version, should be check/-->
+  <include ref="../CRD_common_v01/Beampipe_v01_02.xml"/>
+  <!--preliminary vertex and tracker, to update/-->
+  <include ref="../CRD_common_v02/VXD_StaggeredLadder_v02_01.xml"/>
+  <include ref="../CRD_common_v02/FTD_SkewRing_v01_04.xml"/>
+  <include ref="../CRD_common_v01/SIT_SimplePixel_v01_02.xml"/>
+  <include ref="../CRD_common_v01/TPC_Simple_v10_02.xml"/>
+  <include ref="../CRD_common_v01/SET_SimplePixel_v01_01.xml"/>
+  
+  <!--TODO: Ecal and Hcal/-->
+
+  <!--preliminary Magnet, to update/-->
+  <include ref="../CRD_common_v02/Coil_Simple_v01_02.xml"/>
+  <!--preliminary Muon, to update/-->
+  <include ref="../CRD_common_v02/Yoke_Polyhedra_Barrel_v01_01.xml"/>
+  <include ref="../CRD_common_v02/Yoke_Polyhedra_Endcaps_v01_01.xml"/>
+
+  <fields>
+    <field name="InnerSolenoid" type="solenoid"
+           inner_field="Field_nominal_value"
+           outer_field="0"
+           zmax="SolenoidCoil_half_length"
+           inner_radius="SolenoidCoil_center_radius"
+           outer_radius="Solenoid_outer_radius">
+    </field>
+    <field name="OuterSolenoid" type="solenoid"
+           inner_field="0"
+           outer_field="Field_outer_nominal_value"
+           zmax="SolenoidCoil_half_length"
+           inner_radius="Solenoid_outer_radius"
+           outer_radius="Yoke_barrel_inner_radius">
+    </field>
+  </fields>
+
+</lccdd>
diff --git a/Detector/DetCRD/compact/TDR_o2_v01/TDR_Dimensions_v02_01.xml b/Detector/DetCRD/compact/TDR_o2_v01/TDR_Dimensions_v02_01.xml
new file mode 100644
index 0000000000000000000000000000000000000000..368a017e7eb7cf2f2af43f3edc4c0fe6ac251cdf
--- /dev/null
+++ b/Detector/DetCRD/compact/TDR_o2_v01/TDR_Dimensions_v02_01.xml
@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema"
+       xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+
+  <info name="CRDDimensions"
+       title="master file with includes and world dimension"
+       author=""
+       url="no"
+       status="development"
+       version="1.0">
+    <comment>
+      undeterminded parameters
+    </comment>
+  </info>
+
+  <define>
+    <constant name="CrossingAngle" value="0.033*rad"/>  
+
+    <constant name="Global_endcap_costheta" value="0.99"/>
+
+    <constant name="GlobalTrackerReadoutID_DCH" type="string" value="system:8,chamber:1,layer:7,phi:16"/>
+    <constant name="GlobalTrackerReadoutID" type="string" value="system:5,side:-2,layer:9,module:8,sensor:8,barrelside:-2"/>
+
+    <constant name="Field_nominal_value" value="3*tesla"/>
+    <constant name="Field_outer_nominal_value" value="-1.3*tesla"/>
+
+    <constant name="env_safety" value="0.1*mm"/>
+
+    <constant name="DetID_NOTUSED"      value="  0"/>
+    <constant name="DetID_VXD"          value="  1"/>
+    <constant name="DetID_SIT"          value="  2"/>
+    <constant name="DetID_FTD"          value="  3"/>
+    <constant name="DetID_TPC"          value="  4"/>
+    <constant name="DetID_SET"          value="  5"/>
+    <constant name="DetID_ETD"          value="  6"/>
+    
+    <constant name="DetID_ECAL"         value=" 20"/>
+    <constant name="DetID_ECAL_PLUG"    value=" 21"/>
+    <constant name="DetID_HCAL"         value=" 22"/>
+    <constant name="DetID_HCAL_RING"    value=" 23"/>
+    <constant name="DetID_LCAL"         value=" 24"/>
+    <constant name="DetID_BCAL"         value=" 25"/>
+    <constant name="DetID_LHCAL"        value=" 26"/>
+    <constant name="DetID_YOKE"         value=" 27"/>
+    <constant name="DetID_COIL"         value=" 28"/>
+    <constant name="DetID_ECAL_ENDCAP"  value=" 29"/>
+    <constant name="DetID_HCAL_ENDCAP"  value=" 30"/>
+    <constant name="DetID_YOKE_ENDCAP"  value=" 31"/>
+    
+    <constant name="DetID_bwd"       value="-1"/>
+    <constant name="DetID_barrel"    value=" 0"/>
+    <constant name="DetID_fwd"       value="+1"/>
+
+    <!-- FIXME:need to check/-->
+    <constant name="BeamPipe_Be_inner_thickness"   value="0.2*mm"/>
+    <constant name="BeamPipe_Cooling_thickness"    value="0.3*mm"/>
+    <constant name="BeamPipe_Be_outer_thickness"   value="0.15*mm"/>
+    <constant name="BeamPipe_Be_total_thickness"   value="BeamPipe_Be_inner_thickness+BeamPipe_Cooling_thickness+BeamPipe_Be_outer_thickness"/>
+    <constant name="BeamPipe_Al_thickness"         value="BeamPipe_Be_total_thickness"/>
+    <constant name="BeamPipe_Cu_thickness"         value="4.0*mm"/>
+
+    <constant name="BeamPipe_CentralBe_zmax"       value="85*mm"/>
+    <constant name="BeamPipe_CentralAl_zmax"       value="180*mm"/>
+    <constant name="BeamPipe_ExpandAl_zmax"        value="655*mm"/>
+    <constant name="BeamPipe_Linker_zmin"          value="700*mm"/>
+    <constant name="BeamPipe_Linker_zmax"          value="780*mm"/>
+    <constant name="BeamPipe_Waist_zmax"           value="805*mm"/>
+    <constant name="BeamPipe_Crotch_zmax"          value="855*mm"/>
+    <constant name="BeamPipe_FirstSeparated_zmax"  value="1110*mm"/>
+    <constant name="BeamPipe_Mask_zmin"            value="1210*mm"/>
+    <constant name="BeamPipe_Mask_zmax"            value="1230*mm"/>
+    <constant name="BeamPipe_SecondSeparated_zmax" value="2200*mm"/>
+    <constant name="BeamPipe_end_z"                value="7050*mm"/>
+
+    <constant name="BeamPipe_Central_inner_radius"  value="10*mm"/>
+    <constant name="BeamPipe_Fork_inner_radius"     value="10*mm"/>
+    <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_FrontLinker_rmax"      value="BeamPipe_FirstExpand_width/2+BeamPipe_Al_thickness"/>
+    <constant name="BeamPipe_ForwardRegion_rmax"    value="BeamPipe_SecondExpand_width/2+BeamPipe_Cu_thickness"/>
+
+    <constant name="Vertex_inner_radius" value="BeamPipe_Central_inner_radius+BeamPipe_Be_total_thickness"/>
+    <constant name="Vertex_outer_radius" value="70*mm"/>
+    <constant name="Vertex_half_length"  value="430*mm"/>
+
+    <constant name="BeamPipe_VertexRegion_rmax"     value="BeamPipe_Central_inner_radius+BeamPipe_Al_thickness
+	   +(BeamPipe_FirstExpand_width/2-BeamPipe_Central_inner_radius)/(BeamPipe_ExpandAl_zmax-BeamPipe_CentralAl_zmax)*(Vertex_half_length-BeamPipe_CentralAl_zmax)"/>
+    <constant name="Vertex_Side_rmin"    value="BeamPipe_VertexRegion_rmax"/>
+
+    <constant name="DC_inner_radius" value="600*mm"/>
+    <constant name="DC_outer_radius" value="1800*mm"/>
+    <constant name="DC_half_length"  value="2905*mm"/>
+    <constant name="OuterTracker_half_length" value="DC_half_length"/>
+
+    <constant name="SIT1_inner_radius"   value="150*mm"/>
+    <constant name="SIT2_inner_radius"   value="360*mm"/>
+    <constant name="SIT3_inner_radius"   value="580*mm"/>
+    <constant name="SIT1_half_length"    value="690*mm"/>
+    <constant name="SIT2_half_length"    value="1334*mm"/>
+    <constant name="SIT3_half_length"    value="1978*mm"/>
+
+    <constant name="SET_inner_radius"    value="1815*mm"/>
+
+    <constant name="SiTracker_endcap_barrel_zgap" value="5*mm"/>
+    <constant name="SiTracker_endcap_barrel_rgap" value="10*mm"/>
+    <constant name="SiTracker_endcap_gas_zgap"    value="70*mm"/>
+    <constant name="SiTracker_endcap_gas_rgap"    value="50*mm"/>
+    <constant name="SiTracker_endcap_z1" value="SIT1_half_length+SiTracker_endcap_barrel_zgap"/>
+    <constant name="SiTracker_endcap_z2" value="SIT2_half_length+SiTracker_endcap_barrel_zgap"/>
+    <constant name="SiTracker_endcap_z3" value="SIT3_half_length+SiTracker_endcap_barrel_zgap"/>
+    <constant name="SiTracker_endcap_z4" value="DC_half_length+SiTracker_endcap_gas_zgap"/>
+    <constant name="SiTracker_endcap_outer_radius1" value="SIT1_inner_radius+SiTracker_endcap_barrel_rgap"/>
+    <constant name="SiTracker_endcap_outer_radius2" value="SIT2_inner_radius+SiTracker_endcap_barrel_rgap"/>
+    <constant name="SiTracker_endcap_outer_radius3" value="DC_inner_radius-SiTracker_endcap_gas_rgap"/>
+    <constant name="SiTracker_endcap_outer_radius4" value="DC_outer_radius+SiTracker_endcap_barrel_rgap*2"/>
+
+    <constant name="Ecal_barrel_inner_radius" value="1900*mm"/>
+    <constant name="Ecal_barrel_thickness"    value="300*mm"/>
+    <constant name="Ecal_barrel_outer_radius" value="Ecal_barrel_inner_radius+Ecal_barrel_thickness"/>
+    <constant name="Ecal_barrel_half_length"  value="2950*mm"/>
+    <constant name="Ecal_barrel_symmetry"     value="32"/>
+    <constant name="Ecal_DC_gap"              value="Ecal_barrel_inner_radius-DC_outer_radius"/>
+
+    <constant name="Ecal_endcap_inner_radius" value="350*mm"/>
+    <constant name="Ecal_endcap_outer_radius" value="Ecal_barrel_outer_radius"/>
+    <constant name="Ecal_endcap_zmin"         value="3050*mm"/>
+    <constant name="Ecal_endcap_zmax"         value="3350*mm"/>
+    <constant name="Ecal_endcap_symmetry"     value="32"/>
+
+    <constant name="Hcal_barrel_inner_radius" value="2215*mm"/>
+    <constant name="Hcal_barrel_outer_radius" value="3685*mm"/>
+    <constant name="Hcal_barrel_half_length"  value="3340*mm"/>
+    <constant name="Hcal_barrel_symmetry"    value="16"/>
+    
+    <constant name="Hcal_endcap_inner_radius" value="400*mm"/>
+    <constant name="Hcal_endcap_outer_radius" value="Hcal_barrel_outer_radius"/>
+    <constant name="Hcal_endcap_zmin" value="3360*mm"/>
+    <constant name="Hcal_endcap_zmax" value="4830*mm"/>
+    <constant name="Hcal_endcap_symmetry" value="16"/>
+
+    <constant name="Solenoid_inner_radius" value="3775*mm"/>
+    <constant name="Solenoid_outer_radius" value="4575*mm"/>
+    <constant name="Solenoid_half_length" value="4780*mm"/>
+    <constant name="SolenoidCoil_half_length" value="4167*mm"/>
+    <constant name="SolenoidCoil_radius" value="3905*mm"/>
+    <constant name="SolenoidCoil_center_radius" value="(Solenoid_inner_radius+Solenoid_outer_radius)/2"/>
+        
+    <constant name="Yoke_barrel_inner_radius" value="4590*mm"/>
+    <constant name="Yoke_barrel_outer_radius" value="6340*mm"/>
+    <constant name="Yoke_barrel_half_length" value="4880*mm"/>
+    <constant name="Yoke_barrel_symmetry" value="12"/>
+    
+    <constant name="Yoke_endcap_inner_radius" value="400*mm"/>
+    <constant name="Yoke_endcap_outer_radius" value="Yoke_barrel_outer_radius"/>
+    <constant name="Yoke_endcap_zmin" value="5130*mm"/>
+    <constant name="Yoke_endcap_zmax" value="6880*mm"/>
+    <constant name="Yoke_endcap_outer_symmetry" value="Yoke_barrel_symmetry"/>
+    <constant name="Yoke_endcap_inner_symmetry" value="0"/>
+
+    <!-- FIXME:need to check/--> 
+    <constant name="LumiCal_inner_radius" value="35.0*mm"/>
+    <constant name="LumiCal_outer_radius" value="100.0*mm"/>
+    <constant name="LumiCal_zmax" value="805*mm" />
+    <constant name="LumiCal_zmin" value="700*mm"/>
+    <constant name="LumiCal_thickness" value="(LumiCal_zmax-LumiCal_zmin)/2.0"/>
+        
+    <constant name="tracker_region_zmax" value="Ecal_endcap_zmin"/>
+    <constant name="tracker_region_rmax" value="Ecal_barrel_inner_radius"/>
+
+  </define>
+  
+  <limits>
+    <limitset name="cal_limits">
+      <limit name="step_length_max" particles="*" value="5.0" unit="mm" />
+    </limitset>
+    <limitset name="dc_limits">
+      <limit name="step_length_max" particles="*" value="10.0" unit="mm" />
+    </limitset>
+    <limitset name="tracker_limits">
+      <limit name="step_length_max" particles="*" value="5.0" unit="mm" />
+    </limitset>
+    <limitset name="detail_limits">
+      <limit name="step_length_max" particles="*" value="1.0" unit="mm" />
+    </limitset>
+    <limitset name="support_limits">
+      <limit name="step_length_max" particles="*" value="10.0" unit="mm" />
+    </limitset>
+  </limits>
+
+  <regions>
+    <region name="BeampipeRegion"/>
+    <region name="VertexRegion"/>
+    <region name="ForwardRegion"/>
+  </regions>
+
+  <display>
+    <vis name="VXDVis"           alpha="0.1" r="0.1"   g=".5"      b=".5"    showDaughters="true"  visible="true"/>
+    <vis name="VXDLayerVis"      alpha="1.0" r="0.1"   g=".5"      b=".5"    showDaughters="true"  visible="true"/>
+    <vis name="VXDSupportVis"    alpha="1.0" r="0.0"   g="1.0"     b="0.0"   showDaughters="true"  visible="true"/>
+    <vis name="FTDVis"           alpha="1.0" r="0.5"   g="0.87"    b="0.11"  showDaughters="true"  visible="true"/>
+    <vis name="FTDSupportVis"    alpha="1.0" r="0.3"   g="0.3"     b="1.0"   showDaughters="true"  visible="true"/>
+    <vis name="FTDSensitiveVis"  alpha="1.0" r="0.3"   g="0.5"     b="1.0"   showDaughters="true"  visible="true"/>
+    <vis name="DCVis"            alpha="1.0" r="0.96"  g="0.64"    b="0.90"  showDaughters="true"  visible="true"/>
+    <vis name="DCLayerVis"       alpha="1.0" r="0.96"  g="0.64"    b="0.90"  showDaughters="false" visible="true"/>
+    <vis name="TPCVis"           alpha="1.0" r="0.96"  g="0.64"    b="0.90"  showDaughters="true"  visible="true"/>
+    <vis name="TPCMotherVis"     alpha="1.0" r="0.96"  g="0.64"    b="0.90"  showDaughters="true"  visible="true"/>
+    <vis name="TPCGasVis"        alpha="1.0" r="0.96"  g="0.64"    b="0.90"  showDaughters="true"  visible="false"/>
+    <vis name="TPCCathodeVis"    alpha="1.0" r="0.6"   g="1.0"     b="0.80"  showDaughters="true"  visible="true"/>
+    <vis name="TPCCathodeGripVis" alpha="1." r="0.7"   g="0.7"     b="0.70"  showDaughters="true"  visible="true"/>
+    <vis name="TPCShellVis"      alpha="1.0" r="0.5"   g="0.5"     b="0.5"   showDaughters="true"  visible="true"/>
+    <vis name="SITVis"           alpha="0.0" r="0.54"  g="0.59"    b="0.93"  showDaughters="true"  visible="false"/>
+    <vis name="SITSupportVis"    alpha="1.0" r="0.0"   g="0.0"     b="1.0"   showDaughters="false" visible="true"/>
+    <vis name="SITSensitiveVis"  alpha="1.0" r="0.67"  g="0.99"    b="0.78"  showDaughters="false" visible="true"/>
+    <vis name="SETVis"           alpha="0.0" r="0.8"   g="0.8"     b="0.4"   showDaughters="true"  visible="false"/>
+    <vis name="SETSupportVis"    alpha="1.0" r="0.5"   g="0.3"     b="1.0"   showDaughters="true"  visible="true"/>
+    <vis name="SETSensitiveVis"  alpha="1.0" r="0.0"   g="0.60"    b="1.0"   showDaughters="true"  visible="true"/>
+    <vis name="ECALVis"          alpha="1.0" r="0.2"   g="0.6"     b="0"     showDaughters="true"  visible="true"/>
+    <vis name="HCALVis"          alpha="1.0" r="0.95"  g="0.78"    b="0.69"  showDaughters="true"  visible="true"/>
+    <vis name="SOLVis"           alpha="1.0" r="0.0"   g="0.0"     b="0.8"   showDaughters="true"  visible="true"/>
+    <vis name="YOKEVis"          alpha="1.0" r="0.64"  g="0.75"    b="0.99"  showDaughters="true" visible="true"/>
+    <vis name="LCALVis"          alpha="1.0" r="0.25"  g="0.88"    b="0.81"  showDaughters="true"  visible="true"/>
+    <vis name="SupportVis"       alpha="1.0" r="0.2"   g="0.2"     b="0.2"   showDaughters="true"  visible="true"/>
+    <vis name="ShellVis"         alpha="1.0" r="1.0"   g="1.0"     b="0.8"   showDaughters="false" visible="true"/>
+
+    <vis name="WhiteVis"         alpha="0.0" r=".96" g=".96"  b=".96"   showDaughters="true"  visible="true"/>
+    <vis name="LightGrayVis"     alpha="0.0" r=".75" g=".75"  b=".75"   showDaughters="true"  visible="true"/>
+    <vis name="Invisible"        alpha="0.0" r="0.0" g="0.0"  b="0.0"   showDaughters="false" visible="false"/>
+    <vis name="SeeThrough"       alpha="0.0" r="0.0" g="0.0"  b="0.0"   showDaughters="true"  visible="false"/>
+    <vis name="RedVis"           alpha="1.0" r="1.0" g="0.0"  b="0.0"   showDaughters="true"  visible="true"/>
+    <vis name="GreenVis"         alpha="1.0" r="0.0" g="1.0"  b="0.0"   showDaughters="true"  visible="true"/>
+    <vis name="BlueVis"          alpha="1.0" r="0.0" g="0.0"  b="1.0"   showDaughters="true"  visible="true"/>
+    <vis name="CyanVis"          alpha="1.0" r="0.0" g="1.0"  b="1.0"   showDaughters="true"  visible="true"/>
+    <vis name="MagentaVis"       alpha="1.0" r="1.0" g="0.0"  b="1.0"   showDaughters="true"  visible="true"/>
+    <vis name="VioletVis"        alpha="1.0" r=".83" g=".55"  b=".89"   showDaughters="true" visible="true"/>
+    <vis name="BlueVioletVis"    alpha="1.0" r=".55" g=".36"  b="1.0"   showDaughters="true"  visible="true"/>
+    <vis name="OrangeVis"        alpha="1.0" r="1.0" g="0.6"  b="0.0"   showDaughters="true"  visible="true"/>
+    <vis name="YellowVis"        alpha="1.0" r="1.0" g="1.0"  b="0.0"   showDaughters="true"  visible="true"/>
+    <vis name="BlackVis"         alpha="1.0" r="0.0" g="0.0"  b="0.0"   showDaughters="true"  visible="true"/>
+    <vis name="GrayVis"          alpha="1.0" r="0.5" g="0.5"  b="0.5"   showDaughters="true"  visible="true"/>
+  </display>
+
+</lccdd>
diff --git a/Detector/DetCRD/compact/TDR_o2_v01/TDR_o2_v01-onlyTracker.xml b/Detector/DetCRD/compact/TDR_o2_v01/TDR_o2_v01-onlyTracker.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f707fdc8abb63015987c9dbe1fb75f06d5dc1154
--- /dev/null
+++ b/Detector/DetCRD/compact/TDR_o2_v01/TDR_o2_v01-onlyTracker.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema"
+       xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+  <info name="TDR_o2_v01"
+        title="CepC reference detctor for TDR"
+        author=""
+        url="http://cepc.ihep.ac.cn"
+        status="developing"
+        version="v01">
+    <comment>CepC reference detector simulation models used for TDR </comment>
+  </info>
+  
+  <includes>
+    <gdmlFile  ref="${DD4hepINSTALL}/DDDetectors/compact/elements.xml"/>
+    <gdmlFile  ref="../CRD_common_v02/materials.xml"/>
+  </includes>
+  
+  <define>
+    <constant name="world_size" value="10*m"/>
+    <constant name="world_x" value="world_size"/>
+    <constant name="world_y" value="world_size"/>
+    <constant name="world_z" value="world_size"/>
+
+    <include ref="${DD4hepINSTALL}/DDDetectors/compact/detector_types.xml"/>
+  </define>
+
+  <include ref="./TDR_Dimensions_v02_01.xml"/>
+
+  <!--old version, should be check/-->
+  <include ref="../CRD_common_v01/Beampipe_v01_02.xml"/>
+  <!--preliminary vertex and tracker, to update/-->
+  <include ref="../CRD_common_v02/VXD_StaggeredLadder_v02_01.xml"/>
+  <include ref="../CRD_common_v01/FTD_SkewRing_v01_02.xml"/>
+  <include ref="../CRD_common_v01/SIT_SimplePixel_v01_02.xml"/>
+  <!--TODO: DC/-->
+
+  <include ref="../CRD_common_v01/SET_SimplePixel_v01_01.xml"/>
+  
+  <fields>
+    <field name="InnerSolenoid" type="solenoid"
+           inner_field="Field_nominal_value"
+           outer_field="0"
+           zmax="SolenoidCoil_half_length"
+           inner_radius="SolenoidCoil_center_radius"
+           outer_radius="Solenoid_outer_radius">
+    </field>
+    <field name="OuterSolenoid" type="solenoid"
+           inner_field="0"
+           outer_field="Field_outer_nominal_value"
+           zmax="SolenoidCoil_half_length"
+           inner_radius="Solenoid_outer_radius"
+           outer_radius="Yoke_barrel_inner_radius">
+    </field>
+  </fields>
+
+</lccdd>
diff --git a/Detector/DetCRD/compact/TDR_o2_v01/TDR_o2_v01.xml b/Detector/DetCRD/compact/TDR_o2_v01/TDR_o2_v01.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6a0fbaf8255b45d1a483457234cfb8361b8a2225
--- /dev/null
+++ b/Detector/DetCRD/compact/TDR_o2_v01/TDR_o2_v01.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema"
+       xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+  <info name="TDR_o2_v01"
+        title="CepC reference detctor for TDR"
+        author=""
+        url="http://cepc.ihep.ac.cn"
+        status="developing"
+        version="v01">
+    <comment>CepC reference detector simulation models used for TDR </comment>
+  </info>
+  
+  <includes>
+    <gdmlFile  ref="${DD4hepINSTALL}/DDDetectors/compact/elements.xml"/>
+    <gdmlFile  ref="../CRD_common_v02/materials.xml"/>
+  </includes>
+  
+  <define>
+    <constant name="world_size" value="10*m"/>
+    <constant name="world_x" value="world_size"/>
+    <constant name="world_y" value="world_size"/>
+    <constant name="world_z" value="world_size"/>
+
+    <include ref="${DD4hepINSTALL}/DDDetectors/compact/detector_types.xml"/>
+  </define>
+
+  <include ref="./TDR_Dimensions_v02_01.xml"/>
+
+  <!--old version, should be check/-->
+  <include ref="../CRD_common_v01/Beampipe_v01_02.xml"/>
+  <!--preliminary vertex and tracker, to update/-->
+  <include ref="../CRD_common_v02/VXD_StaggeredLadder_v02_01.xml"/>
+  <include ref="../CRD_common_v01/FTD_SkewRing_v01_02.xml"/>
+  <include ref="../CRD_common_v01/SIT_SimplePixel_v01_02.xml"/>
+  <!--TODO: DC/-->
+
+  <include ref="../CRD_common_v01/SET_SimplePixel_v01_01.xml"/>
+  <!--TODO: Ecal and Hcal/-->
+
+  <!--preliminary Magnet, to update/-->
+  <include ref="../CRD_common_v02/Coil_Simple_v01_02.xml"/>
+  <!--preliminary Muon, to update/-->
+  <include ref="../CRD_common_v02/Yoke_Polyhedra_Barrel_v01_01.xml"/>
+  <include ref="../CRD_common_v02/Yoke_Polyhedra_Endcaps_v01_01.xml"/>
+  
+  <fields>
+    <field name="InnerSolenoid" type="solenoid"
+           inner_field="Field_nominal_value"
+           outer_field="0"
+           zmax="SolenoidCoil_half_length"
+           inner_radius="SolenoidCoil_center_radius"
+           outer_radius="Solenoid_outer_radius">
+    </field>
+    <field name="OuterSolenoid" type="solenoid"
+           inner_field="0"
+           outer_field="Field_outer_nominal_value"
+           zmax="SolenoidCoil_half_length"
+           inner_radius="Solenoid_outer_radius"
+           outer_radius="Yoke_barrel_inner_radius">
+    </field>
+  </fields>
+
+</lccdd>
diff --git a/Detector/DetCRD/compact/TDR_o2_v02/TDR_Dimensions_v02_02.xml b/Detector/DetCRD/compact/TDR_o2_v02/TDR_Dimensions_v02_02.xml
new file mode 100644
index 0000000000000000000000000000000000000000..94a77c811dbd80c947dcd5cbd22de6521827d318
--- /dev/null
+++ b/Detector/DetCRD/compact/TDR_o2_v02/TDR_Dimensions_v02_02.xml
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema"
+       xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+
+  <info name="CRDDimensions"
+       title="master file with includes and world dimension"
+       author=""
+       url="no"
+       status="development"
+       version="1.0">
+    <comment>
+      undeterminded parameters
+    </comment>
+  </info>
+
+  <define>
+    <constant name="CrossingAngle" value="0.033*rad"/>  
+
+    <constant name="Global_endcap_costheta" value="0.99"/>
+
+    <constant name="GlobalTrackerReadoutID_DCH" type="string" value="system:8,chamber:1,layer:7,phi:16"/>
+    <constant name="GlobalTrackerReadoutID" type="string" value="system:5,side:-2,layer:9,module:8,sensor:8,barrelside:-2"/>
+
+    <constant name="Field_nominal_value" value="3*tesla"/>
+    <constant name="Field_outer_nominal_value" value="-1.3*tesla"/>
+
+    <constant name="env_safety" value="0.1*mm"/>
+
+    <constant name="DetID_NOTUSED"      value="  0"/>
+    <constant name="DetID_VXD"          value="  1"/>
+    <constant name="DetID_SIT"          value="  2"/>
+    <constant name="DetID_FTD"          value="  3"/>
+    <constant name="DetID_TPC"          value="  4"/>
+    <constant name="DetID_SET"          value="  5"/>
+    <constant name="DetID_ETD"          value="  6"/>
+    
+    <constant name="DetID_ECAL"         value=" 20"/>
+    <constant name="DetID_ECAL_PLUG"    value=" 21"/>
+    <constant name="DetID_HCAL"         value=" 22"/>
+    <constant name="DetID_HCAL_RING"    value=" 23"/>
+    <constant name="DetID_LCAL"         value=" 24"/>
+    <constant name="DetID_BCAL"         value=" 25"/>
+    <constant name="DetID_LHCAL"        value=" 26"/>
+    <constant name="DetID_YOKE"         value=" 27"/>
+    <constant name="DetID_COIL"         value=" 28"/>
+    <constant name="DetID_ECAL_ENDCAP"  value=" 29"/>
+    <constant name="DetID_HCAL_ENDCAP"  value=" 30"/>
+    <constant name="DetID_YOKE_ENDCAP"  value=" 31"/>
+    
+    <constant name="DetID_bwd"       value="-1"/>
+    <constant name="DetID_barrel"    value=" 0"/>
+    <constant name="DetID_fwd"       value="+1"/>
+
+    <!-- FIXME:need to check/-->
+    <constant name="BeamPipe_Be_inner_thickness"   value="0.2*mm"/>
+    <constant name="BeamPipe_Cooling_thickness"    value="0.3*mm"/>
+    <constant name="BeamPipe_Be_outer_thickness"   value="0.15*mm"/>
+    <constant name="BeamPipe_Be_total_thickness"   value="BeamPipe_Be_inner_thickness+BeamPipe_Cooling_thickness+BeamPipe_Be_outer_thickness"/>
+    <constant name="BeamPipe_Al_thickness"         value="BeamPipe_Be_total_thickness"/>
+    <constant name="BeamPipe_Cu_thickness"         value="4.0*mm"/>
+
+    <constant name="BeamPipe_CentralBe_zmax"       value="85*mm"/>
+    <constant name="BeamPipe_CentralAl_zmax"       value="180*mm"/>
+    <constant name="BeamPipe_ExpandAl_zmax"        value="655*mm"/>
+    <constant name="BeamPipe_Linker_zmin"          value="700*mm"/>
+    <constant name="BeamPipe_Linker_zmax"          value="780*mm"/>
+    <constant name="BeamPipe_Waist_zmax"           value="805*mm"/>
+    <constant name="BeamPipe_Crotch_zmax"          value="855*mm"/>
+    <constant name="BeamPipe_FirstSeparated_zmax"  value="1110*mm"/>
+    <constant name="BeamPipe_Mask_zmin"            value="1210*mm"/>
+    <constant name="BeamPipe_Mask_zmax"            value="1230*mm"/>
+    <constant name="BeamPipe_SecondSeparated_zmax" value="2200*mm"/>
+    <constant name="BeamPipe_end_z"                value="7050*mm"/>
+
+    <constant name="BeamPipe_Central_inner_radius"  value="10*mm"/>
+    <constant name="BeamPipe_Fork_inner_radius"     value="10*mm"/>
+    <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_FrontLinker_rmax"      value="BeamPipe_FirstExpand_width/2+BeamPipe_Al_thickness"/>
+    <constant name="BeamPipe_ForwardRegion_rmax"    value="BeamPipe_SecondExpand_width/2+BeamPipe_Cu_thickness"/>
+
+    <constant name="Vertex_inner_radius" value="BeamPipe_Central_inner_radius+BeamPipe_Be_total_thickness"/>
+    <constant name="Vertex_outer_radius" value="70*mm"/>
+    <constant name="Vertex_half_length"  value="430*mm"/>
+
+    <constant name="BeamPipe_VertexRegion_rmax"     value="BeamPipe_Central_inner_radius+BeamPipe_Al_thickness
+	   +(BeamPipe_FirstExpand_width/2-BeamPipe_Central_inner_radius)/(BeamPipe_ExpandAl_zmax-BeamPipe_CentralAl_zmax)*(Vertex_half_length-BeamPipe_CentralAl_zmax)"/>
+    <constant name="Vertex_Side_rmin"    value="BeamPipe_VertexRegion_rmax"/>
+
+    <constant name="TPC_inner_radius" value="600*mm"/>
+    <constant name="TPC_outer_radius" value="1800*mm"/>
+    <constant name="TPC_half_length"  value="2905*mm"/>
+    <constant name="OuterTracker_half_length" value="TPC_half_length"/>
+
+    <constant name="SIT1_inner_radius"   value="100*mm"/>
+    <constant name="SIT2_inner_radius"   value="300*mm"/>
+    <constant name="SIT3_inner_radius"   value="580*mm"/>
+    <constant name="SIT1_half_length"    value="368*mm"/>
+    <constant name="SIT2_half_length"    value="920*mm"/>
+    <constant name="SIT3_half_length"    value="2024*mm"/>
+
+    <constant name="SET_inner_radius"    value="1815*mm"/>
+
+    <constant name="SiTracker_endcap_barrel_zgap" value="5*mm"/>
+    <constant name="SiTracker_endcap_barrel_rgap" value="10*mm"/>
+    <constant name="SiTracker_endcap_gas_zgap"    value="70*mm"/>
+    <constant name="SiTracker_endcap_gas_rgap"    value="50*mm"/>
+    <constant name="SiTracker_endcap_z1" value="220*mm"/>
+    <constant name="SiTracker_endcap_z2" value="SIT1_half_length+SiTracker_endcap_barrel_zgap"/>
+    <constant name="SiTracker_endcap_z3" value="(SIT1_half_length+SIT2_half_length)/2"/>
+    <constant name="SiTracker_endcap_z4" value="SIT2_half_length+SiTracker_endcap_barrel_zgap"/>
+    <constant name="SiTracker_endcap_z5" value="1380*mm"/>
+    <constant name="SiTracker_endcap_z6" value="SIT3_half_length+SiTracker_endcap_barrel_zgap"/>
+    <constant name="SiTracker_endcap_z7" value="TPC_half_length+SiTracker_endcap_gas_zgap"/>
+    <constant name="SiTracker_endcap_outer_radius1" value="SIT1_inner_radius-SiTracker_endcap_barrel_rgap"/>
+    <constant name="SiTracker_endcap_outer_radius2" value="SIT1_inner_radius+SiTracker_endcap_barrel_rgap"/>
+    <constant name="SiTracker_endcap_outer_radius3" value="SIT2_inner_radius-SiTracker_endcap_barrel_rgap"/>
+    <constant name="SiTracker_endcap_outer_radius4" value="SIT2_inner_radius+SiTracker_endcap_barrel_rgap"/>
+    <constant name="SiTracker_endcap_outer_radius5" value="SIT3_inner_radius-SiTracker_endcap_barrel_rgap"/>
+    <constant name="SiTracker_endcap_outer_radius6" value="TPC_inner_radius-SiTracker_endcap_gas_rgap"/>
+    <constant name="SiTracker_endcap_outer_radius7" value="TPC_outer_radius+SiTracker_endcap_barrel_rgap*2"/>
+
+    <constant name="Ecal_barrel_inner_radius" value="1900*mm"/>
+    <constant name="Ecal_barrel_thickness"    value="300*mm"/>
+    <constant name="Ecal_barrel_outer_radius" value="Ecal_barrel_inner_radius+Ecal_barrel_thickness"/>
+    <constant name="Ecal_barrel_half_length"  value="2950*mm"/>
+    <constant name="Ecal_barrel_symmetry"     value="32"/>
+    <constant name="Ecal_Tpc_gap"             value="Ecal_barrel_inner_radius-TPC_outer_radius"/>
+
+    <constant name="Ecal_endcap_inner_radius" value="350*mm"/>
+    <constant name="Ecal_endcap_outer_radius" value="Ecal_barrel_outer_radius"/>
+    <constant name="Ecal_endcap_zmin"         value="3050*mm"/>
+    <constant name="Ecal_endcap_zmax"         value="3350*mm"/>
+    <constant name="Ecal_endcap_symmetry"     value="32"/>
+
+    <constant name="Hcal_barrel_inner_radius" value="2215*mm"/>
+    <constant name="Hcal_barrel_outer_radius" value="3685*mm"/>
+    <constant name="Hcal_barrel_half_length"  value="3340*mm"/>
+    <constant name="Hcal_barrel_symmetry"    value="16"/>
+    
+    <constant name="Hcal_endcap_inner_radius" value="400*mm"/>
+    <constant name="Hcal_endcap_outer_radius" value="Hcal_barrel_outer_radius"/>
+    <constant name="Hcal_endcap_zmin" value="3360*mm"/>
+    <constant name="Hcal_endcap_zmax" value="4830*mm"/>
+    <constant name="Hcal_endcap_symmetry" value="16"/>
+
+    <constant name="Solenoid_inner_radius" value="3775*mm"/>
+    <constant name="Solenoid_outer_radius" value="4575*mm"/>
+    <constant name="Solenoid_half_length" value="4780*mm"/>
+    <constant name="SolenoidCoil_half_length" value="4167*mm"/>
+    <constant name="SolenoidCoil_radius" value="3905*mm"/>
+    <constant name="SolenoidCoil_center_radius" value="(Solenoid_inner_radius+Solenoid_outer_radius)/2"/>
+        
+    <constant name="Yoke_barrel_inner_radius" value="4590*mm"/>
+    <constant name="Yoke_barrel_outer_radius" value="6340*mm"/>
+    <constant name="Yoke_barrel_half_length" value="4880*mm"/>
+    <constant name="Yoke_barrel_symmetry" value="12"/>
+    
+    <constant name="Yoke_endcap_inner_radius" value="400*mm"/>
+    <constant name="Yoke_endcap_outer_radius" value="Yoke_barrel_outer_radius"/>
+    <constant name="Yoke_endcap_zmin" value="5130*mm"/>
+    <constant name="Yoke_endcap_zmax" value="6880*mm"/>
+    <constant name="Yoke_endcap_outer_symmetry" value="Yoke_barrel_symmetry"/>
+    <constant name="Yoke_endcap_inner_symmetry" value="0"/>
+
+    <!-- FIXME:need to check/--> 
+    <constant name="LumiCal_inner_radius" value="35.0*mm"/>
+    <constant name="LumiCal_outer_radius" value="100.0*mm"/>
+    <constant name="LumiCal_zmax" value="805*mm" />
+    <constant name="LumiCal_zmin" value="700*mm"/>
+    <constant name="LumiCal_thickness" value="(LumiCal_zmax-LumiCal_zmin)/2.0"/>
+        
+    <constant name="tracker_region_zmax" value="Ecal_endcap_zmin"/>
+    <constant name="tracker_region_rmax" value="Ecal_barrel_inner_radius"/>
+
+  </define>
+  
+  <limits>
+    <limitset name="cal_limits">
+      <limit name="step_length_max" particles="*" value="5.0" unit="mm" />
+    </limitset>
+    <limitset name="dc_limits">
+      <limit name="step_length_max" particles="*" value="10.0" unit="mm" />
+    </limitset>
+    <limitset name="tracker_limits">
+      <limit name="step_length_max" particles="*" value="5.0" unit="mm" />
+    </limitset>
+    <limitset name="detail_limits">
+      <limit name="step_length_max" particles="*" value="1.0" unit="mm" />
+    </limitset>
+    <limitset name="support_limits">
+      <limit name="step_length_max" particles="*" value="10.0" unit="mm" />
+    </limitset>
+  </limits>
+
+  <regions>
+    <region name="BeampipeRegion"/>
+    <region name="VertexRegion"/>
+    <region name="ForwardRegion"/>
+  </regions>
+
+  <display>
+    <vis name="VXDVis"           alpha="0.1" r="0.1"   g=".5"      b=".5"    showDaughters="true"  visible="true"/>
+    <vis name="VXDLayerVis"      alpha="1.0" r="0.1"   g=".5"      b=".5"    showDaughters="true"  visible="true"/>
+    <vis name="VXDSupportVis"    alpha="1.0" r="0.0"   g="1.0"     b="0.0"   showDaughters="true"  visible="true"/>
+    <vis name="FTDVis"           alpha="1.0" r="0.5"   g="0.87"    b="0.11"  showDaughters="true"  visible="true"/>
+    <vis name="FTDSupportVis"    alpha="1.0" r="0.3"   g="0.3"     b="1.0"   showDaughters="true"  visible="true"/>
+    <vis name="FTDSensitiveVis"  alpha="1.0" r="0.3"   g="0.5"     b="1.0"   showDaughters="true"  visible="true"/>
+    <vis name="DCVis"            alpha="1.0" r="0.96"  g="0.64"    b="0.90"  showDaughters="true"  visible="true"/>
+    <vis name="DCLayerVis"       alpha="1.0" r="0.96"  g="0.64"    b="0.90"  showDaughters="false" visible="true"/>
+    <vis name="TPCVis"           alpha="1.0" r="0.96"  g="0.64"    b="0.90"  showDaughters="true"  visible="true"/>
+    <vis name="TPCMotherVis"     alpha="1.0" r="0.96"  g="0.64"    b="0.90"  showDaughters="true"  visible="true"/>
+    <vis name="TPCGasVis"        alpha="1.0" r="0.96"  g="0.64"    b="0.90"  showDaughters="true"  visible="false"/>
+    <vis name="TPCCathodeVis"    alpha="1.0" r="0.6"   g="1.0"     b="0.80"  showDaughters="true"  visible="true"/>
+    <vis name="TPCCathodeGripVis" alpha="1." r="0.7"   g="0.7"     b="0.70"  showDaughters="true"  visible="true"/>
+    <vis name="TPCShellVis"      alpha="1.0" r="0.5"   g="0.5"     b="0.5"   showDaughters="true"  visible="true"/>
+    <vis name="SITVis"           alpha="0.0" r="0.54"  g="0.59"    b="0.93"  showDaughters="true"  visible="false"/>
+    <vis name="SITSupportVis"    alpha="1.0" r="0.0"   g="0.0"     b="1.0"   showDaughters="false" visible="true"/>
+    <vis name="SITSensitiveVis"  alpha="1.0" r="0.67"  g="0.99"    b="0.78"  showDaughters="false" visible="true"/>
+    <vis name="SETVis"           alpha="0.0" r="0.8"   g="0.8"     b="0.4"   showDaughters="true"  visible="false"/>
+    <vis name="SETSupportVis"    alpha="1.0" r="0.5"   g="0.3"     b="1.0"   showDaughters="true"  visible="true"/>
+    <vis name="SETSensitiveVis"  alpha="1.0" r="0.0"   g="0.60"    b="1.0"   showDaughters="true"  visible="true"/>
+    <vis name="ECALVis"          alpha="1.0" r="0.2"   g="0.6"     b="0"     showDaughters="true"  visible="true"/>
+    <vis name="HCALVis"          alpha="1.0" r="0.95"  g="0.78"    b="0.69"  showDaughters="true"  visible="true"/>
+    <vis name="SOLVis"           alpha="1.0" r="0.0"   g="0.0"     b="0.8"   showDaughters="true"  visible="true"/>
+    <vis name="YOKEVis"          alpha="1.0" r="0.64"  g="0.75"    b="0.99"  showDaughters="true" visible="true"/>
+    <vis name="LCALVis"          alpha="1.0" r="0.25"  g="0.88"    b="0.81"  showDaughters="true"  visible="true"/>
+    <vis name="SupportVis"       alpha="1.0" r="0.2"   g="0.2"     b="0.2"   showDaughters="true"  visible="true"/>
+    <vis name="ShellVis"         alpha="1.0" r="1.0"   g="1.0"     b="0.8"   showDaughters="false" visible="true"/>
+
+    <vis name="WhiteVis"         alpha="0.0" r=".96" g=".96"  b=".96"   showDaughters="true"  visible="true"/>
+    <vis name="LightGrayVis"     alpha="0.0" r=".75" g=".75"  b=".75"   showDaughters="true"  visible="true"/>
+    <vis name="Invisible"        alpha="0.0" r="0.0" g="0.0"  b="0.0"   showDaughters="false" visible="false"/>
+    <vis name="SeeThrough"       alpha="0.0" r="0.0" g="0.0"  b="0.0"   showDaughters="true"  visible="false"/>
+    <vis name="RedVis"           alpha="1.0" r="1.0" g="0.0"  b="0.0"   showDaughters="true"  visible="true"/>
+    <vis name="GreenVis"         alpha="1.0" r="0.0" g="1.0"  b="0.0"   showDaughters="true"  visible="true"/>
+    <vis name="BlueVis"          alpha="1.0" r="0.0" g="0.0"  b="1.0"   showDaughters="true"  visible="true"/>
+    <vis name="CyanVis"          alpha="1.0" r="0.0" g="1.0"  b="1.0"   showDaughters="true"  visible="true"/>
+    <vis name="MagentaVis"       alpha="1.0" r="1.0" g="0.0"  b="1.0"   showDaughters="true"  visible="true"/>
+    <vis name="VioletVis"        alpha="1.0" r=".83" g=".55"  b=".89"   showDaughters="true" visible="true"/>
+    <vis name="BlueVioletVis"    alpha="1.0" r=".55" g=".36"  b="1.0"   showDaughters="true"  visible="true"/>
+    <vis name="OrangeVis"        alpha="1.0" r="1.0" g="0.6"  b="0.0"   showDaughters="true"  visible="true"/>
+    <vis name="YellowVis"        alpha="1.0" r="1.0" g="1.0"  b="0.0"   showDaughters="true"  visible="true"/>
+    <vis name="BlackVis"         alpha="1.0" r="0.0" g="0.0"  b="0.0"   showDaughters="true"  visible="true"/>
+    <vis name="GrayVis"          alpha="1.0" r="0.5" g="0.5"  b="0.5"   showDaughters="true"  visible="true"/>
+  </display>
+
+</lccdd>
diff --git a/Detector/DetCRD/compact/TDR_o2_v02/TDR_o2_v02-onlyTracker.xml b/Detector/DetCRD/compact/TDR_o2_v02/TDR_o2_v02-onlyTracker.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7cea5e8903567285a370113d907ebb65ca95a659
--- /dev/null
+++ b/Detector/DetCRD/compact/TDR_o2_v02/TDR_o2_v02-onlyTracker.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema"
+       xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+  <info name="TDR_o2_v02"
+        title="CepC reference detctor for TDR"
+        author=""
+        url="http://cepc.ihep.ac.cn"
+        status="developing"
+        version="v01">
+    <comment>CepC reference detector simulation models used for TDR </comment>
+  </info>
+  
+  <includes>
+    <gdmlFile  ref="${DD4hepINSTALL}/DDDetectors/compact/elements.xml"/>
+    <gdmlFile  ref="../CRD_common_v02/materials.xml"/>
+  </includes>
+  
+  <define>
+    <constant name="world_size" value="10*m"/>
+    <constant name="world_x" value="world_size"/>
+    <constant name="world_y" value="world_size"/>
+    <constant name="world_z" value="world_size"/>
+
+    <include ref="${DD4hepINSTALL}/DDDetectors/compact/detector_types.xml"/>
+  </define>
+
+  <include ref="./TDR_Dimensions_v02_02.xml"/>
+
+  <!--old version, should be check/-->
+  <include ref="../CRD_common_v01/Beampipe_v01_02.xml"/>
+  <!--preliminary vertex and tracker, to update/-->
+  <include ref="../CRD_common_v02/VXD_StaggeredLadder_v02_02.xml"/>
+  <include ref="../CRD_common_v02/FTD_SkewRing_v01_04.xml"/>
+  <include ref="../CRD_common_v01/SIT_SimplePixel_v01_02.xml"/>
+  <!--TODO: DC/-->
+
+  <include ref="../CRD_common_v01/SET_SimplePixel_v01_01.xml"/>
+  
+  <fields>
+    <field name="InnerSolenoid" type="solenoid"
+           inner_field="Field_nominal_value"
+           outer_field="0"
+           zmax="SolenoidCoil_half_length"
+           inner_radius="SolenoidCoil_center_radius"
+           outer_radius="Solenoid_outer_radius">
+    </field>
+    <field name="OuterSolenoid" type="solenoid"
+           inner_field="0"
+           outer_field="Field_outer_nominal_value"
+           zmax="SolenoidCoil_half_length"
+           inner_radius="Solenoid_outer_radius"
+           outer_radius="Yoke_barrel_inner_radius">
+    </field>
+  </fields>
+
+</lccdd>
diff --git a/Detector/DetCRD/compact/TDR_o2_v02/TDR_o2_v02.xml b/Detector/DetCRD/compact/TDR_o2_v02/TDR_o2_v02.xml
new file mode 100644
index 0000000000000000000000000000000000000000..494b42feb7846155534c54eb0935fc6e539f62e4
--- /dev/null
+++ b/Detector/DetCRD/compact/TDR_o2_v02/TDR_o2_v02.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema"
+       xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+  <info name="TDR_o2_v02"
+        title="CepC reference detctor for TDR"
+        author=""
+        url="http://cepc.ihep.ac.cn"
+        status="developing"
+        version="v01">
+    <comment>CepC reference detector simulation models used for TDR </comment>
+  </info>
+  
+  <includes>
+    <gdmlFile  ref="${DD4hepINSTALL}/DDDetectors/compact/elements.xml"/>
+    <gdmlFile  ref="../CRD_common_v02/materials.xml"/>
+  </includes>
+  
+  <define>
+    <constant name="world_size" value="10*m"/>
+    <constant name="world_x" value="world_size"/>
+    <constant name="world_y" value="world_size"/>
+    <constant name="world_z" value="world_size"/>
+
+    <include ref="${DD4hepINSTALL}/DDDetectors/compact/detector_types.xml"/>
+  </define>
+
+  <include ref="./TDR_Dimensions_v02_02.xml"/>
+
+  <!--old version, should be check/-->
+  <include ref="../CRD_common_v01/Beampipe_v01_02.xml"/>
+  <!--preliminary vertex and tracker, to update/-->
+  <include ref="../CRD_common_v02/VXD_StaggeredLadder_v02_02.xml"/>
+  <include ref="../CRD_common_v02/FTD_SkewRing_v01_04.xml"/>
+  <include ref="../CRD_common_v01/SIT_SimplePixel_v01_02.xml"/>
+  <!--TODO: DC/-->
+
+  <include ref="../CRD_common_v01/SET_SimplePixel_v01_01.xml"/>
+  <!--TODO: Ecal and Hcal/-->
+
+  <!--preliminary Magnet, to update/-->
+  <include ref="../CRD_common_v02/Coil_Simple_v01_02.xml"/>
+  <!--preliminary Muon, to update/-->
+  <include ref="../CRD_common_v02/Yoke_Polyhedra_Barrel_v01_01.xml"/>
+  <include ref="../CRD_common_v02/Yoke_Polyhedra_Endcaps_v01_01.xml"/>
+  
+  <fields>
+    <field name="InnerSolenoid" type="solenoid"
+           inner_field="Field_nominal_value"
+           outer_field="0"
+           zmax="SolenoidCoil_half_length"
+           inner_radius="SolenoidCoil_center_radius"
+           outer_radius="Solenoid_outer_radius">
+    </field>
+    <field name="OuterSolenoid" type="solenoid"
+           inner_field="0"
+           outer_field="Field_outer_nominal_value"
+           zmax="SolenoidCoil_half_length"
+           inner_radius="Solenoid_outer_radius"
+           outer_radius="Yoke_barrel_inner_radius">
+    </field>
+  </fields>
+
+</lccdd>