diff --git a/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalwaferF-algorithm.xml b/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalwaferF-algorithm.xml
index 6a2757c1fb051..6a0ee79765a4b 100644
--- a/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalwaferF-algorithm.xml
+++ b/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalwaferF-algorithm.xml
@@ -23,7 +23,7 @@
     <Include ref="Geometry/CMSCommonData/data/materials/2021/v1/materials.xml"/>
     <Include ref="Geometry/CMSCommonData/data/rotations.xml"/>
     <Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v1/cms.xml"/>
-    <Include ref="Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml"/>
+    <Include ref="Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml"/>
     <Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v15f/hgcal.xml"/>
     <Include ref="Geometry/HGCalCommonData/data/hgcalcell/v15/hgcalcell.xml"/>
     <Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v15f/hgcalwafer.xml"/>
diff --git a/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalwaferP-algorithm.xml b/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalwaferP-algorithm.xml
index 180dcd122cdde..6858bbba81bb8 100644
--- a/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalwaferP-algorithm.xml
+++ b/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalwaferP-algorithm.xml
@@ -23,7 +23,7 @@
     <Include ref="Geometry/CMSCommonData/data/materials/2021/v1/materials.xml"/>
     <Include ref="Geometry/CMSCommonData/data/rotations.xml"/>
     <Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v1/cms.xml"/>
-    <Include ref="Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml"/>
+    <Include ref="Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml"/>
     <Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v16p/hgcal.xml"/>
     <Include ref="Geometry/HGCalCommonData/data/hgcalcell/v16/hgcalcell.xml"/>
     <Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v16p/hgcalwafer.xml"/>
diff --git a/Geometry/HGCalCommonData/data/hgcal/v16/hgcal.xml b/Geometry/HGCalCommonData/data/hgcal/v16/hgcal.xml
index ceef32a4247b9..005d787784c26 100644
--- a/Geometry/HGCalCommonData/data/hgcal/v16/hgcal.xml
+++ b/Geometry/HGCalCommonData/data/hgcal/v16/hgcal.xml
@@ -3,18 +3,18 @@
 
 <ConstantsSection label="hgcal.xml" eval="true">
   <Constant name="WaferSize"             value="166.4408*mm"/>
-  <Constant name="WaferThickness"        value="0.31*mm"/>
+  <Constant name="WaferThickness"        value="0.30*mm"/>
   <Constant name="WaferThicknessFine"    value="0.30*mm"/>
   <Constant name="WaferThicknessCoarse1" value="0.20*mm"/>
   <Constant name="WaferThicknessCoarse2" value="0.30*mm"/>
   <Constant name="SensorSeparation"      value="1.00*mm"/>
   <Constant name="MouseBite"             value="5.00*mm"/>
-  <Constant name="ModuleThicknessEE"     value="9.10*mm"/>
-  <Constant name="ModuleThicknessHE"     value="8.60*mm"/>
+  <Constant name="ModuleThicknessEE"     value="9.325*mm"/>
+  <Constant name="ModuleThicknessHE"     value="8.70*mm"/>
   <Constant name="CellThicknessFine"     value="0.12*mm"/>
   <Constant name="CellThicknessCoarse1"  value="0.20*mm"/>
   <Constant name="CellThicknessCoarse2"  value="0.30*mm"/>
-  <Constant name="ScintillatorThickness" value="3.88*mm"/>
+  <Constant name="ScintillatorThickness" value="3.0*mm"/>
   <Constant name="NumberOfCellsFine"     value="12"/>
   <Constant name="NumberOfCellsCoarse"   value="8"/>
   <Constant name="NPhiBinBH"             value="288"/>
diff --git a/Geometry/HGCalCommonData/data/hgcalEE/v16/hgcalEE.xml b/Geometry/HGCalCommonData/data/hgcalEE/v16/hgcalEE.xml
index 024d7401d17b7..e2ee942abf397 100644
--- a/Geometry/HGCalCommonData/data/hgcalEE/v16/hgcalEE.xml
+++ b/Geometry/HGCalCommonData/data/hgcalEE/v16/hgcalEE.xml
@@ -183,53 +183,53 @@
       hgcalwafer:HGCalEEWafer1Coarse2bm0, hgcalwafer:HGCalEEWafer1Coarse2bm1, 
       hgcalwafer:HGCalEEWafer1Coarse2bm2, hgcalwafer:HGCalEEWafer1Coarse2bm3, 
       hgcalwafer:HGCalEEWafer1Coarse2bm4, hgcalwafer:HGCalEEWafer1Coarse2bm5</Vector>
-    <Vector name="MaterialNames" type="string" nEntries="11">
-      materials:Air, materials:Copper, materials:StainlessSteel, 
-      materials:Epoxy, materials:Lead, materials:Lead, materials:Lead,    
-      materials:Copper, materials:Copper, materials:Air, materials:Air</Vector>
-    <Vector name="VolumeNames" type="string" nEntries="11">
-      HGCalEEHardPointGap, HGCalEEAbsorberCopper, HGCalEEAbsorberStainlessSteel, 
+    <Vector name="MaterialNames" type="string" nEntries="10">
+      materials:Copper, materials:StainlessSteel, materials:Epoxy, 
+      materials:Lead, materials:Lead, materials:Lead, materials:Copper,
+      materials:StainlessSteel, materials:Air, materials:Air</Vector>
+    <Vector name="VolumeNames" type="string" nEntries="10">
+      HGCalEEAbsorberCopper, HGCalEEAbsorberStainlessSteel, 
       HGCalEEAbsorberEpoxy, HGCalEEAbsorberLead1, HGCalEEAbsorberLead2, 
-      HGCalEEAbsorberLead3,  HGCalEECoolingPlate, HGCalEECopperCover,
+      HGCalEEAbsorberLead3,  HGCalEECoolingPlate, HGCalEEStainlessSteelCover,
       HGCalEELayerF, HGCalEELayerB</Vector>
-    <Vector name="Thickness" type="numeric" nEntries="11">
-      0.1*mm, 0.1*mm, 0.3*mm,  0.1*mm, 2.77*mm, 4.97*mm, 8.22*mm,
-      6.2*mm, 1.0*mm, [hgcal:ModuleThicknessEE], [hgcal:ModuleThicknessEE]
+    <Vector name="Thickness" type="numeric" nEntries="10">
+      0.1*mm, 0.3*mm,  0.05*mm, 2.77*mm, 4.97*mm, 8.22*mm,
+      6.05*mm, 1.0*mm, [hgcal:ModuleThicknessEE], [hgcal:ModuleThicknessEE]
     </Vector>
     <Vector name="Layers" type="numeric" nEntries="13"> 
-      12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13</Vector>
+      10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 11</Vector>
     <Vector name="LayerThick" type="numeric" nEntries="13"> 
       28.37*mm, 30.57*mm, 30.57*mm, 30.57*mm, 30.57*mm, 30.57*mm, 30.57*mm,
       30.57*mm, 30.57*mm, 33.82*mm, 33.82*mm, 33.82*mm, 34.82*mm </Vector>
-    <Vector name="LayerType" type="numeric" nEntries="157"> 
-      0, 1, 2, 3, 4, 3, 2, 1, 9, 7, 10, 0,      
-      0, 1, 2, 3, 5, 3, 2, 1, 9, 7, 10, 0,
-      0, 1, 2, 3, 5, 3, 2, 1, 9, 7, 10, 0,
-      0, 1, 2, 3, 5, 3, 2, 1, 9, 7, 10, 0,
-      0, 1, 2, 3, 5, 3, 2, 1, 9, 7, 10, 0,
-      0, 1, 2, 3, 5, 3, 2, 1, 9, 7, 10, 0,
-      0, 1, 2, 3, 5, 3, 2, 1, 9, 7, 10, 0,
-      0, 1, 2, 3, 5, 3, 2, 1, 9, 7, 10, 0,
-      0, 1, 2, 3, 5, 3, 2, 1, 9, 7, 10, 0,
-      0, 1, 2, 3, 6, 3, 2, 1, 9, 7, 10, 0,
-      0, 1, 2, 3, 6, 3, 2, 1, 9, 7, 10, 0,
-      0, 1, 2, 3, 6, 3, 2, 1, 9, 7, 10, 0,
-      0, 1, 2, 3, 6, 3, 2, 1, 9, 7, 10, 0, 8
+    <Vector name="LayerType" type="numeric" nEntries="131"> 
+      0, 1, 2, 3, 2, 1, 0, 8, 6, 9,
+      0, 1, 2, 4, 2, 1, 0, 8, 6, 9,
+      0, 1, 2, 4, 2, 1, 0, 8, 6, 9,
+      0, 1, 2, 4, 2, 1, 0, 8, 6, 9,
+      0, 1, 2, 4, 2, 1, 0, 8, 6, 9,
+      0, 1, 2, 4, 2, 1, 0, 8, 6, 9,
+      0, 1, 2, 4, 2, 1, 0, 8, 6, 9,
+      0, 1, 2, 4, 2, 1, 0, 8, 6, 9,
+      0, 1, 2, 4, 2, 1, 0, 8, 6, 9,
+      0, 1, 2, 5, 2, 1, 0, 8, 6, 9,
+      0, 1, 2, 5, 2, 1, 0, 8, 6, 9,
+      0, 1, 2, 5, 2, 1, 0, 8, 6, 9,
+      0, 1, 2, 5, 2, 1, 0, 8, 6, 9, 7
     </Vector>
-    <Vector name="LayerSense" type="numeric" nEntries="157">
-      0,-2,-2,-2,-2,-2,-2, 0, 1, 0, 2, 0,
-      0,-2,-2,-2,-2,-2,-2, 0, 1, 0, 2, 0,
-      0,-2,-2,-2,-2,-2,-2, 0, 1, 0, 2, 0,
-      0,-2,-2,-2,-2,-2,-2, 0, 1, 0, 2, 0,
-      0,-2,-2,-2,-2,-2,-2, 0, 1, 0, 2, 0,
-      0,-2,-2,-2,-2,-2,-2, 0, 1, 0, 2, 0,
-      0,-2,-2,-2,-2,-2,-2, 0, 1, 0, 2, 0,
-      0,-2,-2,-2,-2,-2,-2, 0, 1, 0, 2, 0,
-      0,-2,-2,-2,-2,-2,-2, 0, 1, 0, 2, 0,
-      0,-2,-2,-2,-2,-2,-2, 0, 1, 0, 2, 0,
-      0,-2,-2,-2,-2,-2,-2, 0, 1, 0, 2, 0,
-      0,-2,-2,-2,-2,-2,-2, 0, 1, 0, 2, 0,
-      0,-2,-2,-2,-2,-2,-2, 0, 1, 0, 2, 0,-2
+    <Vector name="LayerSense" type="numeric" nEntries="131">
+      -2,-2,-2,-2,-2,-2, 0, 1, 0, 2,
+      -2,-2,-2,-2,-2,-2, 0, 1, 0, 2,
+      -2,-2,-2,-2,-2,-2, 0, 1, 0, 2,
+      -2,-2,-2,-2,-2,-2, 0, 1, 0, 2,
+      -2,-2,-2,-2,-2,-2, 0, 1, 0, 2,
+      -2,-2,-2,-2,-2,-2, 0, 1, 0, 2,
+      -2,-2,-2,-2,-2,-2, 0, 1, 0, 2,
+      -2,-2,-2,-2,-2,-2, 0, 1, 0, 2,
+      -2,-2,-2,-2,-2,-2, 0, 1, 0, 2,
+      -2,-2,-2,-2,-2,-2, 0, 1, 0, 2,
+      -2,-2,-2,-2,-2,-2, 0, 1, 0, 2,
+      -2,-2,-2,-2,-2,-2, 0, 1, 0, 2,
+      -2,-2,-2,-2,-2,-2, 0, 1, 0, 2,-2
     </Vector>
     <Vector name="LayerCenter" type="numeric" nEntries="26">
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
diff --git a/Geometry/HGCalCommonData/data/hgcalHEmix/v16/hgcalHEmix.xml b/Geometry/HGCalCommonData/data/hgcalHEmix/v16/hgcalHEmix.xml
index 4b76e347681eb..63429ac591647 100644
--- a/Geometry/HGCalCommonData/data/hgcalHEmix/v16/hgcalHEmix.xml
+++ b/Geometry/HGCalCommonData/data/hgcalHEmix/v16/hgcalHEmix.xml
@@ -124,7 +124,7 @@
       HGCalHEAbsorber1, HGCalHEAbsorber2, HGCalHEAirGap1, HGCalHECopperCover, 
       HGCalHESiliconLayer, HGCalHECoolingPlate</Vector>
     <Vector name="Thickness" type="numeric" nEntries="6">
-      41.5*mm, 60.7*mm,  3.7*mm,  2.6*mm, [hgcal:ModuleThicknessHE], 6.65*mm
+      41.5*mm, 60.7*mm,  4.0*mm,  2.5*mm, [hgcal:ModuleThicknessHE], 6.35*mm
     </Vector>
     <Vector name="Layers" type="numeric" nEntries="14"> 
       5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5</Vector>
@@ -144,19 +144,20 @@
       -1, 0, -1, 1, -2, -1, 0, -1, 1, -2, -1, 0, -1, 1, -2,
       -1, 0, -1, 1, -2, -1, 0, -1, 1, -2, -1, 0, -1, 1, -2,
       -1, 0, -1, 1, -2, -1, 0, -1, 1, -2</Vector>
-    <Vector name="TopMaterialNames" type="string" nEntries="6">
-      materials:Air, materials:Cables, materials:Air,
-      materials:H_Scintillator, materials:Epoxy,
+    <Vector name="TopMaterialNames" type="string" nEntries="7">
+      materials:Air, hgcalMaterial:HGC_Cables, hgcalMaterial:HGC_G10-FR4,
+      materials:Polystyrene, materials:H_Scintillator, materials:Polystyrene,
       hgcalMaterial:HGC_G10-FR4</Vector>
-    <Vector name="TopVolumeNames" type="string" nEntries="6"> 
-      HGCalAirGap1, HGCalCableConnector, HGCalAirGap2, 
-      HGCalHEScintillatorSensitive, HGCalScintillatorEpoxy,
+    <Vector name="TopVolumeNames" type="string" nEntries="7"> 
+      HGCalHEScintillatorAirGap, HGCalCableConnector, 
+      HGCalHEScintillatorProtection, HGCalScintillatorFronyReflector,
+      HGCalHEScintillatorSensitive, HGCalScintillatorBackReflector,
       HGCalTileBoard</Vector>
-    <Vector name="TopLayerThickness" type="numeric" nEntries="6">
-      0.87*mm, 1.04*mm, 1.245*mm, [hgcal:ScintillatorThickness], 0.075*mm,
-      1.49*mm</Vector>   <!-- scintillator module -->
-    <Vector name="TopLayerType" type="numeric" nEntries="6"> 
-      0, 1, 2, 3, 4, 5</Vector>
+    <Vector name="TopLayerThickness" type="numeric" nEntries="7">
+      0.40*mm, 3.00*mm, 0.20*mm, 0.25*mm, [hgcal:ScintillatorThickness],
+      0.25*mm, 1.60*mm</Vector>   <!-- scintillator module -->
+    <Vector name="TopLayerType" type="numeric" nEntries="7"> 
+      0, 1, 2, 3, 4, 5, 6</Vector>
     <Vector name="LayerTypes" type="numeric" nEntries="14">
        2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3
     </Vector>
diff --git a/Geometry/HGCalCommonData/data/hgcalHEsil/v16/hgcalHEsil.xml b/Geometry/HGCalCommonData/data/hgcalHEsil/v16/hgcalHEsil.xml
index 78b2a6a8c3eeb..5a59d1e56e1be 100644
--- a/Geometry/HGCalCommonData/data/hgcalHEsil/v16/hgcalHEsil.xml
+++ b/Geometry/HGCalCommonData/data/hgcalHEsil/v16/hgcalHEsil.xml
@@ -108,7 +108,7 @@
       HGCalHEAbsorber1, HGCalHEAbsorber2, HGCalHEAirGap0, HGCalHEAirGap1,
       HGCalHECopperCover, HGCalHECoolingPlate, HGCalHESiliconLayer</Vector>
     <Vector name="Thickness" type="numeric" nEntries="7">
-      45.0*mm, 41.5*mm, 1.25*mm, 3.7*mm, 2.6*mm, 6.65*mm, 
+      45.0*mm, 41.5*mm, 1.25*mm, 4.00*mm, 2.50*mm, 6.35*mm, 
       [hgcal:ModuleThicknessHE] </Vector>
     <Vector name="Layers" type="numeric" nEntries="7">
       6, 5, 5, 5, 5, 5, 5</Vector>
@@ -116,7 +116,7 @@
       67.80*mm, 63.05*mm, 63.05*mm, 63.05*mm, 63.05*mm, 63.05*mm, 63.05*mm
    </Vector>
     <Vector name="LayerType" type="numeric" nEntries="36">
-      0, 2, 3, 4, 6, 5,
+      2, 0, 3, 4, 6, 5,
       1, 3, 4, 6, 5,
       1, 3, 4, 6, 5,
       1, 3, 4, 6, 5,
@@ -124,7 +124,7 @@
       1, 3, 4, 6, 5,
       1, 3, 4, 6, 5 </Vector>
     <Vector name="LayerSense" type="numeric" nEntries="36">
-      -1, 0, 0, -2, 1, -2,
+       0, -1, 0, -2, 1, -2,
       -1, 0, -2, 1, -2,
       -1, 0, -2, 1, -2,
       -1, 0, -2, 1, -2,
diff --git a/Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml b/Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml
index ba7e1d90fc176..80569eaf44585 100644
--- a/Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml
+++ b/Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../../DetectorDescription/Schema/DDLSchema.xsd">
+<DDDefinition>
 
 <MaterialSection label="hgcalMaterial.xml">
   <CompositeMaterial name="WCu" density="14.979*g/cm3" symbol=" " method="mixture by weight">
@@ -64,6 +64,21 @@
       <rMaterial name="materials:Lead"/>
     </MaterialFraction>
   </CompositeMaterial>
+  <CompositeMaterial name="HGC_EEConnector" density="1.214*mg/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.0">
+      <rMaterial name="materials:Air"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="HGC_HEConnector" density="1.214*mg/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.0">
+      <rMaterial name="materials:Air"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="HGC_Cables" density="2.68*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.0">
+      <rMaterial name="materials:Cables"/>
+    </MaterialFraction>
+  </CompositeMaterial>
 </MaterialSection>
 
 </DDDefinition>
diff --git a/Geometry/HGCalCommonData/data/hgcalcell/v16/hgcal.xml b/Geometry/HGCalCommonData/data/hgcalcell/v16/hgcal.xml
index 25906bbf8207d..849d81e9e702e 100644
--- a/Geometry/HGCalCommonData/data/hgcalcell/v16/hgcal.xml
+++ b/Geometry/HGCalCommonData/data/hgcalcell/v16/hgcal.xml
@@ -3,7 +3,7 @@
 
 <ConstantsSection label="hgcal.xml" eval="true">
   <Constant name="WaferSize"             value="166.4408*mm"/>
-  <Constant name="WaferThickness"        value="0.31*mm"/>
+  <Constant name="WaferThickness"        value="0.30*mm"/>
   <Constant name="WaferThicknessFine"    value="0.30*mm"/>
   <Constant name="WaferThicknessCoarse1" value="0.20*mm"/>
   <Constant name="WaferThicknessCoarse2" value="0.30*mm"/>
diff --git a/Geometry/HGCalCommonData/data/hgcalwafer/v15f/hgcal.xml b/Geometry/HGCalCommonData/data/hgcalwafer/v15f/hgcal.xml
index 234c65d71bf40..cda63eebdeced 100644
--- a/Geometry/HGCalCommonData/data/hgcalwafer/v15f/hgcal.xml
+++ b/Geometry/HGCalCommonData/data/hgcalwafer/v15f/hgcal.xml
@@ -13,6 +13,7 @@
   <Constant name="CellThicknessCoarse2"  value="0.30*mm"/>
   <Constant name="NumberOfCellsFine"     value="12"/>
   <Constant name="NumberOfCellsCoarse"   value="8"/>
+  <Constant name="LayerRotation"         value="0*deg"/>
   <Constant name="radMixL0"              value="1537.05*mm"/>
   <Constant name="radMixL1"              value="1537.05*mm"/>
   <Constant name="radMixL2"              value="1537.05*mm"/>
diff --git a/Geometry/HGCalCommonData/data/hgcalwafer/v15p/hgcal.xml b/Geometry/HGCalCommonData/data/hgcalwafer/v15p/hgcal.xml
index 5df1ca3b5b0b3..0664514c1316a 100644
--- a/Geometry/HGCalCommonData/data/hgcalwafer/v15p/hgcal.xml
+++ b/Geometry/HGCalCommonData/data/hgcalwafer/v15p/hgcal.xml
@@ -12,6 +12,7 @@
   <Constant name="CellThicknessCoarse2"  value="0.30*mm"/>
   <Constant name="NumberOfCellsFine"     value="12"/>
   <Constant name="NumberOfCellsCoarse"   value="8"/>
+  <Constant name="LayerRotation"         value="0*deg"/>
 </ConstantsSection>
 
 </DDDefinition>
diff --git a/Geometry/HGCalCommonData/data/hgcalwafer/v16/hgcal.xml b/Geometry/HGCalCommonData/data/hgcalwafer/v16/hgcal.xml
index 7258a20de9536..ddffe0a4790fe 100644
--- a/Geometry/HGCalCommonData/data/hgcalwafer/v16/hgcal.xml
+++ b/Geometry/HGCalCommonData/data/hgcalwafer/v16/hgcal.xml
@@ -3,18 +3,19 @@
 
 <ConstantsSection label="hgcal.xml" eval="true">
   <Constant name="WaferSize"             value="166.4408*mm"/>
-  <Constant name="WaferThickness"        value="0.31*mm"/>
+  <Constant name="WaferThickness"        value="0.30*mm"/>
   <Constant name="WaferThicknessFine"    value="0.30*mm"/>
   <Constant name="WaferThicknessCoarse1" value="0.20*mm"/>
   <Constant name="WaferThicknessCoarse2" value="0.30*mm"/>
   <Constant name="SensorSeparation"      value="1.00*mm"/>
-  <Constant name="ModuleThicknessEE"     value="9.10*mm"/>
-  <Constant name="ModuleThicknessHE"     value="8.60*mm"/>
+  <Constant name="ModuleThicknessEE"     value="9.325*mm"/>
+  <Constant name="ModuleThicknessHE"     value="8.70*mm"/>
   <Constant name="CellThicknessFine"     value="0.12*mm"/>
   <Constant name="CellThicknessCoarse1"  value="0.20*mm"/>
   <Constant name="CellThicknessCoarse2"  value="0.30*mm"/>
   <Constant name="NumberOfCellsFine"     value="12"/>
   <Constant name="NumberOfCellsCoarse"   value="8"/>
+  <Constant name="LayerRotation"         value="30*deg"/>
 </ConstantsSection>
 
 </DDDefinition>
diff --git a/Geometry/HGCalCommonData/data/hgcalwafer/v16/hgcalwafer.xml b/Geometry/HGCalCommonData/data/hgcalwafer/v16/hgcalwafer.xml
index ee61f492c561a..930fd6cbaa807 100644
--- a/Geometry/HGCalCommonData/data/hgcalwafer/v16/hgcalwafer.xml
+++ b/Geometry/HGCalCommonData/data/hgcalwafer/v16/hgcalwafer.xml
@@ -25,21 +25,22 @@
     <Numeric name="WaferSize"        value="[WaferSize]"/>
     <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
     <Numeric name="WaferThickness"   value="[WaferThicknessFine]"/>
-    <Vector name="LayerNames" type="string" nEntries="7">
-      HGCalEEMotherBoard0Fine, HGCalEEConnector0Fine, HGCalEEPCB0Fine,
-      HGCalEEEpoxy0Fine, HGCalEEKapton0Fine, HGCalEESensitive0Fine, 
+    <Vector name="LayerNames" type="string" nEntries="9">
+      HGCalEEAirGap0Fine, HGCalEEMotherBoard0Fine, 
+      HGCalEEConnector0Fine, HGCalEEPCB0Fine, HGCalEEEpoxy0Fine,
+      HGCalEEEpoxyT0Fine, HGCalEEKapton0Fine, HGCalEESensitive0Fine,
       HGCalEEBasePlate0Fine</Vector>
-    <Vector name="LayerMaterials" type="string" nEntries="7">
-      hgcalMaterial:HGC_G10-FR4, materials:Air, hgcalMaterial:HGC_G10-FR4, 
-      materials:Epoxy, materials:Kapton, materials:Silicon,
-      hgcalMaterial:WCu</Vector>
-    <Vector name="LayerThickness" type="numeric" nEntries="7">
-      1.85*mm, 3.25*mm, 1.76*mm, 0.0675*mm, 0.105*mm, [WaferThickness], 
-      1.45*mm </Vector>
-    <Vector name="LayerTypes" type="numeric" nEntries="7"> 
-      0, 0, 0, 0, 0, 1, 0 </Vector>
-    <Vector name="Layers" type="numeric" nEntries="11"> 
-      0, 1, 2, 3, 5, 3, 4, 3, 4, 3, 6 </Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="9">
+      materials:Air, hgcalMaterial:HGC_G10-FR4, hgcalMaterial:HGC_EEConnector,
+      hgcalMaterial:HGC_G10-FR4, materials:Epoxy, materials:Epoxy, 
+      materials:Kapton, materials:Silicon, hgcalMaterial:WCu</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="9">
+      0.225*mm, 1.60*mm, 3.73*mm, 1.60*mm, 0.075*mm, 0.065*mm, 0.265*mm, 
+      [WaferThickness], 1.40*mm </Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="9"> 
+      0, 0, 0, 0, 0, 0, 0, 1, 0 </Vector>
+    <Vector name="Layers" type="numeric" nEntries="10"> 
+      0, 1, 2, 3, 4, 7, 5, 6, 5, 8 </Vector>
     <Numeric name="NCells"           value="[NumberOfCellsFine]"/>
     <Numeric name="CellType"         value="0"/>
     <Vector name="CellNames" type="string" nEntries="13">
@@ -58,21 +59,22 @@
     <Numeric name="WaferSize"        value="[WaferSize]"/>
     <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
     <Numeric name="WaferThickness"   value="[WaferThicknessFine]"/>
-    <Vector name="LayerNames" type="string" nEntries="7">
-      HGCalEEMotherBoard1Fine, HGCalEEConnector1Fine, HGCalEEPCB1Fine,
-      HGCalEEEpoxy1Fine, HGCalEEKapton1Fine, HGCalEESensitive1Fine, 
+    <Vector name="LayerNames" type="string" nEntries="9">
+      HGCalEEAirGap1Fine, HGCalEEMotherBoard1Fine, 
+      HGCalEEConnector1Fine, HGCalEEPCB1Fine, HGCalEEEpoxy1Fine, 
+      HGCalEEEpoxyT1Fine, HGCalEEKapton1Fine, HGCalEESensitive1Fine,
       HGCalEEBasePlate1Fine</Vector>
-    <Vector name="LayerMaterials" type="string" nEntries="7">
-      hgcalMaterial:HGC_G10-FR4, materials:Air, hgcalMaterial:HGC_G10-FR4, 
-      materials:Epoxy, materials:Kapton, materials:Silicon,
-      hgcalMaterial:WCu</Vector>
-    <Vector name="LayerThickness" type="numeric" nEntries="7">
-      1.85*mm, 3.25*mm, 1.76*mm, 0.0675*mm, 0.105*mm, [WaferThickness], 
-      1.45*mm </Vector>
-    <Vector name="LayerTypes" type="numeric" nEntries="7"> 
-      0, 0, 0, 0, 0, 1, 0 </Vector>
-    <Vector name="Layers" type="numeric" nEntries="11"> 
-      6, 3, 4, 3, 4, 3, 5, 3, 2, 1, 0 </Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="9">
+      materials:Air, hgcalMaterial:HGC_G10-FR4, hgcalMaterial:HGC_EEConnector,
+      hgcalMaterial:HGC_G10-FR4, materials:Epoxy, materials:Epoxy, 
+      materials:Kapton, materials:Silicon, hgcalMaterial:WCu</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="9">
+      0.225*mm, 1.60*mm, 3.73*mm, 1.60*mm, 0.075*mm, 0.065*mm, 0.265*mm, 
+      [WaferThickness], 1.40*mm </Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="9"> 
+      0, 0, 0, 0, 0, 0, 0, 1, 0 </Vector>
+    <Vector name="Layers" type="numeric" nEntries="10"> 
+      8, 5, 6, 5, 7, 4, 3, 2, 1, 0 </Vector>
     <Numeric name="NCells"           value="[NumberOfCellsFine]"/>
     <Numeric name="CellType"         value="0"/>
     <Vector name="CellNames" type="string" nEntries="13">
@@ -91,21 +93,22 @@
     <Numeric name="WaferSize"        value="[WaferSize]"/>
     <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
     <Numeric name="WaferThickness"   value="[WaferThicknessCoarse1]"/>
-    <Vector name="LayerNames" type="string" nEntries="7">
-      HGCalEEMotherBoard0Coarse1, HGCalEEConnector0Coarse1, HGCalEEPCB0Coarse1,
-      HGCalEEEpoxy0Coarse1, HGCalEEKapton0Coarse1, HGCalEESensitive0Coarse1, 
+    <Vector name="LayerNames" type="string" nEntries="9">
+      HGCalEEAirGap0Coarse1, HGCalEEMotherBoard0Coarse1, 
+      HGCalEEConnector0Coarse1, HGCalEEPCB0Coarse1, HGCalEEEpoxy0Coarse1, 
+      HGCalEEEpoxyT0Coarse1, HGCalEEKapton0Coarse1, HGCalEESensitive0Coarse1,
       HGCalEEBasePlate0Coarse1</Vector>
-    <Vector name="LayerMaterials" type="string" nEntries="7">
-      hgcalMaterial:HGC_G10-FR4, materials:Air, hgcalMaterial:HGC_G10-FR4, 
-      materials:Epoxy, materials:Kapton, materials:Silicon,
-      hgcalMaterial:WCu</Vector>
-    <Vector name="LayerThickness" type="numeric" nEntries="7">
-      1.85*mm, 3.25*mm, 1.76*mm, 0.0675*mm, 0.105*mm, [WaferThickness], 
-      1.45*mm </Vector>
-    <Vector name="LayerTypes" type="numeric" nEntries="7"> 
-      0, 0, 0, 0, 0, 1, 0 </Vector>
-    <Vector name="Layers" type="numeric" nEntries="11"> 
-      0, 1, 2, 3, 5, 3, 4, 3, 4, 3, 6 </Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="9">
+      materials:Air, hgcalMaterial:HGC_G10-FR4, hgcalMaterial:HGC_EEConnector,
+      hgcalMaterial:HGC_G10-FR4, materials:Epoxy, materials:Epoxy, 
+      materials:Kapton, materials:Silicon, hgcalMaterial:WCu</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="9">
+      0.225*mm, 1.60*mm, 3.73*mm, 1.60*mm, 0.075*mm, 0.065*mm, 0.265*mm, 
+      [WaferThickness], 1.40*mm </Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="9"> 
+      0, 0, 0, 0, 0, 0, 0, 1, 0 </Vector>
+    <Vector name="Layers" type="numeric" nEntries="10"> 
+      0, 1, 2, 3, 4, 7, 5, 6, 5, 8 </Vector>
     <Numeric name="NCells"           value="[NumberOfCellsCoarse]"/>
     <Numeric name="CellType"         value="1"/>
     <Vector name="CellNames" type="string" nEntries="13">
@@ -124,21 +127,22 @@
     <Numeric name="WaferSize"        value="[WaferSize]"/>
     <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
     <Numeric name="WaferThickness"   value="[WaferThicknessCoarse1]"/>
-    <Vector name="LayerNames" type="string" nEntries="7">
-      HGCalEEMotherBoard1Coarse1, HGCalEEConnector1Coarse1, HGCalEEPCB1Coarse1,
-      HGCalEEEpoxy1Coarse1, HGCalEEKapton1Coarse1, HGCalEESensitive1Coarse1, 
+    <Vector name="LayerNames" type="string" nEntries="9">
+      HGCalEEAirGap1Coarse1, HGCalEEMotherBoard1Coarse1, 
+      HGCalEEConnector1Coarse1, HGCalEEPCB1Coarse1, HGCalEEEpoxy1Coarse1, 
+      HGCalEEEpoxyT1Coarse1, HGCalEEKapton1Coarse1, HGCalEESensitive1Coarse1,
       HGCalEEBasePlate1Coarse1</Vector>
-    <Vector name="LayerMaterials" type="string" nEntries="7">
-      hgcalMaterial:HGC_G10-FR4, materials:Air, hgcalMaterial:HGC_G10-FR4, 
-      materials:Epoxy, materials:Kapton, materials:Silicon,
-      hgcalMaterial:WCu</Vector>
-    <Vector name="LayerThickness" type="numeric" nEntries="7">
-      1.85*mm, 3.25*mm, 1.76*mm, 0.0675*mm, 0.105*mm, [WaferThickness], 
-      1.45*mm </Vector>
-    <Vector name="LayerTypes" type="numeric" nEntries="7"> 
-      0, 0, 0, 0, 0, 1, 0 </Vector>
-    <Vector name="Layers" type="numeric" nEntries="11"> 
-      6, 3, 4, 3, 4, 3, 5, 3, 2, 1, 0 </Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="9">
+      materials:Air, hgcalMaterial:HGC_G10-FR4, hgcalMaterial:HGC_EEConnector,
+      hgcalMaterial:HGC_G10-FR4, materials:Epoxy, materials:Epoxy, 
+      materials:Kapton, materials:Silicon, hgcalMaterial:WCu</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="9">
+      0.225*mm, 1.60*mm, 3.73*mm, 1.60*mm, 0.075*mm, 0.065*mm, 0.265*mm, 
+      [WaferThickness], 1.40*mm </Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="9"> 
+      0, 0, 0, 0, 0, 0, 0, 1, 0 </Vector>
+    <Vector name="Layers" type="numeric" nEntries="10"> 
+      8, 5, 6, 5, 7, 4, 3, 2, 1, 0 </Vector>
     <Numeric name="NCells"           value="[NumberOfCellsCoarse]"/>
     <Numeric name="CellType"         value="1"/>
     <Vector name="CellNames" type="string" nEntries="13">
@@ -157,21 +161,22 @@
     <Numeric name="WaferSize"        value="[WaferSize]"/>
     <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
     <Numeric name="WaferThickness"   value="[WaferThicknessCoarse2]"/>
-    <Vector name="LayerNames" type="string" nEntries="7">
-      HGCalEEMotherBoard0Coarse2, HGCalEEConnector0Coarse2, HGCalEEPCB0Coarse2,
-      HGCalEEEpoxy0Coarse2, HGCalEEKapton0Coarse2, HGCalEESensitive0Coarse2, 
+    <Vector name="LayerNames" type="string" nEntries="9">
+      HGCalEEAirGap0Coarse2, HGCalEEMotherBoard0Coarse2, 
+      HGCalEEConnector0Coarse2, HGCalEEPCB0Coarse2, HGCalEEEpoxy0Coarse2, 
+      HGCalEEEpoxyT0Coarse2, HGCalEEKapton0Coarse2, HGCalEESensitive0Coarse2,
       HGCalEEBasePlate0Coarse2</Vector>
-    <Vector name="LayerMaterials" type="string" nEntries="7">
-      hgcalMaterial:HGC_G10-FR4, materials:Air, hgcalMaterial:HGC_G10-FR4, 
-      materials:Epoxy, materials:Kapton, materials:Silicon,
-      hgcalMaterial:WCu</Vector>
-    <Vector name="LayerThickness" type="numeric" nEntries="7">
-      1.85*mm, 3.25*mm, 1.76*mm, 0.0675*mm, 0.105*mm, [WaferThickness], 
-      1.45*mm </Vector>
-    <Vector name="LayerTypes" type="numeric" nEntries="7"> 
-      0, 0, 0, 0, 0, 1, 0 </Vector>
-    <Vector name="Layers" type="numeric" nEntries="11"> 
-      0, 1, 2, 3, 5, 3, 4, 3, 4, 3, 6 </Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="9">
+      materials:Air, hgcalMaterial:HGC_G10-FR4, hgcalMaterial:HGC_EEConnector,
+      hgcalMaterial:HGC_G10-FR4, materials:Epoxy, materials:Epoxy, 
+      materials:Kapton, materials:Silicon, hgcalMaterial:WCu</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="9">
+      0.225*mm, 1.60*mm, 3.73*mm, 1.60*mm, 0.075*mm, 0.065*mm, 0.265*mm, 
+      [WaferThickness], 1.40*mm </Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="9"> 
+      0, 0, 0, 0, 0, 0, 0, 1, 0 </Vector>
+    <Vector name="Layers" type="numeric" nEntries="10"> 
+      0, 1, 2, 3, 4, 7, 5, 6, 5, 8 </Vector>
     <Numeric name="NCells"           value="[NumberOfCellsCoarse]"/>
     <Numeric name="CellType"         value="2"/>
     <Vector name="CellNames" type="string" nEntries="13">
@@ -190,21 +195,22 @@
     <Numeric name="WaferSize"        value="[WaferSize]"/>
     <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
     <Numeric name="WaferThickness"   value="[WaferThicknessCoarse2]"/>
-    <Vector name="LayerNames" type="string" nEntries="7">
-      HGCalEEMotherBoard1Coarse2, HGCalEEConnector1Coarse2, HGCalEEPCB1Coarse2,
-      HGCalEEEpoxy1Coarse2, HGCalEEKapton1Coarse2, HGCalEESensitive1Coarse2, 
+    <Vector name="LayerNames" type="string" nEntries="9">
+      HGCalEEAirGap1Coarse2, HGCalEEMotherBoard1Coarse2, 
+      HGCalEEConnector1Coarse2, HGCalEEPCB1Coarse2, HGCalEEEpoxy1Coarse2, 
+      HGCalEEEpoxyT1Coarse2, HGCalEEKapton1Coarse2, HGCalEESensitive1Coarse2,
       HGCalEEBasePlate1Coarse2</Vector>
-    <Vector name="LayerMaterials" type="string" nEntries="7">
-      hgcalMaterial:HGC_G10-FR4, materials:Air, hgcalMaterial:HGC_G10-FR4, 
-      materials:Epoxy, materials:Kapton, materials:Silicon,
-      hgcalMaterial:WCu</Vector>
-    <Vector name="LayerThickness" type="numeric" nEntries="7">
-      1.85*mm, 3.25*mm, 1.76*mm, 0.0675*mm, 0.105*mm, [WaferThickness], 
-      1.45*mm </Vector>
-    <Vector name="LayerTypes" type="numeric" nEntries="7"> 
-      0, 0, 0, 0, 0, 1, 0 </Vector>
-    <Vector name="Layers" type="numeric" nEntries="11"> 
-      6, 3, 4, 3, 4, 3, 5, 3, 2, 1, 0 </Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="9">
+      materials:Air, hgcalMaterial:HGC_G10-FR4, hgcalMaterial:HGC_EEConnector,
+      hgcalMaterial:HGC_G10-FR4, materials:Epoxy, materials:Epoxy, 
+      materials:Kapton, materials:Silicon, hgcalMaterial:WCu</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="9">
+      0.225*mm, 1.60*mm, 3.73*mm, 1.60*mm, 0.075*mm, 0.065*mm, 0.265*mm, 
+      [WaferThickness], 1.40*mm </Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="9"> 
+      0, 0, 0, 0, 0, 0, 0, 1, 0 </Vector>
+    <Vector name="Layers" type="numeric" nEntries="10"> 
+      8, 5, 6, 5, 7, 4, 3, 2, 1, 0 </Vector>
     <Numeric name="NCells"           value="[NumberOfCellsCoarse]"/>
     <Numeric name="CellType"         value="2"/>
     <Vector name="CellNames" type="string" nEntries="13">
@@ -223,21 +229,22 @@
     <Numeric name="WaferSize"        value="[WaferSize]"/>
     <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
     <Numeric name="WaferThickness"   value="[WaferThicknessFine]"/>
-    <Vector name="LayerNames" type="string" nEntries="7">
-      HGCalHEMotherBoard0Fine, HGCalHEConnector0Fine, HGCalHEPCB0Fine,
-      HGCalHEEpoxy0Fine, HGCalHEKapton0Fine, HGCalHESiliconSensitive0Fine, 
+    <Vector name="LayerNames" type="string" nEntries="8">
+      HGCalHEAirGap0Fine, HGCalHEMotherBoard0Fine, 
+      HGCalHEConnector0Fine, HGCalHEPCB0Fine, HGCalHEEpoxy0Fine,
+      HGCalHEKapton0Fine, HGCalHESiliconSensitive0Fine,
       HGCalHEBasePlate0Fine</Vector>
-    <Vector name="LayerMaterials" type="string" nEntries="7">
-      hgcalMaterial:HGC_G10-FR4, materials:Air, hgcalMaterial:HGC_G10-FR4, 
-      materials:Epoxy, materials:Kapton, materials:Silicon,
-      hgcalMaterial:HGC_G10-FR4</Vector>
-    <Vector name="LayerThickness" type="numeric" nEntries="7">
-      1.85*mm, 3.25*mm, 1.76*mm, 0.075*mm, 0.105*mm, [WaferThickness], 
-      1.1*mm </Vector>
-    <Vector name="LayerTypes" type="numeric" nEntries="7"> 
-      0, 0, 0, 0, 0, 1, 0 </Vector>
-    <Vector name="Layers" type="numeric" nEntries="9"> 
-      0, 1, 2, 3, 5, 3, 4, 3, 6 </Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="8">
+      materials:Air, hgcalMaterial:HGC_G10-FR4, hgcalMaterial:HGC_HEConnector,
+      hgcalMaterial:HGC_G10-FR4, materials:Epoxy, materials:Kapton, 
+      materials:Silicon, hgcalMaterial:HGC_G10-FR4</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="8">
+      0.40*mm, 1.60*mm, 3.475*mm, 1.60*mm, 0.075*mm, 0.10*mm, 
+      [WaferThickness], 1.0*mm </Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="8"> 
+      0, 0, 0, 0, 0, 0, 1, 0 </Vector>
+    <Vector name="Layers" type="numeric" nEntries="10"> 
+      0, 1, 2, 3, 4, 6, 4, 5, 4, 7 </Vector>
     <Numeric name="NCells"           value="[NumberOfCellsFine]"/>
     <Numeric name="CellType"         value="0"/>
     <Vector name="CellNames" type="string" nEntries="13">
@@ -256,21 +263,22 @@
     <Numeric name="WaferSize"        value="[WaferSize]"/>
     <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
     <Numeric name="WaferThickness"   value="[WaferThicknessCoarse1]"/>
-    <Vector name="LayerNames" type="string" nEntries="7">
-      HGCalHEMotherBoard0Coarse1, HGCalHEConnector0Coarse1, HGCalHEPCB0Coarse1,
-      HGCalHEEpoxy0Coarse1, HGCalHEKapton0Coarse1, HGCalHESiliconSensitive0Coarse1, 
+    <Vector name="LayerNames" type="string" nEntries="8">
+      HGCalHEAirGap0Coarse1, HGCalHEMotherBoard0Coarse1, 
+      HGCalHEConnector0Coarse1, HGCalHEPCB0Coarse1, HGCalHEEpoxy0Coarse1, 
+      HGCalHEKapton0Coarse1, HGCalHESiliconSensitive0Coarse1, 
       HGCalHEBasePlate0Coarse1</Vector>
-    <Vector name="LayerMaterials" type="string" nEntries="7">
-      hgcalMaterial:HGC_G10-FR4, materials:Air, hgcalMaterial:HGC_G10-FR4, 
-      materials:Epoxy, materials:Kapton, materials:Silicon,
-      hgcalMaterial:HGC_G10-FR4</Vector>
-    <Vector name="LayerThickness" type="numeric" nEntries="7">
-      1.85*mm, 3.25*mm, 1.76*mm, 0.075*mm, 0.105*mm, [WaferThickness], 
-      1.1*mm </Vector>
-    <Vector name="LayerTypes" type="numeric" nEntries="7"> 
-      0, 0, 0, 0, 0, 1, 0 </Vector>
-    <Vector name="Layers" type="numeric" nEntries="9"> 
-      0, 1, 2, 3, 5, 3, 4, 3, 6 </Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="8">
+      materials:Air, hgcalMaterial:HGC_G10-FR4, hgcalMaterial:HGC_HEConnector,
+      hgcalMaterial:HGC_G10-FR4, materials:Epoxy, materials:Kapton, 
+      materials:Silicon, hgcalMaterial:HGC_G10-FR4</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="8">
+      0.40*mm, 1.60*mm, 3.475*mm, 1.60*mm, 0.075*mm, 0.10*mm, 
+      [WaferThickness], 1.0*mm </Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="8"> 
+      0, 0, 0, 0, 0, 0, 1, 0 </Vector>
+    <Vector name="Layers" type="numeric" nEntries="10"> 
+      0, 1, 2, 3, 4, 6, 4, 5, 4, 7 </Vector>
     <Numeric name="NCells"           value="[NumberOfCellsCoarse]"/>
     <Numeric name="CellType"         value="1"/>
     <Vector name="CellNames" type="string" nEntries="13">
@@ -289,21 +297,22 @@
     <Numeric name="WaferSize"        value="[WaferSize]"/>
     <Numeric name="SensorSeparation" value="[SensorSeparation]"/>
     <Numeric name="WaferThickness"   value="[WaferThicknessCoarse2]"/>
-    <Vector name="LayerNames" type="string" nEntries="7">
-      HGCalHEMotherBoard0Coarse2, HGCalHEConnector0Coarse2, HGCalHEPCB0Coarse2,
-      HGCalHEEpoxy0Coarse2, HGCalHEKapton0Coarse2, HGCalHESiliconSensitive0Coarse2, 
+    <Vector name="LayerNames" type="string" nEntries="8">
+      HGCalHEAirGap0Coarse2, HGCalHEMotherBoard0Coarse2, 
+      HGCalHEConnector0Coarse2, HGCalHEPCB0Coarse2, HGCalHEEpoxy0Coarse2,
+      HGCalHEKapton0Coarse2, HGCalHESiliconSensitive0Coarse2,
       HGCalHEBasePlate0Coarse2</Vector>
-    <Vector name="LayerMaterials" type="string" nEntries="7">
-      hgcalMaterial:HGC_G10-FR4, materials:Air, hgcalMaterial:HGC_G10-FR4, 
-      materials:Epoxy, materials:Kapton, materials:Silicon,
-      hgcalMaterial:HGC_G10-FR4</Vector>
-    <Vector name="LayerThickness" type="numeric" nEntries="7">
-      1.85*mm, 3.25*mm, 1.76*mm, 0.075*mm, 0.105*mm, [WaferThickness], 
-      1.1*mm </Vector>
-    <Vector name="LayerTypes" type="numeric" nEntries="7"> 
-      0, 0, 0, 0, 0, 1, 0 </Vector>
-    <Vector name="Layers" type="numeric" nEntries="9"> 
-      0, 1, 2, 3, 5, 3, 4, 3, 6 </Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="8">
+      materials:Air, hgcalMaterial:HGC_G10-FR4, hgcalMaterial:HGC_HEConnector,
+      hgcalMaterial:HGC_G10-FR4, materials:Epoxy, materials:Kapton, 
+      materials:Silicon, hgcalMaterial:HGC_G10-FR4</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="8">
+      0.40*mm, 1.60*mm, 3.475*mm, 1.60*mm, 0.075*mm, 0.10*mm, 
+      [WaferThickness], 1.0*mm </Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="8"> 
+      0, 0, 0, 0, 0, 0, 1, 0 </Vector>
+    <Vector name="Layers" type="numeric" nEntries="10"> 
+      0, 1, 2, 3, 4, 6, 4, 5, 4, 7 </Vector>
     <Numeric name="NCells"           value="[NumberOfCellsCoarse]"/>
     <Numeric name="CellType"         value="2"/>
     <Vector name="CellNames" type="string" nEntries="13">
@@ -331,21 +340,22 @@
     <Vector name="Orientations" type="numeric" nEntries="24">
       0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2,
       3, 4, 5</Vector>
-    <Vector name="LayerNames" type="string" nEntries="7">
-      HGCalEEMotherBoard0Fine, HGCalEEConnector0Fine, HGCalEEPCB0Fine,
-      HGCalEEEpoxy0Fine, HGCalEEKapton0Fine, HGCalEESensitive0Fine, 
+    <Vector name="LayerNames" type="string" nEntries="9">
+      HGCalEEAirGap0Fine, HGCalEEMotherBoard0Fine, 
+      HGCalEEConnector0Fine, HGCalEEPCB0Fine, HGCalEEEpoxy0Fine,
+      HGCalEEEpoxyT0Fine, HGCalEEKapton0Fine, HGCalEESensitive0Fine,
       HGCalEEBasePlate0Fine</Vector>
-    <Vector name="LayerMaterials" type="string" nEntries="7">
-      hgcalMaterial:HGC_G10-FR4, materials:Air, hgcalMaterial:HGC_G10-FR4, 
-      materials:Epoxy, materials:Kapton, materials:Silicon,
-      hgcalMaterial:WCu</Vector>
-    <Vector name="LayerThickness" type="numeric" nEntries="7">
-      1.85*mm, 3.25*mm, 1.76*mm, 0.0675*mm, 0.105*mm, [WaferThickness], 
-      1.45*mm </Vector>
-    <Vector name="LayerTypes" type="numeric" nEntries="7"> 
-      0, 0, 0, 0, 0, 1, 0 </Vector>
-    <Vector name="Layers" type="numeric" nEntries="11"> 
-      0, 1, 2, 3, 5, 3, 4, 3, 4, 3, 6 </Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="9">
+      materials:Air, hgcalMaterial:HGC_G10-FR4, hgcalMaterial:HGC_EEConnector,
+      hgcalMaterial:HGC_G10-FR4, materials:Epoxy, materials:Epoxy, 
+      materials:Kapton, materials:Silicon, hgcalMaterial:WCu</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="9">
+      0.225*mm, 1.60*mm, 3.73*mm, 1.60*mm, 0.075*mm, 0.065*mm, 0.265*mm, 
+      [WaferThickness], 1.40*mm </Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="9"> 
+      0, 0, 0, 0, 0, 0, 0, 1, 0 </Vector>
+    <Vector name="Layers" type="numeric" nEntries="10"> 
+      0, 1, 2, 3, 4, 7, 5, 6, 5, 8 </Vector>
     <String name="SenseName"    value="HGCalEECellSensitive0Fine"/>
     <Numeric name="SenseType"    value="0"/>
     <Numeric name="SenseThick"   value="[CellThicknessFine]"/>
@@ -367,21 +377,22 @@
     <Vector name="Orientations" type="numeric" nEntries="24">
       0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2,
       3, 4, 5</Vector>
-    <Vector name="LayerNames" type="string" nEntries="7">
-      HGCalEEMotherBoard1Fine, HGCalEEConnector1Fine, HGCalEEPCB1Fine,
-      HGCalEEEpoxy1Fine, HGCalEEKapton1Fine, HGCalEESensitive1Fine, 
+    <Vector name="LayerNames" type="string" nEntries="9">
+      HGCalEEAirGap1Fine, HGCalEEMotherBoard1Fine, 
+      HGCalEEConnector1Fine, HGCalEEPCB1Fine, HGCalEEEpoxy1Fine, 
+      HGCalEEEpoxyT1Fine, HGCalEEKapton1Fine, HGCalEESensitive1Fine,
       HGCalEEBasePlate1Fine</Vector>
-    <Vector name="LayerMaterials" type="string" nEntries="7">
-      hgcalMaterial:HGC_G10-FR4, materials:Air, hgcalMaterial:HGC_G10-FR4, 
-      materials:Epoxy, materials:Kapton, materials:Silicon,
-      hgcalMaterial:WCu</Vector>
-    <Vector name="LayerThickness" type="numeric" nEntries="7">
-      1.85*mm, 3.25*mm, 1.76*mm, 0.0675*mm, 0.105*mm, [WaferThickness], 
-      1.45*mm </Vector>
-    <Vector name="LayerTypes" type="numeric" nEntries="7"> 
-      0, 0, 0, 0, 0, 1, 0 </Vector>
-    <Vector name="Layers" type="numeric" nEntries="11"> 
-      6, 3, 4, 3, 4, 3, 5, 3, 2, 1, 0 </Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="9">
+      materials:Air, hgcalMaterial:HGC_G10-FR4, hgcalMaterial:HGC_EEConnector,
+      hgcalMaterial:HGC_G10-FR4, materials:Epoxy, materials:Epoxy, 
+      materials:Kapton, materials:Silicon, hgcalMaterial:WCu</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="9">
+      0.225*mm, 1.60*mm, 3.73*mm, 1.60*mm, 0.075*mm, 0.065*mm, 0.265*mm, 
+      [WaferThickness], 1.40*mm </Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="9"> 
+      0, 0, 0, 0, 0, 0, 0, 1, 0 </Vector>
+    <Vector name="Layers" type="numeric" nEntries="10"> 
+      8, 5, 6, 5, 7, 4, 3, 2, 1, 0 </Vector>
     <String name="SenseName"    value="HGCalEECellSensitive1Fine"/>
     <Numeric name="SenseType"    value="0"/>
     <Numeric name="SenseThick"   value="[CellThicknessFine]"/>
@@ -403,21 +414,22 @@
     <Vector name="Orientations" type="numeric" nEntries="24">
       0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2,
       3, 4, 5</Vector>
-    <Vector name="LayerNames" type="string" nEntries="7">
-      HGCalEEMotherBoard0Coarse1, HGCalEEConnector0Coarse1, HGCalEEPCB0Coarse1,
-      HGCalEEEpoxy0Coarse1, HGCalEEKapton0Coarse1, HGCalEESensitive0Coarse1, 
+    <Vector name="LayerNames" type="string" nEntries="9">
+      HGCalEEAirGap0Coarse1, HGCalEEMotherBoard0Coarse1, 
+      HGCalEEConnector0Coarse1, HGCalEEPCB0Coarse1, HGCalEEEpoxy0Coarse1, 
+      HGCalEEEpoxyT0Coarse1, HGCalEEKapton0Coarse1, HGCalEESensitive0Coarse1,
       HGCalEEBasePlate0Coarse1</Vector>
-    <Vector name="LayerMaterials" type="string" nEntries="7">
-      hgcalMaterial:HGC_G10-FR4, materials:Air, hgcalMaterial:HGC_G10-FR4, 
-      materials:Epoxy, materials:Kapton, materials:Silicon,
-      hgcalMaterial:WCu</Vector>
-    <Vector name="LayerThickness" type="numeric" nEntries="7">
-      1.85*mm, 3.25*mm, 1.76*mm, 0.0675*mm, 0.105*mm, [WaferThickness], 
-      1.45*mm </Vector>
-    <Vector name="LayerTypes" type="numeric" nEntries="7"> 
-      0, 0, 0, 0, 0, 1, 0 </Vector>
-    <Vector name="Layers" type="numeric" nEntries="11"> 
-      0, 1, 2, 3, 5, 3, 4, 3, 4, 3, 6 </Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="9">
+      materials:Air, hgcalMaterial:HGC_G10-FR4, hgcalMaterial:HGC_EEConnector,
+      hgcalMaterial:HGC_G10-FR4, materials:Epoxy, materials:Epoxy, 
+      materials:Kapton, materials:Silicon, hgcalMaterial:WCu</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="9">
+      0.225*mm, 1.60*mm, 3.73*mm, 1.60*mm, 0.075*mm, 0.065*mm, 0.265*mm, 
+      [WaferThickness], 1.40*mm </Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="9"> 
+      0, 0, 0, 0, 0, 0, 0, 1, 0 </Vector>
+    <Vector name="Layers" type="numeric" nEntries="10"> 
+      0, 1, 2, 3, 4, 7, 5, 6, 5, 8 </Vector>
     <String name="SenseName"    value="HGCalEECellSensitive0Coares1"/>
     <Numeric name="SenseType"    value="1"/>
     <Numeric name="SenseThick"   value="[CellThicknessCoarse1]"/>
@@ -439,21 +451,22 @@
     <Vector name="Orientations" type="numeric" nEntries="24">
       0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2,
       3, 4, 5</Vector>
-    <Vector name="LayerNames" type="string" nEntries="7">
-      HGCalEEMotherBoard1Coarse1, HGCalEEConnector1Coarse1, HGCalEEPCB1Coarse1,
-      HGCalEEEpoxy1Coarse1, HGCalEEKapton1Coarse1, HGCalEESensitive1Coarse1, 
+    <Vector name="LayerNames" type="string" nEntries="9">
+      HGCalEEAirGap1Coarse1, HGCalEEMotherBoard1Coarse1, 
+      HGCalEEConnector1Coarse1, HGCalEEPCB1Coarse1, HGCalEEEpoxy1Coarse1, 
+      HGCalEEEpoxyT1Coarse1, HGCalEEKapton1Coarse1, HGCalEESensitive1Coarse1,
       HGCalEEBasePlate1Coarse1</Vector>
-    <Vector name="LayerMaterials" type="string" nEntries="7">
-      hgcalMaterial:HGC_G10-FR4, materials:Air, hgcalMaterial:HGC_G10-FR4, 
-      materials:Epoxy, materials:Kapton, materials:Silicon,
-      hgcalMaterial:WCu</Vector>
-    <Vector name="LayerThickness" type="numeric" nEntries="7">
-      1.85*mm, 3.25*mm, 1.76*mm, 0.0675*mm, 0.105*mm, [WaferThickness], 
-      1.45*mm </Vector>
-    <Vector name="LayerTypes" type="numeric" nEntries="7"> 
-      0, 0, 0, 0, 0, 1, 0 </Vector>
-    <Vector name="Layers" type="numeric" nEntries="11"> 
-      6, 3, 4, 3, 4, 3, 5, 3, 2, 1, 0 </Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="9">
+      materials:Air, hgcalMaterial:HGC_G10-FR4, hgcalMaterial:HGC_EEConnector,
+      hgcalMaterial:HGC_G10-FR4, materials:Epoxy, materials:Epoxy, 
+      materials:Kapton, materials:Silicon, hgcalMaterial:WCu</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="9">
+      0.225*mm, 1.60*mm, 3.73*mm, 1.60*mm, 0.075*mm, 0.065*mm, 0.265*mm, 
+      [WaferThickness], 1.40*mm </Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="9"> 
+      0, 0, 0, 0, 0, 0, 0, 1, 0 </Vector>
+    <Vector name="Layers" type="numeric" nEntries="10"> 
+      8, 5, 6, 5, 7, 4, 3, 2, 1, 0 </Vector>
     <String name="SenseName"    value="HGCalEECellSensitive1Coares1"/>
     <Numeric name="SenseType"    value="1"/>
     <Numeric name="SenseThick"   value="[CellThicknessCoarse1]"/>
@@ -475,21 +488,22 @@
     <Vector name="Orientations" type="numeric" nEntries="24">
       0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2,
       3, 4, 5</Vector>
-    <Vector name="LayerNames" type="string" nEntries="7">
-      HGCalEEMotherBoard0Coarse2, HGCalEEConnector0Coarse2, HGCalEEPCB0Coarse2,
-      HGCalEEEpoxy0Coarse2, HGCalEEKapton0Coarse2, HGCalEESensitive0Coarse2, 
+    <Vector name="LayerNames" type="string" nEntries="9">
+      HGCalEEAirGap0Coarse2, HGCalEEMotherBoard0Coarse2, 
+      HGCalEEConnector0Coarse2, HGCalEEPCB0Coarse2, HGCalEEEpoxy0Coarse2, 
+      HGCalEEEpoxyT0Coarse2, HGCalEEKapton0Coarse2, HGCalEESensitive0Coarse2,
       HGCalEEBasePlate0Coarse2</Vector>
-    <Vector name="LayerMaterials" type="string" nEntries="7">
-      hgcalMaterial:HGC_G10-FR4, materials:Air, hgcalMaterial:HGC_G10-FR4, 
-      materials:Epoxy, materials:Kapton, materials:Silicon,
-      hgcalMaterial:WCu</Vector>
-    <Vector name="LayerThickness" type="numeric" nEntries="7">
-      1.85*mm, 3.25*mm, 1.76*mm, 0.0675*mm, 0.105*mm, [WaferThickness], 
-      1.45*mm </Vector>
-    <Vector name="LayerTypes" type="numeric" nEntries="7"> 
-      0, 0, 0, 0, 0, 1, 0 </Vector>
-    <Vector name="Layers" type="numeric" nEntries="11"> 
-      0, 1, 2, 3, 5, 3, 4, 3, 4, 3, 6 </Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="9">
+      materials:Air, hgcalMaterial:HGC_G10-FR4, hgcalMaterial:HGC_EEConnector,
+      hgcalMaterial:HGC_G10-FR4, materials:Epoxy, materials:Epoxy, 
+      materials:Kapton, materials:Silicon, hgcalMaterial:WCu</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="9">
+      0.225*mm, 1.60*mm, 3.73*mm, 1.60*mm, 0.075*mm, 0.065*mm, 0.265*mm, 
+      [WaferThickness], 1.40*mm </Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="9"> 
+      0, 0, 0, 0, 0, 0, 0, 1, 0 </Vector>
+    <Vector name="Layers" type="numeric" nEntries="10"> 
+      0, 1, 2, 3, 4, 7, 5, 6, 5, 8 </Vector>
     <String name="SenseName"    value="HGCalEECellSensitive0Coares2"/>
     <Numeric name="SenseType"    value="2"/>
     <Numeric name="SenseThick"   value="[CellThicknessCoarse2]"/>
@@ -511,21 +525,22 @@
     <Vector name="Orientations" type="numeric" nEntries="24">
       0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2,
       3, 4, 5</Vector>
-    <Vector name="LayerNames" type="string" nEntries="7">
-      HGCalEEMotherBoard1Coarse2, HGCalEEConnector1Coarse2, HGCalEEPCB1Coarse2,
-      HGCalEEEpoxy1Coarse2, HGCalEEKapton1Coarse2, HGCalEESensitive1Coarse2, 
+    <Vector name="LayerNames" type="string" nEntries="9">
+      HGCalEEAirGap1Coarse2, HGCalEEMotherBoard1Coarse2, 
+      HGCalEEConnector1Coarse2, HGCalEEPCB1Coarse2, HGCalEEEpoxy1Coarse2, 
+      HGCalEEEpoxyT1Coarse2, HGCalEEKapton1Coarse2, HGCalEESensitive1Coarse2,
       HGCalEEBasePlate1Coarse2</Vector>
-    <Vector name="LayerMaterials" type="string" nEntries="7">
-      hgcalMaterial:HGC_G10-FR4, materials:Air, hgcalMaterial:HGC_G10-FR4, 
-      materials:Epoxy, materials:Kapton, materials:Silicon,
-      hgcalMaterial:WCu</Vector>
-    <Vector name="LayerThickness" type="numeric" nEntries="7">
-      1.85*mm, 3.25*mm, 1.76*mm, 0.0675*mm, 0.105*mm, [WaferThickness], 
-      1.45*mm </Vector>
-    <Vector name="LayerTypes" type="numeric" nEntries="7"> 
-      0, 0, 0, 0, 0, 1, 0 </Vector>
-    <Vector name="Layers" type="numeric" nEntries="11"> 
-      6, 3, 4, 3, 4, 3, 5, 3, 2, 1, 0 </Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="9">
+      materials:Air, hgcalMaterial:HGC_G10-FR4, hgcalMaterial:HGC_EEConnector,
+      hgcalMaterial:HGC_G10-FR4, materials:Epoxy, materials:Epoxy, 
+      materials:Kapton, materials:Silicon, hgcalMaterial:WCu</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="9">
+      0.225*mm, 1.60*mm, 3.73*mm, 1.60*mm, 0.075*mm, 0.065*mm, 0.265*mm, 
+      [WaferThickness], 1.40*mm </Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="9"> 
+      0, 0, 0, 0, 0, 0, 0, 1, 0 </Vector>
+    <Vector name="Layers" type="numeric" nEntries="10"> 
+      8, 5, 6, 5, 7, 4, 3, 2, 1, 0 </Vector>
     <String name="SenseName"    value="HGCalEECellSensitive1Coares2"/>
     <Numeric name="SenseType"    value="2"/>
     <Numeric name="SenseThick"   value="[CellThicknessCoarse2]"/>
@@ -547,21 +562,22 @@
     <Vector name="Orientations" type="numeric" nEntries="24">
       0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2,
       3, 4, 5</Vector>
-    <Vector name="LayerNames" type="string" nEntries="7">
-      HGCalHEMotherBoard0Fine, HGCalHEConnector0Fine, HGCalHEPCB0Fine,
-      HGCalHEEpoxy0Fine, HGCalHEKapton0Fine, HGCalHESiliconSensitive0Fine, 
+    <Vector name="LayerNames" type="string" nEntries="8">
+      HGCalHEAirGap0Fine, HGCalHEMotherBoard0Fine, 
+      HGCalHEConnector0Fine, HGCalHEPCB0Fine, HGCalHEEpoxy0Fine,
+      HGCalHEKapton0Fine, HGCalHESiliconSensitive0Fine,
       HGCalHEBasePlate0Fine</Vector>
-    <Vector name="LayerMaterials" type="string" nEntries="7">
-      hgcalMaterial:HGC_G10-FR4, materials:Air, hgcalMaterial:HGC_G10-FR4, 
-      materials:Epoxy, materials:Kapton, materials:Silicon,
-      hgcalMaterial:HGC_G10-FR4</Vector>
-    <Vector name="LayerThickness" type="numeric" nEntries="7">
-      1.85*mm, 3.25*mm, 1.76*mm, 0.075*mm, 0.105*mm, [WaferThickness], 
-      1.1*mm </Vector>
-    <Vector name="LayerTypes" type="numeric" nEntries="7"> 
-      0, 0, 0, 0, 0, 1, 0 </Vector>
-    <Vector name="Layers" type="numeric" nEntries="9"> 
-      0, 1, 2, 3, 5, 3, 4, 3, 6 </Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="8">
+      materials:Air, hgcalMaterial:HGC_G10-FR4, hgcalMaterial:HGC_HEConnector,
+      hgcalMaterial:HGC_G10-FR4, materials:Epoxy, materials:Kapton, 
+      materials:Silicon, hgcalMaterial:HGC_G10-FR4</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="8">
+      0.40*mm, 1.60*mm, 3.475*mm, 1.60*mm, 0.075*mm, 0.10*mm, 
+      [WaferThickness], 1.0*mm </Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="8"> 
+      0, 0, 0, 0, 0, 0, 1, 0 </Vector>
+    <Vector name="Layers" type="numeric" nEntries="10"> 
+      0, 1, 2, 3, 4, 6, 4, 5, 4, 7 </Vector>
     <String name="SenseName"    value="HGCalHESiliconCellSensitive0Fine"/>
     <Numeric name="SenseType"    value="0"/>
     <Numeric name="SenseThick"   value="[CellThicknessFine]"/>
@@ -583,21 +599,22 @@
     <Vector name="Orientations" type="numeric" nEntries="24">
       0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2,
       3, 4, 5</Vector>
-    <Vector name="LayerNames" type="string" nEntries="7">
-      HGCalHEMotherBoard0Coarse1, HGCalHEConnector0Coarse1, HGCalHEPCB0Coarse1,
-      HGCalHEEpoxy0Coarse1, HGCalHEKapton0Coarse1, HGCalHESiliconSensitive0Coarse1, 
+    <Vector name="LayerNames" type="string" nEntries="8">
+      HGCalHEAirGap0Coarse1, HGCalHEMotherBoard0Coarse1, 
+      HGCalHEConnector0Coarse1, HGCalHEPCB0Coarse1, HGCalHEEpoxy0Coarse1, 
+      HGCalHEKapton0Coarse1, HGCalHESiliconSensitive0Coarse1, 
       HGCalHEBasePlate0Coarse1</Vector>
-    <Vector name="LayerMaterials" type="string" nEntries="7">
-      hgcalMaterial:HGC_G10-FR4, materials:Air, hgcalMaterial:HGC_G10-FR4, 
-      materials:Epoxy, materials:Kapton, materials:Silicon,
-      hgcalMaterial:HGC_G10-FR4</Vector>
-    <Vector name="LayerThickness" type="numeric" nEntries="7">
-      1.85*mm, 3.25*mm, 1.76*mm, 0.075*mm, 0.105*mm, [WaferThickness], 
-      1.1*mm </Vector>
-    <Vector name="LayerTypes" type="numeric" nEntries="7"> 
-      0, 0, 0, 0, 0, 1, 0 </Vector>
-    <Vector name="Layers" type="numeric" nEntries="9"> 
-      0, 1, 2, 3, 5, 3, 4, 3, 6 </Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="8">
+      materials:Air, hgcalMaterial:HGC_G10-FR4, hgcalMaterial:HGC_HEConnector,
+      hgcalMaterial:HGC_G10-FR4, materials:Epoxy, materials:Kapton, 
+      materials:Silicon, hgcalMaterial:HGC_G10-FR4</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="8">
+      0.40*mm, 1.60*mm, 3.475*mm, 1.60*mm, 0.075*mm, 0.10*mm, 
+      [WaferThickness], 1.0*mm </Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="8"> 
+      0, 0, 0, 0, 0, 0, 1, 0 </Vector>
+    <Vector name="Layers" type="numeric" nEntries="10"> 
+      0, 1, 2, 3, 4, 6, 4, 5, 4, 7 </Vector>
     <String name="SenseName"    value="HGCalHESiliconCellSensitive0Coarse1"/>
     <Numeric name="SenseType"    value="1"/>
     <Numeric name="SenseThick"   value="[CellThicknessCoarse1]"/>
@@ -619,21 +636,22 @@
     <Vector name="Orientations" type="numeric" nEntries="24">
       0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2,
       3, 4, 5</Vector>
-    <Vector name="LayerNames" type="string" nEntries="7">
-      HGCalHEMotherBoard0Coarse2, HGCalHEConnector0Coarse2, HGCalHEPCB0Coarse2,
-      HGCalHEEpoxy0Coarse2, HGCalHEKapton0Coarse2, HGCalHESiliconSensitive0Coarse2, 
+    <Vector name="LayerNames" type="string" nEntries="8">
+      HGCalHEAirGap0Coarse2, HGCalHEMotherBoard0Coarse2, 
+      HGCalHEConnector0Coarse2, HGCalHEPCB0Coarse2, HGCalHEEpoxy0Coarse2,
+      HGCalHEKapton0Coarse2, HGCalHESiliconSensitive0Coarse2,
       HGCalHEBasePlate0Coarse2</Vector>
-    <Vector name="LayerMaterials" type="string" nEntries="7">
-      hgcalMaterial:HGC_G10-FR4, materials:Air, hgcalMaterial:HGC_G10-FR4, 
-      materials:Epoxy, materials:Kapton, materials:Silicon,
-      hgcalMaterial:HGC_G10-FR4</Vector>
-    <Vector name="LayerThickness" type="numeric" nEntries="7">
-      1.85*mm, 3.25*mm, 1.76*mm, 0.075*mm, 0.105*mm, [WaferThickness], 
-      1.1*mm </Vector>
-    <Vector name="LayerTypes" type="numeric" nEntries="7"> 
-      0, 0, 0, 0, 0, 1, 0 </Vector>
-    <Vector name="Layers" type="numeric" nEntries="9"> 
-      0, 1, 2, 3, 5, 3, 4, 3, 6 </Vector>
+    <Vector name="LayerMaterials" type="string" nEntries="8">
+      materials:Air, hgcalMaterial:HGC_G10-FR4, hgcalMaterial:HGC_HEConnector,
+      hgcalMaterial:HGC_G10-FR4, materials:Epoxy, materials:Kapton, 
+      materials:Silicon, hgcalMaterial:HGC_G10-FR4</Vector>
+    <Vector name="LayerThickness" type="numeric" nEntries="8">
+      0.40*mm, 1.60*mm, 3.475*mm, 1.60*mm, 0.075*mm, 0.10*mm, 
+      [WaferThickness], 1.0*mm </Vector>
+    <Vector name="LayerTypes" type="numeric" nEntries="8"> 
+      0, 0, 0, 0, 0, 0, 1, 0 </Vector>
+    <Vector name="Layers" type="numeric" nEntries="10"> 
+      0, 1, 2, 3, 4, 6, 4, 5, 4, 7 </Vector>
     <String name="SenseName"    value="HGCalHESiliconCellSensitive0Coarse2"/>
     <Numeric name="SenseType"    value="2"/>
     <Numeric name="SenseThick"   value="[CellThicknessCoarse2]"/>
diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalMixLayer.cc b/Geometry/HGCalCommonData/plugins/DDHGCalMixLayer.cc
index 3a773d96f2d43..37e53ff758f79 100644
--- a/Geometry/HGCalCommonData/plugins/DDHGCalMixLayer.cc
+++ b/Geometry/HGCalCommonData/plugins/DDHGCalMixLayer.cc
@@ -153,10 +153,10 @@ void DDHGCalMixLayer::initialize(const DDNumericArguments& nArgs,
   rMaxFront_ = vArgs["RMaxFront"];
 #ifdef EDM_ML_DEBUG
   for (unsigned int i = 0; i < slopeB_.size(); ++i)
-    edm::LogVerbatim("HGCalGeom") << "Block [" << i << "] Zmin " << zFrontB_[i] << " Rmin " << rMinFront_[i]
+    edm::LogVerbatim("HGCalGeom") << "Bottom Block [" << i << "] Zmin " << zFrontB_[i] << " Rmin " << rMinFront_[i]
                                   << " Slope " << slopeB_[i];
   for (unsigned int i = 0; i < slopeT_.size(); ++i)
-    edm::LogVerbatim("HGCalGeom") << "Block [" << i << "] Zmin " << zFrontT_[i] << " Rmax " << rMaxFront_[i]
+    edm::LogVerbatim("HGCalGeom") << "Top Block [" << i << "] Zmin " << zFrontT_[i] << " Rmax " << rMaxFront_[i]
                                   << " Slope " << slopeT_[i];
 #endif
   waferFull_ = vsArgs["WaferNamesFull"];
diff --git a/Geometry/HGCalCommonData/plugins/dd4hep/DDHGCalMixLayer.cc b/Geometry/HGCalCommonData/plugins/dd4hep/DDHGCalMixLayer.cc
index 081e56ba3c389..edb275f11cc9d 100644
--- a/Geometry/HGCalCommonData/plugins/dd4hep/DDHGCalMixLayer.cc
+++ b/Geometry/HGCalCommonData/plugins/dd4hep/DDHGCalMixLayer.cc
@@ -75,10 +75,10 @@ struct HGCalMixLayer {
     rMaxFront_ = args.value<std::vector<double>>("RMaxFront");
 #ifdef EDM_ML_DEBUG
     for (unsigned int i = 0; i < slopeB_.size(); ++i)
-      edm::LogVerbatim("HGCalGeom") << "Block [" << i << "] Zmin " << cms::convert2mm(zFrontB_[i]) << " Rmin "
+      edm::LogVerbatim("HGCalGeom") << "Bottom Block [" << i << "] Zmin " << cms::convert2mm(zFrontB_[i]) << " Rmin "
                                     << cms::convert2mm(rMinFront_[i]) << " Slope " << slopeB_[i];
     for (unsigned int i = 0; i < slopeT_.size(); ++i)
-      edm::LogVerbatim("HGCalGeom") << "Block [" << i << "] Zmin " << cms::convert2mm(zFrontT_[i]) << " Rmax "
+      edm::LogVerbatim("HGCalGeom") << "Top Block [" << i << "] Zmin " << cms::convert2mm(zFrontT_[i]) << " Rmax "
                                     << cms::convert2mm(rMaxFront_[i]) << " Slope " << slopeT_[i];
 #endif
 
diff --git a/Geometry/HGCalCommonData/python/testHGCalWaferFXML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalWaferFXML_cfi.py
index 294a7853b536e..7aa7a0db312b6 100644
--- a/Geometry/HGCalCommonData/python/testHGCalWaferFXML_cfi.py
+++ b/Geometry/HGCalCommonData/python/testHGCalWaferFXML_cfi.py
@@ -4,7 +4,7 @@
     geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
         'Geometry/CMSCommonData/data/rotations.xml',
         'Geometry/HGCalCommonData/data/hgcalwafer/v1/cms.xml',
-        'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
+        'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml',
         'Geometry/HGCalCommonData/data/hgcalwafer/v15f/hgcal.xml',
         'Geometry/HGCalCommonData/data/hgcalcell/v15/hgcalcell.xml',
         'Geometry/HGCalCommonData/data/hgcalwafer/v15f/hgcalwafer.xml',
diff --git a/Geometry/HGCalCommonData/python/testHGCalWaferPXML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalWaferPXML_cfi.py
index cd0409ef01230..e763c478fe928 100644
--- a/Geometry/HGCalCommonData/python/testHGCalWaferPXML_cfi.py
+++ b/Geometry/HGCalCommonData/python/testHGCalWaferPXML_cfi.py
@@ -4,7 +4,7 @@
     geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
         'Geometry/CMSCommonData/data/rotations.xml',
         'Geometry/HGCalCommonData/data/hgcalwafer/v1/cms.xml',
-        'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
+        'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml',
         'Geometry/HGCalCommonData/data/hgcalwafer/v16p/hgcal.xml',
         'Geometry/HGCalCommonData/data/hgcalcell/v16/hgcalcell.xml',
         'Geometry/HGCalCommonData/data/hgcalwafer/v16p/hgcalwafer.xml',