diff --git a/Geometry/MuonCommonData/data/PhaseII/NoME0/mf.xml b/Geometry/MuonCommonData/data/PhaseII/NoME0/mf.xml
index fd9872c0fa8aa..39b211306504e 100644
--- a/Geometry/MuonCommonData/data/PhaseII/NoME0/mf.xml
+++ b/Geometry/MuonCommonData/data/PhaseII/NoME0/mf.xml
@@ -17,8 +17,8 @@
    <ZSection z="[cms:MuonBeamZ2]" rMin="[cms:MERmin3]" rMax="[cms:CMSR1]"/>
   </Polycone>
   <Polycone name="ME1Ring" startPhi="0*deg" deltaPhi="360*deg">
-   <ZSection z="5.641*m  " rMin="1.3*m " rMax="2.8*m  "/>
-   <ZSection z="5.674*m  " rMin="1.3*m " rMax="2.8*m  "/>
+   <ZSection z="5.641*m  " rMin="1.15*m" rMax="2.8*m  "/>
+   <ZSection z="5.674*m  " rMin="1.15*m" rMax="2.8*m  "/>
    <ZSection z="5.674*m  " rMin="85*cm " rMax="2.8*m  "/>
    <ZSection z="6.345*m  " rMin="85*cm " rMax="2.8*m  "/>
   </Polycone>
diff --git a/Geometry/MuonCommonData/data/PhaseII/NoME0/mfshield.xml b/Geometry/MuonCommonData/data/PhaseII/NoME0/mfshield.xml
index 4dedc07d28440..f2fbab30b8a29 100644
--- a/Geometry/MuonCommonData/data/PhaseII/NoME0/mfshield.xml
+++ b/Geometry/MuonCommonData/data/PhaseII/NoME0/mfshield.xml
@@ -3,26 +3,28 @@
 
  <SolidSection label="mfshield.xml">
   <Polycone name="SupportTubeForHE" startPhi="0*deg" deltaPhi="360*deg">
-   <ZSection z="5.541*m  " rMin="67.5*cm " rMax="2.51*m  "/>
-   <ZSection z="5.641*m  " rMin="67.5*cm " rMax="2.51*m  "/>
-   <ZSection z="5.641*m  " rMin="67.5*cm " rMax="1.3*m  "/>
-   <ZSection z="5.674*m  " rMin="67.5*cm " rMax="1.3*m  "/>
-   <ZSection z="5.674*m  " rMin="67.5*cm " rMax="85*cm "/>
-   <ZSection z="6590*mm" rMin="67.5*cm " rMax="85*cm "/>
-   <ZSection z="6.835*m  " rMin="701*mm" rMax="85*cm "/>
+   <ZSection z="5541*mm" rMin="675*mm" rMax="2510*mm"/>
+   <ZSection z="5641*mm" rMin="675*mm" rMax="2510*mm"/>
+   <ZSection z="5641*mm" rMin="675*mm" rMax="1150*mm"/>
+   <ZSection z="5674*mm" rMin="675*mm" rMax="1150*mm"/>
+   <ZSection z="5674*mm" rMin="675*mm" rMax="850*mm"/>
+   <ZSection z="6590*mm" rMin="675*mm" rMax="850*mm"/>
+   <ZSection z="6835*mm" rMin="701*mm" rMax="850*mm"/>
   </Polycone>
-  <Tubs name="ShieldingBoronPoly_1_ME1" rMin="965*mm" rMax="1240*mm" dz="2*cm " startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingAntinomyLead_1_ME1" rMin="965*mm" rMax="1240*mm" dz="6.49995*mm " startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingBoronPoly_2_ME1" rMin="85.1*cm " rMax="88.1*cm " dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingAntinomyLead_2_ME1" rMin="88.2*cm " rMax="89.5*cm " dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingBoronPoly_3_ME1" rMin="89.6*cm " rMax="941*mm" dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingAntinomyLead_3_ME1" rMin="942*mm" rMax="955*mm" dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingBoronPoly_4_ME1" rMin="85.1*cm " rMax="88.1*cm " dz="136*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingAntinomyLead_4_ME1" rMin="88.2*cm " rMax="89.5*cm " dz="136*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingBoronPoly_5_ME1" rMin="89.6*cm " rMax="931*mm" dz="136*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingAntinomyLead_5_ME1" rMin="932*mm" rMax="945*mm" dz="136*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingAntinomyLead_6_ME1" rMin="945.1*mm" rMax="2330*mm" dz="5*mm " startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingBoronPoly_6_ME1" rMin="945.1*mm" rMax="2330*mm" dz="11.9*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingBoronPoly_0_ME1"    rMin="1150*mm" rMax="1227*mm" dz="16*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingAntinomyLead_0_ME1" rMin="1227*mm" rMax="1240*mm" dz="42.5*mm"  startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingBoronPoly_1_ME1"    rMin="936*mm"  rMax="1227*mm" dz="20*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingAntinomyLead_1_ME1" rMin="965*mm"  rMax="1227*mm" dz="6.5*mm"  startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingBoronPoly_2_ME1"    rMin="850*mm"  rMax="880*mm"  dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingAntinomyLead_2_ME1" rMin="880*mm"  rMax="893*mm"  dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingBoronPoly_3_ME1"    rMin="893*mm"  rMax="923*mm"  dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingAntinomyLead_3_ME1" rMin="923*mm"  rMax="936*mm"  dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingBoronPoly_4_ME1"    rMin="850*mm"  rMax="880*mm"  dz="136*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingAntinomyLead_4_ME1" rMin="880*mm"  rMax="893*mm"  dz="136*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingBoronPoly_5_ME1"    rMin="893*mm " rMax="923*mm"  dz="136*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingAntinomyLead_5_ME1" rMin="923*mm"  rMax="936*mm"  dz="136*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingAntinomyLead_6_ME1" rMin="936*mm"  rMax="2330*mm" dz="5*mm " startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingBoronPoly_6_ME1"    rMin="936*mm"  rMax="2330*mm" dz="12*mm" startPhi="0*deg" deltaPhi="360*deg"/>
   <Tubs name="ZStopSpace" rMin="4.694*m  " rMax="4.955*m  " dz="32*cm " startPhi="0*deg" deltaPhi="360*deg"/>
   <Tubs name="ZStop_1_ZStopSpaceDivision" rMin="4.694*m  " rMax="4.955*m  " dz="32*cm " startPhi="346.25*deg" deltaPhi="3.0999999*deg"/>
   <Tubs name="ZStop_2_ZStopSpaceDivision" rMin="4.694*m  " rMax="4.955*m  " dz="32*cm " startPhi="10.75*deg" deltaPhi="3.0999999*deg"/>
@@ -52,6 +54,14 @@
    <rSolid name="SupportTubeForHE"/>
    <rMaterial name="materials:StainlessSteel"/>
   </LogicalPart>
+  <LogicalPart name="ShieldingBoronPoly_0_ME1" category="unspecified">
+   <rSolid name="ShieldingBoronPoly_0_ME1"/>
+   <rMaterial name="materials:Boron Polyethyl."/>
+  </LogicalPart>
+  <LogicalPart name="ShieldingAntinomyLead_0_ME1" category="unspecified">
+   <rSolid name="ShieldingAntinomyLead_0_ME1"/>
+   <rMaterial name="materials:AntiLead"/>
+  </LogicalPart>
   <LogicalPart name="ShieldingBoronPoly_1_ME1" category="unspecified">
    <rSolid name="ShieldingBoronPoly_1_ME1"/>
    <rMaterial name="materials:Boron Polyethyl."/>
@@ -199,17 +209,29 @@
    <rParent name="mf:MEN"/>
    <rChild name="mfshield:SupportTubeForHE"/>
   </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="mf:ME1RingP"/>
+   <rChild name="mfshield:ShieldingBoronPoly_0_ME1"/>
+   <rRotation name="rotations:000D"/>
+   <Translation x="0*fm " y="0*fm " z="5658*mm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="mf:ME1RingP"/>
+   <rChild name="mfshield:ShieldingAntinomyLead_0_ME1"/>
+   <rRotation name="rotations:000D"/>
+   <Translation x="0*fm " y="0*fm " z="5684.5*mm"/>
+  </PosPart>
   <PosPart copyNumber="1">
    <rParent name="mf:ME1RingP"/>
    <rChild name="mfshield:ShieldingBoronPoly_1_ME1"/>
    <rRotation name="rotations:000D"/>
-   <Translation x="0*fm " y="0*fm " z="5698*mm"/>
+   <Translation x="0*fm " y="0*fm " z="5694*mm"/>
   </PosPart>
   <PosPart copyNumber="1">
    <rParent name="mf:ME1RingP"/>
    <rChild name="mfshield:ShieldingAntinomyLead_1_ME1"/>
    <rRotation name="rotations:000D"/>
-   <Translation x="0*fm " y="0*fm " z="5724.5*mm"/>
+   <Translation x="0*fm " y="0*fm " z="5720.5*mm"/>
   </PosPart>
   <PosPart copyNumber="2">
    <rParent name="mf:ME1RingP"/>
@@ -271,17 +293,29 @@
    <rRotation name="rotations:000D"/>
    <Translation x="0*fm " y="0*fm " z="6333*mm"/>
   </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="mf:ME1RingN"/>
+   <rChild name="mfshield:ShieldingBoronPoly_0_ME1"/>
+   <rRotation name="rotations:000D"/>
+   <Translation x="0*fm " y="0*fm " z="5658*mm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="mf:ME1RingN"/>
+   <rChild name="mfshield:ShieldingAntinomyLead_0_ME1"/>
+   <rRotation name="rotations:000D"/>
+   <Translation x="0*fm " y="0*fm " z="5684.5*mm"/>
+  </PosPart>
   <PosPart copyNumber="1">
    <rParent name="mf:ME1RingN"/>
    <rChild name="mfshield:ShieldingBoronPoly_1_ME1"/>
    <rRotation name="rotations:000D"/>
-   <Translation x="0*fm " y="0*fm " z="5698*mm"/>
+   <Translation x="0*fm " y="0*fm " z="5694*mm"/>
   </PosPart>
   <PosPart copyNumber="1">
    <rParent name="mf:ME1RingN"/>
    <rChild name="mfshield:ShieldingAntinomyLead_1_ME1"/>
    <rRotation name="rotations:000D"/>
-   <Translation x="0*fm " y="0*fm " z="5724.5*mm"/>
+   <Translation x="0*fm " y="0*fm " z="5720.5*mm"/>
   </PosPart>
   <PosPart copyNumber="2">
    <rParent name="mf:ME1RingN"/>
diff --git a/Geometry/MuonCommonData/data/PhaseII/mf.xml b/Geometry/MuonCommonData/data/PhaseII/mf.xml
index a966794462ba9..40c32283a4621 100644
--- a/Geometry/MuonCommonData/data/PhaseII/mf.xml
+++ b/Geometry/MuonCommonData/data/PhaseII/mf.xml
@@ -30,8 +30,8 @@
    <ZSection z="[z2ME0]" rMin="[rMinME0]" rMax="[rMaxME0]"/>
   </Polycone>
   <Polycone name="ME1Ring" startPhi="0*deg" deltaPhi="360*deg">
-   <ZSection z="5.641*m  " rMin="1.3*m " rMax="2.8*m  "/>
-   <ZSection z="5.674*m  " rMin="1.3*m " rMax="2.8*m  "/>
+   <ZSection z="5.641*m  " rMin="1.15*m" rMax="2.8*m  "/>
+   <ZSection z="5.674*m  " rMin="1.15*m" rMax="2.8*m  "/>
    <ZSection z="5.674*m  " rMin="85*cm " rMax="2.8*m  "/>
    <ZSection z="6.345*m  " rMin="85*cm " rMax="2.8*m  "/>
   </Polycone>
diff --git a/Geometry/MuonCommonData/data/upscope/2.1Eta/mf.xml b/Geometry/MuonCommonData/data/upscope/2.1Eta/mf.xml
index 7391879216f64..aa8ff06f007e6 100644
--- a/Geometry/MuonCommonData/data/upscope/2.1Eta/mf.xml
+++ b/Geometry/MuonCommonData/data/upscope/2.1Eta/mf.xml
@@ -17,8 +17,8 @@
    <ZSection z="[cms:MuonBeamZ2]" rMin="[cms:MERmin3]" rMax="[cms:CMSR1]"/>
   </Polycone>
   <Polycone name="ME1Ring" startPhi="0*deg" deltaPhi="360*deg">
-   <ZSection z="5.641*m  " rMin="1.3*m " rMax="2.8*m  "/>
-   <ZSection z="5.674*m  " rMin="1.3*m " rMax="2.8*m  "/>
+   <ZSection z="5.641*m  " rMin="1.15*m" rMax="2.8*m  "/>
+   <ZSection z="5.674*m  " rMin="1.15*m" rMax="2.8*m  "/>
    <ZSection z="5.674*m  " rMin="85*cm " rMax="2.8*m  "/>
    <ZSection z="6.345*m  " rMin="85*cm " rMax="2.8*m  "/>
   </Polycone>
diff --git a/Geometry/MuonCommonData/data/upscope/2.1Eta/mfshield.xml b/Geometry/MuonCommonData/data/upscope/2.1Eta/mfshield.xml
index 3f2ba444ced76..abe7471d4c5c3 100644
--- a/Geometry/MuonCommonData/data/upscope/2.1Eta/mfshield.xml
+++ b/Geometry/MuonCommonData/data/upscope/2.1Eta/mfshield.xml
@@ -3,26 +3,28 @@
 
  <SolidSection label="mfshield.xml">
   <Polycone name="SupportTubeForHE" startPhi="0*deg" deltaPhi="360*deg">
-   <ZSection z="5.541*m  " rMin="67.5*cm " rMax="2.51*m  "/>
-   <ZSection z="5.641*m  " rMin="67.5*cm " rMax="2.51*m  "/>
-   <ZSection z="5.641*m  " rMin="67.5*cm " rMax="1.3*m  "/>
-   <ZSection z="5.674*m  " rMin="67.5*cm " rMax="1.3*m  "/>
-   <ZSection z="5.674*m  " rMin="67.5*cm " rMax="85*cm "/>
-   <ZSection z="6590*mm" rMin="67.5*cm " rMax="85*cm "/>
-   <ZSection z="6.835*m  " rMin="701*mm" rMax="85*cm "/>
+   <ZSection z="5541*mm" rMin="675*mm" rMax="2510*mm"/>
+   <ZSection z="5641*mm" rMin="675*mm" rMax="2510*mm"/>
+   <ZSection z="5641*mm" rMin="675*mm" rMax="1150*mm"/>
+   <ZSection z="5674*mm" rMin="675*mm" rMax="1150*mm"/>
+   <ZSection z="5674*mm" rMin="675*mm" rMax="850*mm"/>
+   <ZSection z="6590*mm" rMin="675*mm" rMax="850*mm"/>
+   <ZSection z="6835*mm" rMin="701*mm" rMax="850*mm"/>
   </Polycone>
-  <Tubs name="ShieldingBoronPoly_1_ME1" rMin="965*mm" rMax="1240*mm" dz="2*cm " startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingAntinomyLead_1_ME1" rMin="965*mm" rMax="1240*mm" dz="6.49995*mm " startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingBoronPoly_2_ME1" rMin="85.1*cm " rMax="88.1*cm " dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingAntinomyLead_2_ME1" rMin="88.2*cm " rMax="89.5*cm " dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingBoronPoly_3_ME1" rMin="89.6*cm " rMax="941*mm" dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingAntinomyLead_3_ME1" rMin="942*mm" rMax="955*mm" dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingBoronPoly_4_ME1" rMin="85.1*cm " rMax="88.1*cm " dz="136*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingAntinomyLead_4_ME1" rMin="88.2*cm " rMax="89.5*cm " dz="136*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingBoronPoly_5_ME1" rMin="89.6*cm " rMax="931*mm" dz="136*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingAntinomyLead_5_ME1" rMin="932*mm" rMax="945*mm" dz="136*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingAntinomyLead_6_ME1" rMin="945.1*mm" rMax="2330*mm" dz="5*mm " startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingBoronPoly_6_ME1" rMin="945.1*mm" rMax="2330*mm" dz="11.9*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingBoronPoly_0_ME1"    rMin="1150*mm" rMax="1227*mm" dz="16*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingAntinomyLead_0_ME1" rMin="1227*mm" rMax="1240*mm" dz="42.5*mm"  startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingBoronPoly_1_ME1"    rMin="936*mm"  rMax="1227*mm" dz="20*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingAntinomyLead_1_ME1" rMin="965*mm"  rMax="1227*mm" dz="6.5*mm"  startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingBoronPoly_2_ME1"    rMin="850*mm"  rMax="880*mm"  dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingAntinomyLead_2_ME1" rMin="880*mm"  rMax="893*mm"  dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingBoronPoly_3_ME1"    rMin="893*mm"  rMax="923*mm"  dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingAntinomyLead_3_ME1" rMin="923*mm"  rMax="936*mm"  dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingBoronPoly_4_ME1"    rMin="850*mm"  rMax="880*mm"  dz="136*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingAntinomyLead_4_ME1" rMin="880*mm"  rMax="893*mm"  dz="136*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingBoronPoly_5_ME1"    rMin="893*mm " rMax="923*mm"  dz="136*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingAntinomyLead_5_ME1" rMin="923*mm"  rMax="936*mm"  dz="136*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingAntinomyLead_6_ME1" rMin="936*mm"  rMax="2330*mm" dz="5*mm " startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingBoronPoly_6_ME1"    rMin="936*mm"  rMax="2330*mm" dz="12*mm" startPhi="0*deg" deltaPhi="360*deg"/>
   <Tubs name="ZStopSpace" rMin="4.694*m  " rMax="4.955*m  " dz="32*cm " startPhi="0*deg" deltaPhi="360*deg"/>
   <Tubs name="ZStop_1_ZStopSpaceDivision" rMin="4.694*m  " rMax="4.955*m  " dz="32*cm " startPhi="346.25*deg" deltaPhi="3.0999999*deg"/>
   <Tubs name="ZStop_2_ZStopSpaceDivision" rMin="4.694*m  " rMax="4.955*m  " dz="32*cm " startPhi="10.75*deg" deltaPhi="3.0999999*deg"/>
@@ -52,6 +54,14 @@
    <rSolid name="SupportTubeForHE"/>
    <rMaterial name="materials:StainlessSteel"/>
   </LogicalPart>
+  <LogicalPart name="ShieldingBoronPoly_0_ME1" category="unspecified">
+   <rSolid name="ShieldingBoronPoly_0_ME1"/>
+   <rMaterial name="materials:Boron Polyethyl."/>
+  </LogicalPart>
+  <LogicalPart name="ShieldingAntinomyLead_0_ME1" category="unspecified">
+   <rSolid name="ShieldingAntinomyLead_0_ME1"/>
+   <rMaterial name="materials:AntiLead"/>
+  </LogicalPart>
   <LogicalPart name="ShieldingBoronPoly_1_ME1" category="unspecified">
    <rSolid name="ShieldingBoronPoly_1_ME1"/>
    <rMaterial name="materials:Boron Polyethyl."/>
@@ -199,17 +209,29 @@
    <rParent name="mf:MEN"/>
    <rChild name="mfshield:SupportTubeForHE"/>
   </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="mf:ME1RingP"/>
+   <rChild name="mfshield:ShieldingBoronPoly_0_ME1"/>
+   <rRotation name="rotations:000D"/>
+   <Translation x="0*fm " y="0*fm " z="5658*mm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="mf:ME1RingP"/>
+   <rChild name="mfshield:ShieldingAntinomyLead_0_ME1"/>
+   <rRotation name="rotations:000D"/>
+   <Translation x="0*fm " y="0*fm " z="5684.5*mm"/>
+  </PosPart>
   <PosPart copyNumber="1">
    <rParent name="mf:ME1RingP"/>
    <rChild name="mfshield:ShieldingBoronPoly_1_ME1"/>
    <rRotation name="rotations:000D"/>
-   <Translation x="0*fm " y="0*fm " z="5698*mm"/>
+   <Translation x="0*fm " y="0*fm " z="5694*mm"/>
   </PosPart>
   <PosPart copyNumber="1">
    <rParent name="mf:ME1RingP"/>
    <rChild name="mfshield:ShieldingAntinomyLead_1_ME1"/>
    <rRotation name="rotations:000D"/>
-   <Translation x="0*fm " y="0*fm " z="5724.5*mm"/>
+   <Translation x="0*fm " y="0*fm " z="5720.5*mm"/>
   </PosPart>
   <PosPart copyNumber="2">
    <rParent name="mf:ME1RingP"/>
@@ -271,17 +293,29 @@
    <rRotation name="rotations:000D"/>
    <Translation x="0*fm " y="0*fm " z="6333*mm"/>
   </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="mf:ME1RingN"/>
+   <rChild name="mfshield:ShieldingBoronPoly_0_ME1"/>
+   <rRotation name="rotations:000D"/>
+   <Translation x="0*fm " y="0*fm " z="5658*mm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="mf:ME1RingN"/>
+   <rChild name="mfshield:ShieldingAntinomyLead_0_ME1"/>
+   <rRotation name="rotations:000D"/>
+   <Translation x="0*fm " y="0*fm " z="5684.5*mm"/>
+  </PosPart>
   <PosPart copyNumber="1">
    <rParent name="mf:ME1RingN"/>
    <rChild name="mfshield:ShieldingBoronPoly_1_ME1"/>
    <rRotation name="rotations:000D"/>
-   <Translation x="0*fm " y="0*fm " z="5698*mm"/>
+   <Translation x="0*fm " y="0*fm " z="5694*mm"/>
   </PosPart>
   <PosPart copyNumber="1">
    <rParent name="mf:ME1RingN"/>
    <rChild name="mfshield:ShieldingAntinomyLead_1_ME1"/>
    <rRotation name="rotations:000D"/>
-   <Translation x="0*fm " y="0*fm " z="5724.5*mm"/>
+   <Translation x="0*fm " y="0*fm " z="5720.5*mm"/>
   </PosPart>
   <PosPart copyNumber="2">
    <rParent name="mf:ME1RingN"/>
@@ -498,7 +532,7 @@
    <rRotation name="rotations:000D"/>
    <Translation x="0*fm " y="0*fm " z="-2.5*mm "/>
   </PosPart>
-   <PosPart copyNumber="1">
+  <PosPart copyNumber="1">
    <rParent name="mf:ME4RingP"/>
    <rChild name="mfshield:ShieldingBoronPoly_1_ME4"/>
    <rRotation name="rotations:000D"/>
diff --git a/Geometry/MuonCommonData/data/upscope/2.4Eta/mf.xml b/Geometry/MuonCommonData/data/upscope/2.4Eta/mf.xml
index 7391879216f64..aa8ff06f007e6 100644
--- a/Geometry/MuonCommonData/data/upscope/2.4Eta/mf.xml
+++ b/Geometry/MuonCommonData/data/upscope/2.4Eta/mf.xml
@@ -17,8 +17,8 @@
    <ZSection z="[cms:MuonBeamZ2]" rMin="[cms:MERmin3]" rMax="[cms:CMSR1]"/>
   </Polycone>
   <Polycone name="ME1Ring" startPhi="0*deg" deltaPhi="360*deg">
-   <ZSection z="5.641*m  " rMin="1.3*m " rMax="2.8*m  "/>
-   <ZSection z="5.674*m  " rMin="1.3*m " rMax="2.8*m  "/>
+   <ZSection z="5.641*m  " rMin="1.15*m" rMax="2.8*m  "/>
+   <ZSection z="5.674*m  " rMin="1.15*m" rMax="2.8*m  "/>
    <ZSection z="5.674*m  " rMin="85*cm " rMax="2.8*m  "/>
    <ZSection z="6.345*m  " rMin="85*cm " rMax="2.8*m  "/>
   </Polycone>
diff --git a/Geometry/MuonCommonData/data/upscope/2.4Eta/mfshield.xml b/Geometry/MuonCommonData/data/upscope/2.4Eta/mfshield.xml
index 3f2ba444ced76..abe7471d4c5c3 100644
--- a/Geometry/MuonCommonData/data/upscope/2.4Eta/mfshield.xml
+++ b/Geometry/MuonCommonData/data/upscope/2.4Eta/mfshield.xml
@@ -3,26 +3,28 @@
 
  <SolidSection label="mfshield.xml">
   <Polycone name="SupportTubeForHE" startPhi="0*deg" deltaPhi="360*deg">
-   <ZSection z="5.541*m  " rMin="67.5*cm " rMax="2.51*m  "/>
-   <ZSection z="5.641*m  " rMin="67.5*cm " rMax="2.51*m  "/>
-   <ZSection z="5.641*m  " rMin="67.5*cm " rMax="1.3*m  "/>
-   <ZSection z="5.674*m  " rMin="67.5*cm " rMax="1.3*m  "/>
-   <ZSection z="5.674*m  " rMin="67.5*cm " rMax="85*cm "/>
-   <ZSection z="6590*mm" rMin="67.5*cm " rMax="85*cm "/>
-   <ZSection z="6.835*m  " rMin="701*mm" rMax="85*cm "/>
+   <ZSection z="5541*mm" rMin="675*mm" rMax="2510*mm"/>
+   <ZSection z="5641*mm" rMin="675*mm" rMax="2510*mm"/>
+   <ZSection z="5641*mm" rMin="675*mm" rMax="1150*mm"/>
+   <ZSection z="5674*mm" rMin="675*mm" rMax="1150*mm"/>
+   <ZSection z="5674*mm" rMin="675*mm" rMax="850*mm"/>
+   <ZSection z="6590*mm" rMin="675*mm" rMax="850*mm"/>
+   <ZSection z="6835*mm" rMin="701*mm" rMax="850*mm"/>
   </Polycone>
-  <Tubs name="ShieldingBoronPoly_1_ME1" rMin="965*mm" rMax="1240*mm" dz="2*cm " startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingAntinomyLead_1_ME1" rMin="965*mm" rMax="1240*mm" dz="6.49995*mm " startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingBoronPoly_2_ME1" rMin="85.1*cm " rMax="88.1*cm " dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingAntinomyLead_2_ME1" rMin="88.2*cm " rMax="89.5*cm " dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingBoronPoly_3_ME1" rMin="89.6*cm " rMax="941*mm" dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingAntinomyLead_3_ME1" rMin="942*mm" rMax="955*mm" dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingBoronPoly_4_ME1" rMin="85.1*cm " rMax="88.1*cm " dz="136*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingAntinomyLead_4_ME1" rMin="88.2*cm " rMax="89.5*cm " dz="136*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingBoronPoly_5_ME1" rMin="89.6*cm " rMax="931*mm" dz="136*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingAntinomyLead_5_ME1" rMin="932*mm" rMax="945*mm" dz="136*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingAntinomyLead_6_ME1" rMin="945.1*mm" rMax="2330*mm" dz="5*mm " startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingBoronPoly_6_ME1" rMin="945.1*mm" rMax="2330*mm" dz="11.9*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingBoronPoly_0_ME1"    rMin="1150*mm" rMax="1227*mm" dz="16*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingAntinomyLead_0_ME1" rMin="1227*mm" rMax="1240*mm" dz="42.5*mm"  startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingBoronPoly_1_ME1"    rMin="936*mm"  rMax="1227*mm" dz="20*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingAntinomyLead_1_ME1" rMin="965*mm"  rMax="1227*mm" dz="6.5*mm"  startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingBoronPoly_2_ME1"    rMin="850*mm"  rMax="880*mm"  dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingAntinomyLead_2_ME1" rMin="880*mm"  rMax="893*mm"  dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingBoronPoly_3_ME1"    rMin="893*mm"  rMax="923*mm"  dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingAntinomyLead_3_ME1" rMin="923*mm"  rMax="936*mm"  dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingBoronPoly_4_ME1"    rMin="850*mm"  rMax="880*mm"  dz="136*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingAntinomyLead_4_ME1" rMin="880*mm"  rMax="893*mm"  dz="136*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingBoronPoly_5_ME1"    rMin="893*mm " rMax="923*mm"  dz="136*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingAntinomyLead_5_ME1" rMin="923*mm"  rMax="936*mm"  dz="136*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingAntinomyLead_6_ME1" rMin="936*mm"  rMax="2330*mm" dz="5*mm " startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingBoronPoly_6_ME1"    rMin="936*mm"  rMax="2330*mm" dz="12*mm" startPhi="0*deg" deltaPhi="360*deg"/>
   <Tubs name="ZStopSpace" rMin="4.694*m  " rMax="4.955*m  " dz="32*cm " startPhi="0*deg" deltaPhi="360*deg"/>
   <Tubs name="ZStop_1_ZStopSpaceDivision" rMin="4.694*m  " rMax="4.955*m  " dz="32*cm " startPhi="346.25*deg" deltaPhi="3.0999999*deg"/>
   <Tubs name="ZStop_2_ZStopSpaceDivision" rMin="4.694*m  " rMax="4.955*m  " dz="32*cm " startPhi="10.75*deg" deltaPhi="3.0999999*deg"/>
@@ -52,6 +54,14 @@
    <rSolid name="SupportTubeForHE"/>
    <rMaterial name="materials:StainlessSteel"/>
   </LogicalPart>
+  <LogicalPart name="ShieldingBoronPoly_0_ME1" category="unspecified">
+   <rSolid name="ShieldingBoronPoly_0_ME1"/>
+   <rMaterial name="materials:Boron Polyethyl."/>
+  </LogicalPart>
+  <LogicalPart name="ShieldingAntinomyLead_0_ME1" category="unspecified">
+   <rSolid name="ShieldingAntinomyLead_0_ME1"/>
+   <rMaterial name="materials:AntiLead"/>
+  </LogicalPart>
   <LogicalPart name="ShieldingBoronPoly_1_ME1" category="unspecified">
    <rSolid name="ShieldingBoronPoly_1_ME1"/>
    <rMaterial name="materials:Boron Polyethyl."/>
@@ -199,17 +209,29 @@
    <rParent name="mf:MEN"/>
    <rChild name="mfshield:SupportTubeForHE"/>
   </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="mf:ME1RingP"/>
+   <rChild name="mfshield:ShieldingBoronPoly_0_ME1"/>
+   <rRotation name="rotations:000D"/>
+   <Translation x="0*fm " y="0*fm " z="5658*mm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="mf:ME1RingP"/>
+   <rChild name="mfshield:ShieldingAntinomyLead_0_ME1"/>
+   <rRotation name="rotations:000D"/>
+   <Translation x="0*fm " y="0*fm " z="5684.5*mm"/>
+  </PosPart>
   <PosPart copyNumber="1">
    <rParent name="mf:ME1RingP"/>
    <rChild name="mfshield:ShieldingBoronPoly_1_ME1"/>
    <rRotation name="rotations:000D"/>
-   <Translation x="0*fm " y="0*fm " z="5698*mm"/>
+   <Translation x="0*fm " y="0*fm " z="5694*mm"/>
   </PosPart>
   <PosPart copyNumber="1">
    <rParent name="mf:ME1RingP"/>
    <rChild name="mfshield:ShieldingAntinomyLead_1_ME1"/>
    <rRotation name="rotations:000D"/>
-   <Translation x="0*fm " y="0*fm " z="5724.5*mm"/>
+   <Translation x="0*fm " y="0*fm " z="5720.5*mm"/>
   </PosPart>
   <PosPart copyNumber="2">
    <rParent name="mf:ME1RingP"/>
@@ -271,17 +293,29 @@
    <rRotation name="rotations:000D"/>
    <Translation x="0*fm " y="0*fm " z="6333*mm"/>
   </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="mf:ME1RingN"/>
+   <rChild name="mfshield:ShieldingBoronPoly_0_ME1"/>
+   <rRotation name="rotations:000D"/>
+   <Translation x="0*fm " y="0*fm " z="5658*mm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="mf:ME1RingN"/>
+   <rChild name="mfshield:ShieldingAntinomyLead_0_ME1"/>
+   <rRotation name="rotations:000D"/>
+   <Translation x="0*fm " y="0*fm " z="5684.5*mm"/>
+  </PosPart>
   <PosPart copyNumber="1">
    <rParent name="mf:ME1RingN"/>
    <rChild name="mfshield:ShieldingBoronPoly_1_ME1"/>
    <rRotation name="rotations:000D"/>
-   <Translation x="0*fm " y="0*fm " z="5698*mm"/>
+   <Translation x="0*fm " y="0*fm " z="5694*mm"/>
   </PosPart>
   <PosPart copyNumber="1">
    <rParent name="mf:ME1RingN"/>
    <rChild name="mfshield:ShieldingAntinomyLead_1_ME1"/>
    <rRotation name="rotations:000D"/>
-   <Translation x="0*fm " y="0*fm " z="5724.5*mm"/>
+   <Translation x="0*fm " y="0*fm " z="5720.5*mm"/>
   </PosPart>
   <PosPart copyNumber="2">
    <rParent name="mf:ME1RingN"/>
@@ -498,7 +532,7 @@
    <rRotation name="rotations:000D"/>
    <Translation x="0*fm " y="0*fm " z="-2.5*mm "/>
   </PosPart>
-   <PosPart copyNumber="1">
+  <PosPart copyNumber="1">
    <rParent name="mf:ME4RingP"/>
    <rChild name="mfshield:ShieldingBoronPoly_1_ME4"/>
    <rRotation name="rotations:000D"/>
diff --git a/Geometry/MuonCommonData/data/upscope/v1/mf.xml b/Geometry/MuonCommonData/data/upscope/v1/mf.xml
index 7391879216f64..aa8ff06f007e6 100644
--- a/Geometry/MuonCommonData/data/upscope/v1/mf.xml
+++ b/Geometry/MuonCommonData/data/upscope/v1/mf.xml
@@ -17,8 +17,8 @@
    <ZSection z="[cms:MuonBeamZ2]" rMin="[cms:MERmin3]" rMax="[cms:CMSR1]"/>
   </Polycone>
   <Polycone name="ME1Ring" startPhi="0*deg" deltaPhi="360*deg">
-   <ZSection z="5.641*m  " rMin="1.3*m " rMax="2.8*m  "/>
-   <ZSection z="5.674*m  " rMin="1.3*m " rMax="2.8*m  "/>
+   <ZSection z="5.641*m  " rMin="1.15*m" rMax="2.8*m  "/>
+   <ZSection z="5.674*m  " rMin="1.15*m" rMax="2.8*m  "/>
    <ZSection z="5.674*m  " rMin="85*cm " rMax="2.8*m  "/>
    <ZSection z="6.345*m  " rMin="85*cm " rMax="2.8*m  "/>
   </Polycone>
diff --git a/Geometry/MuonCommonData/data/v2/mf.xml b/Geometry/MuonCommonData/data/v2/mf.xml
index 7391879216f64..aa8ff06f007e6 100644
--- a/Geometry/MuonCommonData/data/v2/mf.xml
+++ b/Geometry/MuonCommonData/data/v2/mf.xml
@@ -17,8 +17,8 @@
    <ZSection z="[cms:MuonBeamZ2]" rMin="[cms:MERmin3]" rMax="[cms:CMSR1]"/>
   </Polycone>
   <Polycone name="ME1Ring" startPhi="0*deg" deltaPhi="360*deg">
-   <ZSection z="5.641*m  " rMin="1.3*m " rMax="2.8*m  "/>
-   <ZSection z="5.674*m  " rMin="1.3*m " rMax="2.8*m  "/>
+   <ZSection z="5.641*m  " rMin="1.15*m" rMax="2.8*m  "/>
+   <ZSection z="5.674*m  " rMin="1.15*m" rMax="2.8*m  "/>
    <ZSection z="5.674*m  " rMin="85*cm " rMax="2.8*m  "/>
    <ZSection z="6.345*m  " rMin="85*cm " rMax="2.8*m  "/>
   </Polycone>
diff --git a/Geometry/MuonCommonData/data/v2/mfshield.xml b/Geometry/MuonCommonData/data/v2/mfshield.xml
index 4dedc07d28440..f2fbab30b8a29 100644
--- a/Geometry/MuonCommonData/data/v2/mfshield.xml
+++ b/Geometry/MuonCommonData/data/v2/mfshield.xml
@@ -3,26 +3,28 @@
 
  <SolidSection label="mfshield.xml">
   <Polycone name="SupportTubeForHE" startPhi="0*deg" deltaPhi="360*deg">
-   <ZSection z="5.541*m  " rMin="67.5*cm " rMax="2.51*m  "/>
-   <ZSection z="5.641*m  " rMin="67.5*cm " rMax="2.51*m  "/>
-   <ZSection z="5.641*m  " rMin="67.5*cm " rMax="1.3*m  "/>
-   <ZSection z="5.674*m  " rMin="67.5*cm " rMax="1.3*m  "/>
-   <ZSection z="5.674*m  " rMin="67.5*cm " rMax="85*cm "/>
-   <ZSection z="6590*mm" rMin="67.5*cm " rMax="85*cm "/>
-   <ZSection z="6.835*m  " rMin="701*mm" rMax="85*cm "/>
+   <ZSection z="5541*mm" rMin="675*mm" rMax="2510*mm"/>
+   <ZSection z="5641*mm" rMin="675*mm" rMax="2510*mm"/>
+   <ZSection z="5641*mm" rMin="675*mm" rMax="1150*mm"/>
+   <ZSection z="5674*mm" rMin="675*mm" rMax="1150*mm"/>
+   <ZSection z="5674*mm" rMin="675*mm" rMax="850*mm"/>
+   <ZSection z="6590*mm" rMin="675*mm" rMax="850*mm"/>
+   <ZSection z="6835*mm" rMin="701*mm" rMax="850*mm"/>
   </Polycone>
-  <Tubs name="ShieldingBoronPoly_1_ME1" rMin="965*mm" rMax="1240*mm" dz="2*cm " startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingAntinomyLead_1_ME1" rMin="965*mm" rMax="1240*mm" dz="6.49995*mm " startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingBoronPoly_2_ME1" rMin="85.1*cm " rMax="88.1*cm " dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingAntinomyLead_2_ME1" rMin="88.2*cm " rMax="89.5*cm " dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingBoronPoly_3_ME1" rMin="89.6*cm " rMax="941*mm" dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingAntinomyLead_3_ME1" rMin="942*mm" rMax="955*mm" dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingBoronPoly_4_ME1" rMin="85.1*cm " rMax="88.1*cm " dz="136*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingAntinomyLead_4_ME1" rMin="88.2*cm " rMax="89.5*cm " dz="136*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingBoronPoly_5_ME1" rMin="89.6*cm " rMax="931*mm" dz="136*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingAntinomyLead_5_ME1" rMin="932*mm" rMax="945*mm" dz="136*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingAntinomyLead_6_ME1" rMin="945.1*mm" rMax="2330*mm" dz="5*mm " startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingBoronPoly_6_ME1" rMin="945.1*mm" rMax="2330*mm" dz="11.9*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingBoronPoly_0_ME1"    rMin="1150*mm" rMax="1227*mm" dz="16*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingAntinomyLead_0_ME1" rMin="1227*mm" rMax="1240*mm" dz="42.5*mm"  startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingBoronPoly_1_ME1"    rMin="936*mm"  rMax="1227*mm" dz="20*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingAntinomyLead_1_ME1" rMin="965*mm"  rMax="1227*mm" dz="6.5*mm"  startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingBoronPoly_2_ME1"    rMin="850*mm"  rMax="880*mm"  dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingAntinomyLead_2_ME1" rMin="880*mm"  rMax="893*mm"  dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingBoronPoly_3_ME1"    rMin="893*mm"  rMax="923*mm"  dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingAntinomyLead_3_ME1" rMin="923*mm"  rMax="936*mm"  dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingBoronPoly_4_ME1"    rMin="850*mm"  rMax="880*mm"  dz="136*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingAntinomyLead_4_ME1" rMin="880*mm"  rMax="893*mm"  dz="136*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingBoronPoly_5_ME1"    rMin="893*mm " rMax="923*mm"  dz="136*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingAntinomyLead_5_ME1" rMin="923*mm"  rMax="936*mm"  dz="136*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingAntinomyLead_6_ME1" rMin="936*mm"  rMax="2330*mm" dz="5*mm " startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingBoronPoly_6_ME1"    rMin="936*mm"  rMax="2330*mm" dz="12*mm" startPhi="0*deg" deltaPhi="360*deg"/>
   <Tubs name="ZStopSpace" rMin="4.694*m  " rMax="4.955*m  " dz="32*cm " startPhi="0*deg" deltaPhi="360*deg"/>
   <Tubs name="ZStop_1_ZStopSpaceDivision" rMin="4.694*m  " rMax="4.955*m  " dz="32*cm " startPhi="346.25*deg" deltaPhi="3.0999999*deg"/>
   <Tubs name="ZStop_2_ZStopSpaceDivision" rMin="4.694*m  " rMax="4.955*m  " dz="32*cm " startPhi="10.75*deg" deltaPhi="3.0999999*deg"/>
@@ -52,6 +54,14 @@
    <rSolid name="SupportTubeForHE"/>
    <rMaterial name="materials:StainlessSteel"/>
   </LogicalPart>
+  <LogicalPart name="ShieldingBoronPoly_0_ME1" category="unspecified">
+   <rSolid name="ShieldingBoronPoly_0_ME1"/>
+   <rMaterial name="materials:Boron Polyethyl."/>
+  </LogicalPart>
+  <LogicalPart name="ShieldingAntinomyLead_0_ME1" category="unspecified">
+   <rSolid name="ShieldingAntinomyLead_0_ME1"/>
+   <rMaterial name="materials:AntiLead"/>
+  </LogicalPart>
   <LogicalPart name="ShieldingBoronPoly_1_ME1" category="unspecified">
    <rSolid name="ShieldingBoronPoly_1_ME1"/>
    <rMaterial name="materials:Boron Polyethyl."/>
@@ -199,17 +209,29 @@
    <rParent name="mf:MEN"/>
    <rChild name="mfshield:SupportTubeForHE"/>
   </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="mf:ME1RingP"/>
+   <rChild name="mfshield:ShieldingBoronPoly_0_ME1"/>
+   <rRotation name="rotations:000D"/>
+   <Translation x="0*fm " y="0*fm " z="5658*mm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="mf:ME1RingP"/>
+   <rChild name="mfshield:ShieldingAntinomyLead_0_ME1"/>
+   <rRotation name="rotations:000D"/>
+   <Translation x="0*fm " y="0*fm " z="5684.5*mm"/>
+  </PosPart>
   <PosPart copyNumber="1">
    <rParent name="mf:ME1RingP"/>
    <rChild name="mfshield:ShieldingBoronPoly_1_ME1"/>
    <rRotation name="rotations:000D"/>
-   <Translation x="0*fm " y="0*fm " z="5698*mm"/>
+   <Translation x="0*fm " y="0*fm " z="5694*mm"/>
   </PosPart>
   <PosPart copyNumber="1">
    <rParent name="mf:ME1RingP"/>
    <rChild name="mfshield:ShieldingAntinomyLead_1_ME1"/>
    <rRotation name="rotations:000D"/>
-   <Translation x="0*fm " y="0*fm " z="5724.5*mm"/>
+   <Translation x="0*fm " y="0*fm " z="5720.5*mm"/>
   </PosPart>
   <PosPart copyNumber="2">
    <rParent name="mf:ME1RingP"/>
@@ -271,17 +293,29 @@
    <rRotation name="rotations:000D"/>
    <Translation x="0*fm " y="0*fm " z="6333*mm"/>
   </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="mf:ME1RingN"/>
+   <rChild name="mfshield:ShieldingBoronPoly_0_ME1"/>
+   <rRotation name="rotations:000D"/>
+   <Translation x="0*fm " y="0*fm " z="5658*mm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="mf:ME1RingN"/>
+   <rChild name="mfshield:ShieldingAntinomyLead_0_ME1"/>
+   <rRotation name="rotations:000D"/>
+   <Translation x="0*fm " y="0*fm " z="5684.5*mm"/>
+  </PosPart>
   <PosPart copyNumber="1">
    <rParent name="mf:ME1RingN"/>
    <rChild name="mfshield:ShieldingBoronPoly_1_ME1"/>
    <rRotation name="rotations:000D"/>
-   <Translation x="0*fm " y="0*fm " z="5698*mm"/>
+   <Translation x="0*fm " y="0*fm " z="5694*mm"/>
   </PosPart>
   <PosPart copyNumber="1">
    <rParent name="mf:ME1RingN"/>
    <rChild name="mfshield:ShieldingAntinomyLead_1_ME1"/>
    <rRotation name="rotations:000D"/>
-   <Translation x="0*fm " y="0*fm " z="5724.5*mm"/>
+   <Translation x="0*fm " y="0*fm " z="5720.5*mm"/>
   </PosPart>
   <PosPart copyNumber="2">
    <rParent name="mf:ME1RingN"/>
diff --git a/Geometry/MuonCommonData/data/v6/gem11.xml b/Geometry/MuonCommonData/data/v6/gem11.xml
index ae7165b305ec0..05e7c0f933161 100644
--- a/Geometry/MuonCommonData/data/v6/gem11.xml
+++ b/Geometry/MuonCommonData/data/v6/gem11.xml
@@ -208,12 +208,7 @@
 </ConstantsSection>
 
 <SolidSection label="gem11.xml">
-  <Polycone name="GE11" startPhi="0*deg" deltaPhi="360*deg">
-   <ZSection z="-4.5*cm" rMin="1.300*m" rMax="2.64*m"/>
-   <ZSection z="-1.2*cm" rMin="1.300*m" rMax="2.64*m"/>
-   <ZSection z="-1.2*cm" rMin="1.269*m" rMax="2.64*m"/>
-   <ZSection z="+4.5*cm" rMin="1.269*m" rMax="2.64*m"/>
-  </Polycone>
+  <Tubs name="GE11" rMin="1.265*m" rMax="2.64*m" dz="4.5*cm " startPhi="0*deg" deltaPhi="360*deg"/>
 
   <Trd1 name="GB11L" dz="[dzGB11L]" dy1="[dyGB11]" dy2="[dyGB11]" dx1="[dxBotGB11]" dx2="[dxTopGB11L]" />
   <Trd1 name="GB11S" dz="[dzGB11S]" dy1="[dyGB11]" dy2="[dyGB11]" dx1="[dxBotGB11]" dx2="[dxTopGB11S]" />
diff --git a/Geometry/MuonCommonData/data/v6/mf.xml b/Geometry/MuonCommonData/data/v6/mf.xml
index fd9872c0fa8aa..39b211306504e 100644
--- a/Geometry/MuonCommonData/data/v6/mf.xml
+++ b/Geometry/MuonCommonData/data/v6/mf.xml
@@ -17,8 +17,8 @@
    <ZSection z="[cms:MuonBeamZ2]" rMin="[cms:MERmin3]" rMax="[cms:CMSR1]"/>
   </Polycone>
   <Polycone name="ME1Ring" startPhi="0*deg" deltaPhi="360*deg">
-   <ZSection z="5.641*m  " rMin="1.3*m " rMax="2.8*m  "/>
-   <ZSection z="5.674*m  " rMin="1.3*m " rMax="2.8*m  "/>
+   <ZSection z="5.641*m  " rMin="1.15*m" rMax="2.8*m  "/>
+   <ZSection z="5.674*m  " rMin="1.15*m" rMax="2.8*m  "/>
    <ZSection z="5.674*m  " rMin="85*cm " rMax="2.8*m  "/>
    <ZSection z="6.345*m  " rMin="85*cm " rMax="2.8*m  "/>
   </Polycone>
diff --git a/Geometry/MuonCommonData/data/v7/gem11.xml b/Geometry/MuonCommonData/data/v7/gem11.xml
index 8bf0411a0de91..1811696d65d28 100644
--- a/Geometry/MuonCommonData/data/v7/gem11.xml
+++ b/Geometry/MuonCommonData/data/v7/gem11.xml
@@ -208,10 +208,7 @@
 </ConstantsSection>
 
 <SolidSection label="gem11.xml">
-  <Polycone name="GE11" startPhi="0*deg" deltaPhi="360*deg">
-   <ZSection z="-4.5*cm" rMin="1.265*m" rMax="2.64*m"/>
-   <ZSection z="+4.5*cm" rMin="1.265*m" rMax="2.64*m"/>
-  </Polycone>
+  <Tubs name="GE11" rMin="1.265*m" rMax="2.64*m" dz="4.5*cm " startPhi="0*deg" deltaPhi="360*deg"/>
 
   <Trd1 name="GB11L" dz="[dzGB11L]" dy1="[dyGB11]" dy2="[dyGB11]" dx1="[dxBotGB11]" dx2="[dxTopGB11L]" />
   <Trd1 name="GB11S" dz="[dzGB11S]" dy1="[dyGB11]" dy2="[dyGB11]" dx1="[dxBotGB11]" dx2="[dxTopGB11S]" />
diff --git a/Geometry/MuonCommonData/data/v7/mf.xml b/Geometry/MuonCommonData/data/v7/mf.xml
index ae9a82c7cbcd1..be400844d041b 100644
--- a/Geometry/MuonCommonData/data/v7/mf.xml
+++ b/Geometry/MuonCommonData/data/v7/mf.xml
@@ -23,8 +23,8 @@
    <ZSection z="5.541*m  " rMin="0.2*m " rMax="149.5*cm"/>
   </Polycone>
   <Polycone name="ME1Ring" startPhi="0*deg" deltaPhi="360*deg">
-   <ZSection z="5.641*m  " rMin="1.3*m " rMax="2.8*m  "/>
-   <ZSection z="5.674*m  " rMin="1.3*m " rMax="2.8*m  "/>
+   <ZSection z="5.641*m  " rMin="1.15*m" rMax="2.8*m  "/>
+   <ZSection z="5.674*m  " rMin="1.15*m" rMax="2.8*m  "/>
    <ZSection z="5.674*m  " rMin="85*cm " rMax="2.8*m  "/>
    <ZSection z="6.345*m  " rMin="85*cm " rMax="2.8*m  "/>
   </Polycone>
diff --git a/Geometry/MuonCommonData/data/v7/mfshield.xml b/Geometry/MuonCommonData/data/v7/mfshield.xml
index a1dce82cf0c6b..68c7bbd6fb439 100644
--- a/Geometry/MuonCommonData/data/v7/mfshield.xml
+++ b/Geometry/MuonCommonData/data/v7/mfshield.xml
@@ -3,28 +3,30 @@
 
  <SolidSection label="mfshield.xml">
   <Polycone name="SupportTubeForHE" startPhi="0*deg" deltaPhi="360*deg">
-   <ZSection z="5.541*m  " rMin="67.5*cm " rMax="2.51*m  "/>
-   <ZSection z="5.641*m  " rMin="67.5*cm " rMax="2.51*m  "/>
-   <ZSection z="5.641*m  " rMin="67.5*cm " rMax="1.3*m  "/>
-   <ZSection z="5.674*m  " rMin="67.5*cm " rMax="1.3*m  "/>
-   <ZSection z="5.674*m  " rMin="67.5*cm " rMax="85*cm "/>
-   <ZSection z="6590*mm" rMin="67.5*cm " rMax="85*cm "/>
-   <ZSection z="6.835*m  " rMin="701*mm" rMax="85*cm "/>
+   <ZSection z="5541*mm" rMin="675*mm" rMax="2510*mm"/>
+   <ZSection z="5641*mm" rMin="675*mm" rMax="2510*mm"/>
+   <ZSection z="5641*mm" rMin="675*mm" rMax="1150*mm"/>
+   <ZSection z="5674*mm" rMin="675*mm" rMax="1150*mm"/>
+   <ZSection z="5674*mm" rMin="675*mm" rMax="850*mm"/>
+   <ZSection z="6590*mm" rMin="675*mm" rMax="850*mm"/>
+   <ZSection z="6835*mm" rMin="701*mm" rMax="850*mm"/>
   </Polycone>
   <Tubs name="ShieldingBoronPoly_1_ME0" rMin="[mf:rMinME0]" rMax="[mf:rMinME0] + 50*mm" dz="15*cm " startPhi="0*deg" deltaPhi="360*deg"/>
   <Tubs name="ShieldingAntinomyLead_1_ME0" rMin="[mf:rMinME0] + 50*mm" rMax="[mf:rMinME0] + 100*mm" dz="15*cm " startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingBoronPoly_1_ME1" rMin="965*mm" rMax="1240*mm" dz="2*cm " startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingAntinomyLead_1_ME1" rMin="965*mm" rMax="1240*mm" dz="6.49995*mm " startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingBoronPoly_2_ME1" rMin="85.1*cm " rMax="88.1*cm " dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingAntinomyLead_2_ME1" rMin="88.2*cm " rMax="89.5*cm " dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingBoronPoly_3_ME1" rMin="89.6*cm " rMax="941*mm" dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingAntinomyLead_3_ME1" rMin="942*mm" rMax="955*mm" dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingBoronPoly_4_ME1" rMin="85.1*cm " rMax="88.1*cm " dz="136*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingAntinomyLead_4_ME1" rMin="88.2*cm " rMax="89.5*cm " dz="136*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingBoronPoly_5_ME1" rMin="89.6*cm " rMax="931*mm" dz="136*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingAntinomyLead_5_ME1" rMin="932*mm" rMax="945*mm" dz="136*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingAntinomyLead_6_ME1" rMin="945.1*mm" rMax="2330*mm" dz="5*mm " startPhi="0*deg" deltaPhi="360*deg"/>
-  <Tubs name="ShieldingBoronPoly_6_ME1" rMin="945.1*mm" rMax="2330*mm" dz="11.9*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingBoronPoly_0_ME1"    rMin="1150*mm" rMax="1227*mm" dz="16*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingAntinomyLead_0_ME1" rMin="1227*mm" rMax="1240*mm" dz="42.5*mm"  startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingBoronPoly_1_ME1"    rMin="936*mm"  rMax="1227*mm" dz="20*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingAntinomyLead_1_ME1" rMin="965*mm"  rMax="1227*mm" dz="6.5*mm"  startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingBoronPoly_2_ME1"    rMin="850*mm"  rMax="880*mm"  dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingAntinomyLead_2_ME1" rMin="880*mm"  rMax="893*mm"  dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingBoronPoly_3_ME1"    rMin="893*mm"  rMax="923*mm"  dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingAntinomyLead_3_ME1" rMin="923*mm"  rMax="936*mm"  dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingBoronPoly_4_ME1"    rMin="850*mm"  rMax="880*mm"  dz="136*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingAntinomyLead_4_ME1" rMin="880*mm"  rMax="893*mm"  dz="136*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingBoronPoly_5_ME1"    rMin="893*mm " rMax="923*mm"  dz="136*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingAntinomyLead_5_ME1" rMin="923*mm"  rMax="936*mm"  dz="136*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingAntinomyLead_6_ME1" rMin="936*mm"  rMax="2330*mm" dz="5*mm " startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="ShieldingBoronPoly_6_ME1"    rMin="936*mm"  rMax="2330*mm" dz="12*mm" startPhi="0*deg" deltaPhi="360*deg"/>
   <Tubs name="ZStopSpace" rMin="4.694*m  " rMax="4.955*m  " dz="32*cm " startPhi="0*deg" deltaPhi="360*deg"/>
   <Tubs name="ZStop_1_ZStopSpaceDivision" rMin="4.694*m  " rMax="4.955*m  " dz="32*cm " startPhi="346.25*deg" deltaPhi="3.0999999*deg"/>
   <Tubs name="ZStop_2_ZStopSpaceDivision" rMin="4.694*m  " rMax="4.955*m  " dz="32*cm " startPhi="10.75*deg" deltaPhi="3.0999999*deg"/>
@@ -62,6 +64,14 @@
    <rSolid name="ShieldingAntinomyLead_1_ME0"/>
    <rMaterial name="materials:AntiLead"/>
   </LogicalPart>
+  <LogicalPart name="ShieldingBoronPoly_0_ME1" category="unspecified">
+   <rSolid name="ShieldingBoronPoly_0_ME1"/>
+   <rMaterial name="materials:Boron Polyethyl."/>
+  </LogicalPart>
+  <LogicalPart name="ShieldingAntinomyLead_0_ME1" category="unspecified">
+   <rSolid name="ShieldingAntinomyLead_0_ME1"/>
+   <rMaterial name="materials:AntiLead"/>
+  </LogicalPart>
   <LogicalPart name="ShieldingBoronPoly_1_ME1" category="unspecified">
    <rSolid name="ShieldingBoronPoly_1_ME1"/>
    <rMaterial name="materials:Boron Polyethyl."/>
@@ -221,17 +231,29 @@
    <rRotation name="rotations:000D"/>
    <Translation x="0*fm " y="0*fm " z="5391*mm"/>
   </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="mf:ME1RingP"/>
+   <rChild name="mfshield:ShieldingBoronPoly_0_ME1"/>
+   <rRotation name="rotations:000D"/>
+   <Translation x="0*fm " y="0*fm " z="5658*mm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="mf:ME1RingP"/>
+   <rChild name="mfshield:ShieldingAntinomyLead_0_ME1"/>
+   <rRotation name="rotations:000D"/>
+   <Translation x="0*fm " y="0*fm " z="5684.5*mm"/>
+  </PosPart>
   <PosPart copyNumber="1">
    <rParent name="mf:ME1RingP"/>
    <rChild name="mfshield:ShieldingBoronPoly_1_ME1"/>
    <rRotation name="rotations:000D"/>
-   <Translation x="0*fm " y="0*fm " z="5698*mm"/>
+   <Translation x="0*fm " y="0*fm " z="5694*mm"/>
   </PosPart>
   <PosPart copyNumber="1">
    <rParent name="mf:ME1RingP"/>
    <rChild name="mfshield:ShieldingAntinomyLead_1_ME1"/>
    <rRotation name="rotations:000D"/>
-   <Translation x="0*fm " y="0*fm " z="5724.5*mm"/>
+   <Translation x="0*fm " y="0*fm " z="5720.5*mm"/>
   </PosPart>
   <PosPart copyNumber="2">
    <rParent name="mf:ME1RingP"/>
@@ -305,17 +327,29 @@
    <rRotation name="rotations:000D"/>
    <Translation x="0*fm " y="0*fm " z="5391*mm"/>
   </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="mf:ME1RingN"/>
+   <rChild name="mfshield:ShieldingBoronPoly_0_ME1"/>
+   <rRotation name="rotations:000D"/>
+   <Translation x="0*fm " y="0*fm " z="5658*mm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="mf:ME1RingN"/>
+   <rChild name="mfshield:ShieldingAntinomyLead_0_ME1"/>
+   <rRotation name="rotations:000D"/>
+   <Translation x="0*fm " y="0*fm " z="5684.5*mm"/>
+  </PosPart>
   <PosPart copyNumber="1">
    <rParent name="mf:ME1RingN"/>
    <rChild name="mfshield:ShieldingBoronPoly_1_ME1"/>
    <rRotation name="rotations:000D"/>
-   <Translation x="0*fm " y="0*fm " z="5698*mm"/>
+   <Translation x="0*fm " y="0*fm " z="5694*mm"/>
   </PosPart>
   <PosPart copyNumber="1">
    <rParent name="mf:ME1RingN"/>
    <rChild name="mfshield:ShieldingAntinomyLead_1_ME1"/>
    <rRotation name="rotations:000D"/>
-   <Translation x="0*fm " y="0*fm " z="5724.5*mm"/>
+   <Translation x="0*fm " y="0*fm " z="5720.5*mm"/>
   </PosPart>
   <PosPart copyNumber="2">
    <rParent name="mf:ME1RingN"/>
diff --git a/Geometry/MuonCommonData/python/testMFXML_cfi.py b/Geometry/MuonCommonData/python/testMFXML_cfi.py
index 35bcb347ecf48..9276d773f88ed 100644
--- a/Geometry/MuonCommonData/python/testMFXML_cfi.py
+++ b/Geometry/MuonCommonData/python/testMFXML_cfi.py
@@ -226,7 +226,7 @@
         'Geometry/MuonCommonData/data/v2/csc.xml',
         'Geometry/MuonCommonData/data/v2/rpcf.xml',
         'Geometry/MuonCommonData/data/v2/gemf.xml',
-        'Geometry/MuonCommonData/data/v6/gem11.xml',
+        'Geometry/MuonCommonData/data/v7/gem11.xml',
         'Geometry/MuonCommonData/data/v6/gem21.xml',
         'Geometry/ForwardCommonData/data/forward.xml',
         'Geometry/ForwardCommonData/data/bundle/forwardshield.xml',