diff --git a/athena.xml b/athena.xml
index 453be3db789b81799e86eed31b3a7ecf2f16199e..cf0b2ccb074406ef3bb21b499cc28c0999fb0d41 100644
--- a/athena.xml
+++ b/athena.xml
@@ -2,13 +2,28 @@
        xmlns:xs="http://www.w3.org/2001/XMLSchema"
        xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
 
+       <debug>
+         <type name="surface"       value="1"/>
+         <type name="readout"       value="1"/>
+         <type name="segmentation"  value="1"/>
+         <type name="limits"        value="1"/>
+         <type name="region"        value="1"/>
+         <type name="includes"      value="1"/>
+       </debug>
+
+  <documentation><![CDATA[
+  # Athena Detector 
+  - https://eicweb.phy.anl.gov/EIC/detectors/athena.git 
+  - https://eicweb.phy.anl.gov/EIC/detectors/ip6.git
+  ]]></documentation>
+
   <!-- Some information about detector  -->
   <info name="Athena Detector" title="Athena Detector"
         author="Athena Collaboration"
 	url="https://eicweb.phy.anl.gov/EIC/detectors/athena.git"
 	status="development"
 	version="v1 2021-03-16">
-    <comment>Athena Detector
+    <comment> Athena Detector
     - https://eicweb.phy.anl.gov/EIC/detectors/athena.git
     - https://eicweb.phy.anl.gov/EIC/detectors/ip6.git
     </comment>
@@ -19,150 +34,13 @@
     <include ref="compact/definitions.xml" />
   </define>
 
-  <properties>
-    <matrix name="RINDEX__Vacuum" coldim="2" values="
-      1.0*eV 1.0
-      5.1*eV 1.0
-      "/>
-    <matrix name="RINDEX__Air" coldim="2" values="
-      1.0*eV 1.00029
-      5.1*eV 1.00029
-      "/>
-    <matrix name="RINDEX__Quartz" coldim="2" values="
-      1.0*eV 1.46
-      5.1*eV 1.46
-      "/>
-    <matrix name="RINDEX__N2" coldim="2" values="
-      1.0*eV 1.00033
-      4.0*eV 1.00033
-      5.1*eV 1.00033
-      "/>
-    <matrix name="RINDEX__Pyrex" coldim="2" values="
-      1.0*eV 1.5
-      4.0*eV 1.5
-      5.1*eV 1.5
-      "/>
-    <matrix name="ABSLENGTH__Pyrex" coldim="2" values="
-      1.0*eV 10.0*cm
-      4.0*eV 10.0*cm
-      5.1*eV 10.0*cm
-      "/>
-    <matrix name= "REFLECTIVITY_mirror" coldim="2" values="
-      1.0*eV  0.9
-      4.0*eV  0.9
-      5.1*eV  0.9
-      "/>
-    <matrix name="RINDEX__Aerogel" coldim="2" values="
-      1.0*eV 1.030
-      4.0*eV 1.030
-      5.1*eV 1.030
-      "/>
-    <matrix name="ABSLENGTH__Aerogel" coldim="2" values="
-      1.0*eV 4.0*cm
-      4.0*eV 4.0*cm
-      5.1*eV 4.0*cm
-      "/>
-    <matrix name="RINDEX__Acrylic" coldim="2" values="
-      1240*eV/1100  1.49
-      1240*eV/600   1.49
-      1240*eV/400   1.49
-      "/>
-  </properties>
 
   <includes>
     <gdmlFile ref="compact/elements.xml"/>
     <gdmlFile ref="compact/materials.xml"/>
+    <file     ref="compact/optical_materials.xml"/>
   </includes>
 
-  <materials>
-    <material name="AirOptical">
-      <D type="density" unit="g/cm3" value="0.0012"/>
-      <fraction n="0.754" ref="N"/>
-      <fraction n="0.234" ref="O"/>
-      <fraction n="0.012" ref="Ar"/>
-      <property name="RINDEX" ref="RINDEX__Air"/>
-      <property name="ABSLENGTH"               coldim="2" values="1*eV  200*m  5*eV  200*m"/>
-    </material>
-    <material name="N2cherenkov">
-      <D type="density" value="0.00125" unit="g/cm3"/>
-      <composite n="1" ref="N"/>
-      <property name="RINDEX"  ref="RINDEX__N2"/>
-    </material>
-    <material name="PyrexGlassOptical">
-      <D type="density" value="2.23" unit="g/cm3"/>
-      <fraction n="0.806" ref="SiliconOxide"/>
-      <fraction n="0.130" ref="BoronOxide"/>
-      <fraction n="0.040" ref="SodiumOxide"/>
-      <fraction n="0.023" ref="AluminumOxide"/>
-      <property name="RINDEX" ref="RINDEX__Pyrex"/>
-      <property name="ABSLENGTH" ref="ABSLENGTH__Pyrex"/>
-    </material>
-    <material name="AerogelOptical">
-      <D value="0.2" unit="g / cm3"/>
-      <fraction n="0.625" ref="SiliconOxide"/>
-      <fraction n="0.374" ref="SiliconOxide"/>
-      <fraction n="0.1"   ref="C"/>
-      <property name="RINDEX" ref="RINDEX__Aerogel"/>
-      <property name="ABSLENGTH" ref="ABSLENGTH__Aerogel"/>
-    </material>
-    <material name="AcrylicOptical">
-      <D type="density" value="1.18" unit="g/cm3"/>
-      <composite n="5" ref="C"/>
-      <composite n="2" ref="O"/>
-      <composite n="8" ref="H"/>
-      <property name="RINDEX" ref="RINDEX__Acrylic"/>
-    </material>
-  </materials>
-
-  <surfaces>
-    <comment> For the values of "finish", model and type, see TGeoOpticalSurface.h !
-    </comment>
-
-    <opticalsurface finish="polished" model="glisur" name="MirrorOpticalSurface" type="dielectric_metal" value="0">
-      <property name="REFLECTIVITY" ref="REFLECTIVITY_mirror"/>
-      <property name="RINDEX"       coldim="2" values="1.034*eV  1.5   4.136*eV  1.5"/>
-      <!--<property name="EFFICIENCY"   ref="EFFICIENCY0x8b77240"/>-->
-    </opticalsurface>
-
-    <!--
-    <opticalsurface name="mirror2" finish="polished" model="glisur" type="dielectric_dielectric">
-      <property name="REFLECTIVITY"            coldim="2" values="1.034*eV  0.8   4.136*eV  0.9"/>
-      <property name="EFFICIENCY"              coldim="2" values="2.034*eV  0.8   4.136*eV  1.0"/>
-      <property name="RINDEX"                  coldim="2" values="1.034*eV  1.5   4.136*eV  1.5"/>
-    </opticalsurface>
-    -->
-
-    <opticalsurface finish="polished" model="unified" name="MRICH_MirrorOpticalSurface" type="dielectric_metal" value="0">
-    </opticalsurface>
-    <opticalsurface finish="polished" model="unified" name="MRICH_LensOpticalSurface" type="dielectric_dielectric" value="0">
-      <property name="REFLECTIVITY"            coldim="2" values="1240*eV/1100  0.08   1240*eV/400  0.08"/>
-      <!--
-      <property name="RINDEX"                  coldim="2" values="2.034*eV  1.56  4.136*eV  1.56"/>
-      <property name="SPECULARLOBECONSTANT"    coldim="2" values="2.034*eV  0.3   4.136*eV  0.3 "/>
-      <property name="SPECULARSPIKECONSTANT"   coldim="2" values="2.034*eV  0.2   4.136*eV  0.2 "/>
-      <property name="BACKSCATTERCONSTANT"     coldim="2" values="2.034*eV  0.2   4.136*eV  0.2 "/>
-        -->
-    </opticalsurface>
-
-    <opticalsurface finish="polished" model="unified" name="MRICH_PhotoSensorOpticalSurface" type="dielectric_dielectric" value="0">
-      <!--
-      <property name="RINDEX"                  coldim="2" values="2.034*eV  1.35  4.136*eV  1.40"/>
-      <property name="SPECULARLOBECONSTANT"    coldim="2" values="2.034*eV  0.3   4.136*eV  0.3 "/>
-      <property name="SPECULARSPIKECONSTANT"   coldim="2" values="2.034*eV  0.2   4.136*eV  0.2 "/>
-      <property name="BACKSCATTERCONSTANT"     coldim="2" values="2.034*eV  0.2   4.136*eV  0.2 "/>
-      -->
-    </opticalsurface>
-
-    <opticalsurface finish="polished" model="unified" name="MRICH_AerogelOpticalSurface" type="dielectric_dielectric" value="0">
-      <!--
-      <property name="RINDEX"                  coldim="2" values="2.034*eV  1.010  4.136*eV  1.010"/>
-      <property name="SPECULARLOBECONSTANT"    coldim="2" values="2.034*eV  0.3   4.136*eV  0.3 "/>
-      <property name="SPECULARSPIKECONSTANT"   coldim="2" values="2.034*eV  0.2   4.136*eV  0.2 "/>
-      <property name="BACKSCATTERCONSTANT"     coldim="2" values="2.034*eV  0.2   4.136*eV  0.2 "/>
-      -->
-    </opticalsurface>
-
-  </surfaces>
   <limits>
     <limitset name="EICBeamlineLimits">
       <limit name="step_length_max" particles="*" value="1.0" unit="mm" />
diff --git a/compact/optical_materials.xml b/compact/optical_materials.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fec77a672343420030f6f54e3a071a12fb63ab4e
--- /dev/null
+++ b/compact/optical_materials.xml
@@ -0,0 +1,139 @@
+<lccdd>
+  <properties>
+    <matrix name="RINDEX__Vacuum" coldim="2" values="
+      1.0*eV 1.0
+      5.1*eV 1.0
+      "/>
+    <matrix name="RINDEX__Air" coldim="2" values="
+      1.0*eV 1.00029
+      5.1*eV 1.00029
+      "/>
+    <matrix name="RINDEX__Quartz" coldim="2" values="
+      1.0*eV 1.46
+      5.1*eV 1.46
+      "/>
+    <matrix name="RINDEX__N2" coldim="2" values="
+      1.0*eV 1.00033
+      4.0*eV 1.00033
+      5.1*eV 1.00033
+      "/>
+    <matrix name="RINDEX__Pyrex" coldim="2" values="
+      1.0*eV 1.5
+      4.0*eV 1.5
+      5.1*eV 1.5
+      "/>
+    <matrix name="ABSLENGTH__Pyrex" coldim="2" values="
+      1.0*eV 10.0*cm
+      4.0*eV 10.0*cm
+      5.1*eV 10.0*cm
+      "/>
+    <matrix name= "REFLECTIVITY_mirror" coldim="2" values="
+      1.0*eV  0.9
+      4.0*eV  0.9
+      5.1*eV  0.9
+      "/>
+    <matrix name="RINDEX__Aerogel" coldim="2" values="
+      1.0*eV 1.030
+      4.0*eV 1.030
+      5.1*eV 1.030
+      "/>
+    <matrix name="ABSLENGTH__Aerogel" coldim="2" values="
+      1.0*eV 4.0*cm
+      4.0*eV 4.0*cm
+      5.1*eV 4.0*cm
+      "/>
+    <matrix name="RINDEX__Acrylic" coldim="2" values="
+      1240*eV/1100  1.49
+      1240*eV/600   1.49
+      1240*eV/400   1.49
+      "/>
+  </properties>
+  <materials>
+    <material name="AirOptical">
+      <D type="density" unit="g/cm3" value="0.0012"/>
+      <fraction n="0.754" ref="N"/>
+      <fraction n="0.234" ref="O"/>
+      <fraction n="0.012" ref="Ar"/>
+      <property name="RINDEX" ref="RINDEX__Air"/>
+      <property name="ABSLENGTH"               coldim="2" values="1*eV  200*m  5*eV  200*m"/>
+    </material>
+    <material name="N2cherenkov">
+      <D type="density" value="0.00125" unit="g/cm3"/>
+      <composite n="1" ref="N"/>
+      <property name="RINDEX"  ref="RINDEX__N2"/>
+    </material>
+    <material name="PyrexGlassOptical">
+      <D type="density" value="2.23" unit="g/cm3"/>
+      <fraction n="0.806" ref="SiliconOxide"/>
+      <fraction n="0.130" ref="BoronOxide"/>
+      <fraction n="0.040" ref="SodiumOxide"/>
+      <fraction n="0.023" ref="AluminumOxide"/>
+      <property name="RINDEX" ref="RINDEX__Pyrex"/>
+      <property name="ABSLENGTH" ref="ABSLENGTH__Pyrex"/>
+    </material>
+    <material name="AerogelOptical">
+      <D value="0.2" unit="g / cm3"/>
+      <fraction n="0.625" ref="SiliconOxide"/>
+      <fraction n="0.374" ref="SiliconOxide"/>
+      <fraction n="0.1"   ref="C"/>
+      <property name="RINDEX" ref="RINDEX__Aerogel"/>
+      <property name="ABSLENGTH" ref="ABSLENGTH__Aerogel"/>
+    </material>
+    <material name="AcrylicOptical">
+      <D type="density" value="1.18" unit="g/cm3"/>
+      <composite n="5" ref="C"/>
+      <composite n="2" ref="O"/>
+      <composite n="8" ref="H"/>
+      <property name="RINDEX" ref="RINDEX__Acrylic"/>
+    </material>
+  </materials>
+  <surfaces>
+    <comment> For the values of "finish", model and type, see TGeoOpticalSurface.h !
+    </comment>
+
+    <opticalsurface finish="polished" model="glisur" name="MirrorOpticalSurface" type="dielectric_metal" value="0">
+      <property name="REFLECTIVITY" ref="REFLECTIVITY_mirror"/>
+      <property name="RINDEX"       coldim="2" values="1.034*eV  1.5   4.136*eV  1.5"/>
+      <!--<property name="EFFICIENCY"   ref="EFFICIENCY0x8b77240"/>-->
+    </opticalsurface>
+
+    <!--
+    <opticalsurface name="mirror2" finish="polished" model="glisur" type="dielectric_dielectric">
+      <property name="REFLECTIVITY"            coldim="2" values="1.034*eV  0.8   4.136*eV  0.9"/>
+      <property name="EFFICIENCY"              coldim="2" values="2.034*eV  0.8   4.136*eV  1.0"/>
+      <property name="RINDEX"                  coldim="2" values="1.034*eV  1.5   4.136*eV  1.5"/>
+    </opticalsurface>
+    -->
+
+    <opticalsurface finish="polished" model="unified" name="MRICH_MirrorOpticalSurface" type="dielectric_metal" value="0">
+    </opticalsurface>
+    <opticalsurface finish="polished" model="unified" name="MRICH_LensOpticalSurface" type="dielectric_dielectric" value="0">
+      <property name="REFLECTIVITY"            coldim="2" values="1240*eV/1100  0.08   1240*eV/400  0.08"/>
+      <!--
+      <property name="RINDEX"                  coldim="2" values="2.034*eV  1.56  4.136*eV  1.56"/>
+      <property name="SPECULARLOBECONSTANT"    coldim="2" values="2.034*eV  0.3   4.136*eV  0.3 "/>
+      <property name="SPECULARSPIKECONSTANT"   coldim="2" values="2.034*eV  0.2   4.136*eV  0.2 "/>
+      <property name="BACKSCATTERCONSTANT"     coldim="2" values="2.034*eV  0.2   4.136*eV  0.2 "/>
+      -->
+    </opticalsurface>
+
+    <opticalsurface finish="polished" model="unified" name="MRICH_PhotoSensorOpticalSurface" type="dielectric_dielectric" value="0">
+      <!--
+      <property name="RINDEX"                  coldim="2" values="2.034*eV  1.35  4.136*eV  1.40"/>
+      <property name="SPECULARLOBECONSTANT"    coldim="2" values="2.034*eV  0.3   4.136*eV  0.3 "/>
+      <property name="SPECULARSPIKECONSTANT"   coldim="2" values="2.034*eV  0.2   4.136*eV  0.2 "/>
+      <property name="BACKSCATTERCONSTANT"     coldim="2" values="2.034*eV  0.2   4.136*eV  0.2 "/>
+      -->
+    </opticalsurface>
+
+    <opticalsurface finish="polished" model="unified" name="MRICH_AerogelOpticalSurface" type="dielectric_dielectric" value="0">
+      <!--
+      <property name="RINDEX"                  coldim="2" values="2.034*eV  1.010  4.136*eV  1.010"/>
+      <property name="SPECULARLOBECONSTANT"    coldim="2" values="2.034*eV  0.3   4.136*eV  0.3 "/>
+      <property name="SPECULARSPIKECONSTANT"   coldim="2" values="2.034*eV  0.2   4.136*eV  0.2 "/>
+      <property name="BACKSCATTERCONSTANT"     coldim="2" values="2.034*eV  0.2   4.136*eV  0.2 "/>
+      -->
+    </opticalsurface>
+
+  </surfaces>
+</lccdd>