diff --git a/compact/gem_tracker_endcap.xml b/compact/gem_tracker_endcap.xml
index 029e11bd843761d8aaadbb2d62463dfd46c851b8..ea30963e75c1977ea9530f4698f4f83c9ca76049 100644
--- a/compact/gem_tracker_endcap.xml
+++ b/compact/gem_tracker_endcap.xml
@@ -20,12 +20,22 @@
     <constant name="GEMTrackerEndcapFoilX2"           value="2*GEMTrackerEndcapFoilY*tan(GEMTrackerEndcapFoilOpeningAngle/2.0) +  GEMTrackerEndcapFoilX1"/>
     <constant name="GEMTrackerEndcapFoil_rmax"        value="(GEMTrackerEndcapFoilY+GEMTrackerEndcapFoil_rmin)/(cos(GEMTrackerEndcapFoilOpeningAngle/2.0))"/>
 
+    <comment> 
+              Needs implimentation:
+	      Carbon fiber support ring and spokes
+              Initial preliminary details can be found here: https://www.dropbox.com/s/grt9p8feqlsh52f/GEM-RD-GEMWheel.pdf?dl=0
+              This design is still very much preliminary
 
       // Frame parameters accoring to Kondo's sbsCrossSection.pdf file),
-    <constant name="GEMTrackerEndcapFrame_thickness"     value="18.0 * mm"/>
+      //frame thickness is from 1*3mm (drift gap) + 5*2mm frames
+    </comment>
+
+    <constant name="GEMTrackerEndcapFrame_thickness"     value="13.0 * mm"/>
     <constant name="GEMTrackerEndcapFrameBotEdge_width"  value="10.0 * mm"/>
-    <constant name="GEMTrackerEndcapFrameTopEdge_width"  value="10.0 * mm"/>
+    <constant name="GEMTrackerEndcapFrameTopEdge_width"  value="15.0 * mm"/>
     <constant name="GEMTrackerEndcapFrameSideEdge_width" value=" 8.0 * mm"/>
+    <comment> Account for the fact that GEMs have holes, so they are not solid volumes </comment>
+    <constant name="GEMAreaFactor" value="0.80" />
     <comment>
       From https://github.com/eic/EicToyModel/blob/master/source/eicroot/GemGeoParData.cxx
 
@@ -90,25 +100,24 @@
           </trd>
         </frame>
         <comment> Going from HV side to readout side</comment>
-        <module_component thickness="0.127 * mm" material="Mylar"/>
-        <module_component thickness="50.0*um" material="Kapton" name="entrance_window"/>
-        <module_component thickness=" 3.0*mm" material="Ar10CO2" name="entrance region" />
-        <module_component thickness="50.0*um" material="Kapton"/>
-        <module_component thickness=" 3.0*um" material="Copper"/>
-        <module_component thickness=" 3.0*mm" material="Ar10CO2" name="drift region"/>
-        <module_component thickness="30.0*um" material="Kapton"  name="gem_foil"/>
-        <module_component thickness=" 3.0*um" material="Copper"  name="gem_foil_Cu"/>
-        <module_component thickness=" 2.0*mm" material="Ar10CO2" name="transfer region I"/>
-        <module_component thickness="30.0*um" material="Kapton"  name="gem_foil"/>
-        <module_component thickness=" 3.0*um" material="Copper"  name="gem_foil_Cu"/>
-        <module_component thickness=" 2.0*mm" material="Ar10CO2" name="transfer region II"/>
-        <module_component thickness="30.0*um" material="Kapton"  name="gem_foil"/>
-        <module_component thickness=" 3.0*um" material="Copper"  name="gem_foil_Cu"/>
-        <module_component thickness=" 2.0*mm" material="Ar10CO2" name="induction region"/>
-        <module_component thickness="30.0*um" material="Kapton"  name="readout"     sensitive="true"/>
-        <module_component thickness=" 3.0*um" material="Copper"  name="readout_Cu"/>
-        <module_component thickness="127.0*um" material="Mylar"/>
-        <module_component thickness="200.0*um" material="Epoxy" sensitive="true" vis="AnlProcess_Blue"/>
+	<module_component thickness="25.0*um" material="Mylar" name="entrance_window"/>
+	<module_component thickness=" 2.0*mm" material="Ar10CO2" name="entrance_region" />
+        <module_component thickness="50.0*um" material="Kapton" name="cathode_foil"/>
+	<module_component thickness=" 5.0*um" material="Copper" name="cathode_cu"/>
+        <module_component thickness=" 3.0*mm" material="Ar10CO2" sensitive="true" name="drift_region" vis="AnlProcess_Blue"/>
+        <module_component thickness="GEMAreaFactor*50.0*um" material="Kapton"  name="gem_foil_1"/>
+        <module_component thickness="GEMAreaFactor*10.0*um" material="Copper"  name="gem_foil_1_cu"/>
+        <module_component thickness=" 2.0*mm" material="Ar10CO2" name="transfer_region_I"/>
+        <module_component thickness="GEMAreaFactor*50.0*um" material="Kapton"  name="gem_foil_2"/>
+        <module_component thickness="GEMAreaFactor*10.0*um" material="Copper"  name="gem_foil_2_cu"/>
+        <module_component thickness=" 2.0*mm" material="Ar10CO2" name="transfer_region_II"/>
+        <module_component thickness="GEMAreaFactor*50.0*um" material="Kapton"  name="gem_foil_3"/>
+        <module_component thickness="GEMAreaFactor*10.0*um" material="Copper"  name="gem_foil_3_cu"/>
+        <module_component thickness=" 2.0*mm" material="Ar10CO2" name="induction_region"/>
+        <module_component thickness="50.0*um" material="Kapton"  name="readout_foil"/>
+	<module_component thickness=" 5.0*um" material="Copper"  name="readout_cu"/>
+	<module_component thickness=" 2.0*mm" material="Ar10CO2" name="exit_region"/>
+        <module_component thickness="25.0*um" material="Mylar" name="exit_window"/>
       </module>
       <module name="GEMSupportModule1" vis="AnlProcess_Blue">
         <trd x1="GEMTrackerEndcapFoilX1/2.0" x2="GEMTrackerEndcapFoilX2/2.0" z="GEMTrackerEndcapFoilY/2"/>
@@ -154,44 +163,62 @@
       reflect="true">
       <module name="GEMModule1" vis="AnlProcess_Blue">
         <trd x1="GEMTrackerEndcapFoilX1/2.0" x2="GEMTrackerEndcapFoilX2/2.0" z="GEMTrackerEndcapFoilY/2"/>
+        <frame material="G10" thickness="GEMTrackerEndcapFrame_thickness" vis="TrackerSupportVis">
+          <position x="0"  y="0" z="0" />
+          <trd x1="GEMTrackerEndcapFoilX1/2.0 - GEMTrackerEndcapFrameSideEdge_width/cos(GEMTrackerEndcapFoilOpeningAngle) 
+                                              + GEMTrackerEndcapFrameBotEdge_width*tan(GEMTrackerEndcapFoilOpeningAngle)"
+               x2="GEMTrackerEndcapFoilX2/2.0 - GEMTrackerEndcapFrameSideEdge_width/cos(GEMTrackerEndcapFoilOpeningAngle)
+                                              - GEMTrackerEndcapFrameTopEdge_width*tan(GEMTrackerEndcapFoilOpeningAngle)"
+            z="GEMTrackerEndcapFoilY/2    - (GEMTrackerEndcapFrameBotEdge_width +GEMTrackerEndcapFrameTopEdge_width)/2.0 ">
+            <position x="0" y="0" z="0" />
+          </trd>
+        </frame>
         <comment> Going from HV side to readout side</comment>
-        <module_component thickness="0.127 * mm" material="Mylar"/>
-        <module_component thickness="50.0*um" material="Kapton" name="entrance_window"/>
-        <module_component thickness=" 3.0*mm" material="Ar10CO2" name="entrance region" />
-        <module_component thickness="50.0*um" material="Kapton"/>
-        <module_component thickness=" 3.0*um" material="Copper"/>
-        <module_component thickness=" 3.0*mm" material="Ar10CO2" name="drift region"/>
-        <module_component thickness="30.0*um" material="Kapton"  name="gem_foil"/>
-        <module_component thickness=" 3.0*um" material="Copper"  name="gem_foil_Cu"/>
-        <module_component thickness=" 2.0*mm" material="Ar10CO2" name="transfer region I"/>
-        <module_component thickness="30.0*um" material="Kapton"  name="gem_foil"/>
-        <module_component thickness=" 3.0*um" material="Copper"  name="gem_foil_Cu"/>
-        <module_component thickness=" 2.0*mm" material="Ar10CO2" name="transfer region II"/>
-        <module_component thickness="30.0*um" material="Kapton"  name="gem_foil"/>
-        <module_component thickness=" 3.0*um" material="Copper"  name="gem_foil_Cu"/>
-        <module_component thickness=" 2.0*mm" material="Ar10CO2" name="induction region"/>
-        <module_component thickness="30.0*um" material="Kapton"  name="readout"     sensitive="true"/>
-        <module_component thickness=" 3.0*um" material="Copper"  name="readout_Cu"/>
-        <module_component thickness="127.0*um" material="Mylar"/>
-        <module_component thickness="200.0*um" material="Epoxy" sensitive="true" vis="AnlProcess_Blue"/>
+	<module_component thickness="25.0*um" material="Mylar" name="entrance_window"/>
+	<module_component thickness=" 2.0*mm" material="Ar10CO2" name="entrance_region" />
+        <module_component thickness="50.0*um" material="Kapton" name="cathode_foil"/>
+	<module_component thickness=" 5.0*um" material="Copper" name="cathode_cu"/>
+        <module_component thickness=" 3.0*mm" material="Ar10CO2" sensitive="true" name="drift_region" vis="AnlProcess_Blue"/>
+        <module_component thickness="GEMAreaFactor*50.0*um" material="Kapton"  name="gem_foil_1"/>
+        <module_component thickness="GEMAreaFactor*10.0*um" material="Copper"  name="gem_foil_1_cu"/>
+        <module_component thickness=" 2.0*mm" material="Ar10CO2" name="transfer_region_I"/>
+        <module_component thickness="GEMAreaFactor*50.0*um" material="Kapton"  name="gem_foil_2"/>
+        <module_component thickness="GEMAreaFactor*10.0*um" material="Copper"  name="gem_foil_2_cu"/>
+        <module_component thickness=" 2.0*mm" material="Ar10CO2" name="transfer_region_II"/>
+        <module_component thickness="GEMAreaFactor*50.0*um" material="Kapton"  name="gem_foil_3"/>
+        <module_component thickness="GEMAreaFactor*10.0*um" material="Copper"  name="gem_foil_3_cu"/>
+        <module_component thickness=" 2.0*mm" material="Ar10CO2" name="induction_region"/>
+        <module_component thickness="50.0*um" material="Kapton"  name="readout_foil"/>
+	<module_component thickness=" 5.0*um" material="Copper"  name="readout_cu"/>
+	<module_component thickness=" 2.0*mm" material="Ar10CO2" name="exit_region"/>
+	<module_component thickness="25.0*um" material="Mylar" name="exit_window"/>       
       </module>
       <module name="GEMSupportModule1" vis="AnlProcess_Blue">
-        <trd x1="GEMTrackerEndcapFoilX2/2.0" x2="GEMTrackerEndcapFoilX1/2.0" z="GEMTrackerEndcapFrameBotEdge_width"/>
-        <module_component thickness="GEMTrackerEndcapFrame_thickness" material="Mylar"/>
+        <trd x1="GEMTrackerEndcapFoilX1/2.0" x2="GEMTrackerEndcapFoilX2/2.0" z="GEMTrackerEndcapFoilY/2"/>
+        <frame material="G10" thickness="GEMTrackerEndcapFrame_thickness" vis="TrackerSupportVis">
+          <position x="0"  y="0" z="0" />
+          <trd x1="GEMTrackerEndcapFoilX1/2.0 - GEMTrackerEndcapFrameSideEdge_width/cos(GEMTrackerEndcapFoilOpeningAngle) 
+                                              + GEMTrackerEndcapFrameBotEdge_width*tan(GEMTrackerEndcapFoilOpeningAngle)"
+               x2="GEMTrackerEndcapFoilX2/2.0 - GEMTrackerEndcapFrameSideEdge_width/cos(GEMTrackerEndcapFoilOpeningAngle)
+                                              - GEMTrackerEndcapFrameTopEdge_width*tan(GEMTrackerEndcapFoilOpeningAngle)"
+            z="GEMTrackerEndcapFoilY/2    - (GEMTrackerEndcapFrameBotEdge_width +GEMTrackerEndcapFrameTopEdge_width)/2.0 ">
+            <position x="0" y="0" z="0" />
+          </trd>
+        </frame>
       </module>
       <module name="GEMSupportModule2" vis="AnlProcess_Blue">
         <trd x1="GEMTrackerEndcapFrameSideEdge_width" x2="GEMTrackerEndcapFrameSideEdge_width" z="GEMTrackerEndcapFoilY/2"/>
-        <module_component thickness="4.0*mm" material="Mylar"/>
+        <module_component thickness="1.0*mm" material="Mylar"/>
       </module>
       <layer id="1" >
-        <ring vis="AnlRed"
+        <ring vis="AnlRed" module="GEMModule1"
           r="GEMTrackerEndcapFoil_rmin+GEMTrackerEndcapFoilY/2.0"
           zstart="GEMTrackerEndcap_zmin + 0.5*GEMTrackerEndcapLayer_thickness"
-          nmodules="12" dz="10 * mm" module="GEMModule1" />
-        <ring vis="AnlBlue" phi0="15.0*degree"
+          nmodules="12" dz="10 * mm" />
+        <ring vis="AnlBlue" phi0="15.0*degree"  module="GEMSupportModule2"
           r="GEMTrackerEndcapFoil_rmin+GEMTrackerEndcapFoilY/2.0"
           zstart="GEMTrackerEndcap_zmin + 0.5*GEMTrackerEndcapLayer_thickness"
-          nmodules="12" dz="0 * mm" module="GEMSupportModule2" />
+          nmodules="12" dz="0 * mm" />
       </layer>
     </detector>