diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/ALLEGRO_o1_v03.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/ALLEGRO_o1_v03.xml
index da8377bfd..4858ee905 100644
--- a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/ALLEGRO_o1_v03.xml
+++ b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/ALLEGRO_o1_v03.xml
@@ -30,16 +30,21 @@
 
   <include ref="./DectDimensions.xml" />
 
-  <include ref="Beampipe.xml"/>
-  <include ref="BeamInstrumentation.xml"/>
+  <!-- shape based model of the beam pipe -->
+  <include ref="../../../MDI/compact/MDI_o1_v00/Beampipe_o4_v05.xml" />
+  <include ref="../../../MDI/compact/MDI_o1_v00/BeamInstrumentation_o1_v01.xml" />
+  
+  <!-- engineered CAD model of the beam pipe -->
+  <!-- <include ref="../../../MDI/compact/MDI_o1_v01/Beampipe_CADimport_o1_v02.xml" /> -->
+  <!-- <include ref="../../../MDI/compact/MDI_o1_v01/BeamInstrumentation_o1_v01.xml"/> -->
+
   <include ref="LumiCal.xml"/>
-  <include ref="HOMAbsorber.xml"/>
   <include ref="Vertex_IDEA_o1_v01.xml"/> <!-- symbolic link to ../../../IDEA/compact/IDEA_o1_v03/Vertex_IDEA_o1_v01.xml"/>-->
   <include ref="DriftChamber_o1_v02.xml"/> <!-- symbolic link to ../../../IDEA/compact/IDEA_o1_v03/DriftChamber_o1_v02.xml -->
   <include ref="ECalBarrel_thetamodulemerged.xml"/> <!-- if you remove the ECalBarrel, you also have to remove or update the "GlobalSolenoid" field (it depends on ECAL dimensions) -->
-  <include ref="HCalBarrel_TileCal.xml"/>
   <include ref="ECalEndcaps_coneCryo.xml"/>
   <include ref="HCalEndcaps_ThreeParts_TileCal.xml"/>
+  <include ref="HCalBarrel_TileCal.xml"/>
   <include ref="MuonTagger.xml"/>
 
   <fields>
@@ -72,6 +77,8 @@
            outer_radius="20*cm">
     </field>
 
+    <!-- FFQ fields at Z pole, V23) -->
+    <!--
     <field name="QC1L1_field_ED" type="MultipoleMagnet" Z="0.0*tesla">
       <position y="0*cm" x="(QC1L1_len/2. + QC1L1_start)*sin(CrossingAngle/2.)" z="(QC1L1_len/2. + QC1L1_start)*cos(CrossingAngle/2.)"/>
       <rotation x="0" y="CrossingAngle/2." z="0.0"/>
@@ -103,7 +110,8 @@
       <coefficient coefficient="(-1)*(45.6)*(-0.273)/0.3*tesla/m"/>
       <shape type="Tube" rmin="0.*cm" rmax="QC1_rmin" dz="QC1L1_len/2." />
     </field>
-
+    -->
+    
     <!--End of MDI magnetic fields  -->
 
   </fields>
diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/Beampipe.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/Beampipe.xml
deleted file mode 100644
index b86af5217..000000000
--- a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/Beampipe.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<lccdd>
-
-  <info name="FCCee"
-        title="FCCee Beam pipe: taken corresponding to CLD: Beampipe_o4_v04_noNotch_W_n02.xml"
-        author="from ILCSOFT/lcgeo/FCCee/compact/FCCee_o1_v04"
-        url="no"
-        status="development"
-        version="1.0">
-    <comment>A beampipe for FCCee, R(central) = 1.5 cm</comment>
-  </info>
-
-    <!--  Definition of global dictionary constants          -->
-    <define>
-    <!--  Definition of global dictionary constants          -->
-      <constant name="beampipegoldwidth" value="BeamPipeGoldWidth"/>
-      <constant name="beampipegoldtolerance" value="BeamPipeGoldTolerance"/>
-    </define>
-    
-    <!--  Definition of the used visualization attributes    -->
-    <display>
-        <vis name="BeamPipeVis" alpha="0.0" r="0.0" g="1.0" b="0.0" showDaughters="true" visible="false"/>
-        <vis name="GoldCoatingVis" alpha="0.0" r="0.0" g="1.0" b="1.0" showDaughters="true" visible="true"/>
-        <vis name="TubeVis"  alpha="1.0" r="1.0" g="0.7"  b="0.5"   showDaughters="true"  visible="true"/>
-        <vis name="VacVis"   alpha="1.0" r="1.0" g="1.0"  b="1.0"   showDaughters="true"  visible="false"/>
-    </display>
-    
-    <detectors>
-
-        <comment>Part of beampipe made of Beryllium</comment>
-        
-        <detector name="BeBeampipe" type="DD4hep_Beampipe_o1_v01" insideTrackingVolume="true" nocore="true" vis="BeamPipeVis">
-            <parameter crossingangle="CrossingAngle" />
-            <envelope vis="BlueVis">
-                <shape type="Assembly"/>
-            </envelope>
-
-            <section type="Center"               start="0*mm"    end="CentralBeamPipe_zmax" rMin1="CentralBeamPipe_rmax"  rMin2="CentralBeamPipe_rmax"    rMax1="CentralBeamPipe_rmax+BeamPipeWidth"  rMax2="CentralBeamPipe_rmax+BeamPipeWidth"                material="Beryllium" name="VertexInnerBe" />
-
-            <section type="Center" start="CentralBeamPipe_zmax"  end="BePartEnd_z"  rMin1="CentralBeamPipe_rmax"  rMin2="CentralBeamPipe_rmax+(BePartEnd_z-CentralBeamPipe_zmax)*0.017"      rMax1="CentralBeamPipe_rmax+BeamPipeWidthFirstCone"  rMax2="CentralBeamPipe_rmax+BeamPipeWidthFirstCone+(BePartEnd_z-CentralBeamPipe_zmax)*0.017" material="Beryllium" name="FirstConeBe" />
-
-        </detector>
-
-	<detector name="BeamPipe" type="DD4hep_Beampipe_o1_v01" insideTrackingVolume="true" vis="BeamPipeVis" >
-            <envelope vis="BlueVis">
-                <shape type="Assembly"/>
-            </envelope>
-            <parameter crossingangle="CrossingAngle" />
-
-            <!--             &A                       Z1                  Z2                    RIn1                RIn2                                 ROut1                        ROut2                                              Material -->
-
-
-            <comment>Golden foil in the inner part of the Be beampipe</comment>
-
-            <section type="Center"               start="0*mm"    end="CentralBeamPipe_zmax" rMin1="CentralBeamPipe_rmax-(beampipegoldwidth+beampipegoldtolerance)"  rMin2="CentralBeamPipe_rmax-(beampipegoldwidth+beampipegoldtolerance)"    rMax1="CentralBeamPipe_rmax-beampipegoldtolerance"  rMax2="CentralBeamPipe_rmax-beampipegoldtolerance"                material="Gold" name="VertexInnerGold"  />
-
-            <section type="Center" start="CentralBeamPipe_zmax"  end="BePartEnd_z"  rMin1="CentralBeamPipe_rmax-(beampipegoldwidth+beampipegoldtolerance)"  rMin2="CentralBeamPipe_rmax-(beampipegoldwidth+beampipegoldtolerance)+(BePartEnd_z-CentralBeamPipe_zmax)*0.017"      rMax1="CentralBeamPipe_rmax-beampipegoldtolerance"  rMax2="CentralBeamPipe_rmax-beampipegoldtolerance+(BePartEnd_z-CentralBeamPipe_zmax)*0.017" material="Gold" name="FirstConeGold" />
-
-        <comment>Part of beampipe made of Copper</comment>
-        
-            <section type="Center" start="BePartEnd_z"  end="SeparatedBeamPipe_z"  rMin1="CentralBeamPipe_rmax+(BePartEnd_z-CentralBeamPipe_zmax)*0.017"  rMin2="CentralBeamPipe_rmax+(BePartEnd_z-CentralBeamPipe_zmax)*0.017+(SeparatedBeamPipe_z-BePartEnd_z)*0.017"      rMax1="CentralBeamPipe_rmax+BeamPipeWidthFirstCone+(BePartEnd_z-CentralBeamPipe_zmax)*0.017"  rMax2="CentralBeamPipe_rmax+BeamPipeWidthFirstCone+(BePartEnd_z-CentralBeamPipe_zmax)*0.017+(SeparatedBeamPipe_z-BePartEnd_z)*0.017" material="Copper" name="CopperCone" />
-
-  
-<!-- PunchedCenter = un volume qui s'etend jusqu'a rMax1 (a z=start) et rMax2 (a end) et avec deux cylindres extrudes le long
-        des directions up / down (depend du xing angle), de rayon rMin1 et rMin2  -->
-
-
-	    <section type="PunchedCenter"        start="SeparatedBeamPipe_z" end="SeparatedBeamPipe_z+3*mm"    rMin1="SeparatedBeamPipe_rmax"      rMin2="SeparatedBeamPipe_rmax"       rMax1="CentralBeamPipe_rmax+BeamPipeWidthFirstCone+(BePartEnd_z-CentralBeamPipe_zmax)*0.015+(SeparatedBeamPipe_z-BePartEnd_z)*0.015"     rMax2="CentralBeamPipe_rmax+BeamPipeWidthFirstCone+(BePartEnd_z-CentralBeamPipe_zmax)*0.017+(SeparatedBeamPipe_z-BePartEnd_z)*0.017 + 3*mm*0.017" material="Copper"     name="SplitVacChambers"/>
-
-	<!-- Downstream pipe : first part : radius = 1.5 cm -->
-
-             <section type="DnstreamClippedFront" start="SeparatedBeamPipe_z+3.01*mm" end="6000*mm"  rMin1="SeparatedBeamPipe_rmax"  rMin2="SeparatedBeamPipe_rmax" rMax1="SeparatedBeamPipe_rmax+1*mm"  rMax2="SeparatedBeamPipe_rmax+1*mm"  material="Copper"      name="DownStreamBeamPipe_1"/>
-
-          
-	   <section type="UpstreamClippedFront"  start="SeparatedBeamPipe_z+3.01*mm" end="6000*mm"  rMin1="SeparatedBeamPipe_rmax"  rMin2="SeparatedBeamPipe_rmax" rMax1="SeparatedBeamPipe_rmax+1*mm"  rMax2="SeparatedBeamPipe_rmax+1*mm"  material="Copper"      name="UpStreamBeamPipe_1"/>
-
-</detector>
-<comment>Full Cone Tungsten Shield</comment>
-<detector name="BeamPipeShield" type="DD4hep_Mask_o1_v01" insideTrackingVolume="true" vis="TantalumVis" >
-        <parameter crossingangle="CrossingAngle" />
-
-        <comment>Before HOM space</comment>
-        <section type="PunchedCenter"        
-        start="LumiCal_max_z + 5*mm" end="1197.5*mm" 
-        rMin1="SeparatedBeamPipe_rmax + BeamPipeWidth + 0.1*mm" 
-        rMin2="SeparatedBeamPipe_rmax + BeamPipeWidth + 0.1*mm "
-        rMax1="SeparatedBeamPipe_rmax + (LumiCal_max_z + 5*mm )*0.015 + BeamPipeWidth + 0.1*mm + BeamPipeTantalShieldWidth"
-        rMax2="SeparatedBeamPipe_rmax + (1197.5*mm) * 0.015 + BeamPipeWidth + 0.1*mm + BeamPipeTantalShieldWidth"
-        material="Tungsten" name="TaShield_BH2" />
-
-        <comment>After HOM space (1197.5*m - 1298.7*mm) +18 cm as solenoid is now closer to IP </comment>
-        <section type="PunchedCenter"        
-        start="1298.7*mm" end="QD0_min_z + 18*cm" 
-        rMin1="SeparatedBeamPipe_rmax + BeamPipeWidth + 0.1*mm" 
-        rMin2="SeparatedBeamPipe_rmax + BeamPipeWidth + 0.1*mm "
-        rMax1="SeparatedBeamPipe_rmax + (1298.7*mm )*0.015 + BeamPipeWidth + 0.1*mm + BeamPipeTantalShieldWidth"
-        rMax2="SeparatedBeamPipe_rmax + (QD0_min_z + 18*cm) * 0.015 + BeamPipeWidth + 0.1*mm + BeamPipeTantalShieldWidth"
-        material="Tungsten" name="TaShield_AH" />
-
-        </detector>
-<comment>Asymmetric Tungsten Shield no Rotation</comment>
-
-<detector name="BeamPipeShield_noRot" type="DD4hep_Mask_o1_v01" insideTrackingVolume="true" vis="TantalumVis"  >
-        <parameter crossingangle="CrossingAngle" rotationX="true"/>
-
-        <section type="Center"        
-        start="500*mm" end="LumiCal_max_z + 4.9*mm" 
-        rMin1="CentralBeamPipe_rmax + (500.0*mm-CentralBeamPipe_zmax)*0.017 + BeamPipeWidthFirstCone + 0.1*mm"  
-        rMin2="CentralBeamPipe_rmax + (LumiCal_max_z + 4.9*mm-CentralBeamPipe_zmax)*0.017 + BeamPipeWidthFirstCone + 0.1*mm"           
-        rMax1="CentralBeamPipe_rmax + (500.0*mm-CentralBeamPipe_zmax)*0.017 + BeamPipeWidthFirstCone + 0.1*mm + TopFillerShieldWidth"  
-        rMax2="CentralBeamPipe_rmax + (LumiCal_max_z + 4.9*mm-CentralBeamPipe_zmax)*0.017 + BeamPipeWidthFirstCone + 0.1*mm + BeamPipeTantalShieldWidth"
-        phi1="326*degree"
-        phi2="34*degree"      
-        material="Tungsten" name="TaShieldTopPart" />
-
-	<comment>was 370</comment>
-        <section type="Center"        
-        start="330*mm" end="500*mm" 
-        rMin1="CentralBeamPipe_rmax + (330*mm - CentralBeamPipe_zmax)*0.017 + BeamPipeWidthFirstCone + 0.1*mm"  
-        rMin2="CentralBeamPipe_rmax + (500*mm - CentralBeamPipe_zmax)*0.017 + BeamPipeWidthFirstCone + 0.1*mm"           
-        rMax1="CentralBeamPipe_rmax + (330*mm - CentralBeamPipe_zmax)*0.017 + BeamPipeWidthFirstCone + 0.1*mm"  
-        rMax2="CentralBeamPipe_rmax + (500*mm - CentralBeamPipe_zmax)*0.017 + BeamPipeWidthFirstCone + 0.1*mm + TopFillerShieldWidth"
-        phi1="326*degree"
-        phi2="34*degree"      
-        material="Tungsten" name="TaShieldTopPart2" />
-
-	<comment>one degree less, to fit lumical window</comment>
-        <section type="Center"        
-        start="600*mm" end="LumiCal_max_z + 4.9*mm" 
-        rMin1="CentralBeamPipe_rmax + (600*mm - CentralBeamPipe_zmax)*0.017 + BeamPipeWidthFirstCone + 0.1*mm"  
-        rMin2="CentralBeamPipe_rmax + (LumiCal_max_z + 4.9*mm - CentralBeamPipe_zmax)*0.017 + BeamPipeWidthFirstCone + 0.1*mm"           
-        rMax1="CentralBeamPipe_rmax + (600*mm - CentralBeamPipe_zmax)*0.017 + BeamPipeWidthFirstCone + 0.1*mm + SideFillerShieldWidth"  
-        rMax2="CentralBeamPipe_rmax + (LumiCal_max_z + 4.9*mm - CentralBeamPipe_zmax)*0.017 + BeamPipeWidthFirstCone + 0.1*mm + BeamPipeTantalShieldWidth"
-        phi1="34*degree"
-        phi2="70*degree"      
-        material="Tungsten" name="TaShieldFiller1" />
-
-        <section type="Center"        
-        start="600*mm" end="LumiCal_max_z + 4.9*mm" 
-        rMin1="CentralBeamPipe_rmax + (600*mm - CentralBeamPipe_zmax)*0.017 + BeamPipeWidthFirstCone + 0.1*mm"  
-        rMin2="CentralBeamPipe_rmax + (LumiCal_max_z + 4.9*mm - CentralBeamPipe_zmax)*0.017 + BeamPipeWidthFirstCone + 0.1*mm"           
-        rMax1="CentralBeamPipe_rmax + (600*mm - CentralBeamPipe_zmax)*0.017 + BeamPipeWidthFirstCone + 0.1*mm + SideFillerShieldWidth"  
-        rMax2="CentralBeamPipe_rmax + (LumiCal_max_z + 4.9*mm - CentralBeamPipe_zmax)*0.017 + BeamPipeWidthFirstCone + 0.1*mm + BeamPipeTantalShieldWidth"
-        phi1="291*degree"
-        phi2="326*degree" 
-        material="Tungsten" name="TaShieldFiller2" />
-
-
-      </detector>
-    </detectors>
-</lccdd>
diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/DectDimensions.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/DectDimensions.xml
index 7b3a2a305..c09dbea21 100644
--- a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/DectDimensions.xml
+++ b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/DectDimensions.xml
@@ -48,22 +48,30 @@
     <constant name="DetID_HOMAbsorber"          value=" 19"/>
     <constant name="DetID_LumiCalNoseShield"          value=" 22"/>
     
-    <constant name="BeamPipeWidth"   	value="1.2*mm" />
-    <constant name="BeamPipeWidthFirstCone"   	value="1.0*mm" />
-    <constant name="CentralBeamPipe_zmax" value="12.5*cm"/>
-    <constant name="BePartEnd_z" value="90.0*cm"/>
-    <constant name="SeparatedBeamPipe_z" value="1159.97*mm"/>
-    <constant name="CentralBeamPipe_rmax" value="15.0*mm"/>
-    <constant name="BeamPipeGoldWidth" value="0.005*mm" /> 
+    <!-- BPW: Beam Pipe Width -->
+    <constant name="BPWWall"       value="0.35*mm" />
+    <constant name="BPWCool"       value="1.0*mm" />
+    <constant name="BeamPipeWidth" value="2.0*BPWWall + BPWCool"/>
+
+    <constant name="BeamPipeWidthFirstCone" value="2.0*mm" />
+    <constant name="CentralBeamPipe_zmax" value="9.0*cm"/>          <!-- Shorter central beam pipe -->
+    <constant name="SeparatedBeamPipe_z" value="1190.0*mm"/> <!-- was 1159.97*mm in FCCDetectors/> -->
+    <constant name="CentralBeamPipe_rmax" value="10.0*mm"/>
+    <constant name="ConeBeamPipe_Rmax" value="28.9*mm" />
+    <constant name="BeamPipeGoldWidth" value="0.005*mm" />
     <constant name="BeamPipeGoldTolerance" value="0.001*mm" />  <!-- dummy tolerance, some small non zero value -->
-    
-    <constant name="BigBeamPipe_zmax" value="1120*mm"/>
+    <constant name="BeamPipeConeHalfAngle" value="(ConeBeamPipe_Rmax + BeamPipeWidthFirstCone - CentralBeamPipe_rmax ) / (SeparatedBeamPipe_z - CentralBeamPipe_zmax)" />
+
     <constant name="SeparatedBeamPipe_rmax"  value="15*mm"/>
     <constant name="BeamPipeTantalShieldWidth"  value="15*mm"/>
     <constant name="SideFillerShieldWidth"  value="7*mm"/>
     <constant name="TopFillerShieldWidth"  value="8*mm"/>
     <constant name="BeamPipe_end" value="12500*mm"/>
-    
+
+    <!-- Mike Sullivan's Synch Rad mask -->
+    <constant name="MiddleOfSRMask_z" value="2.1*m" />
+    <constant name="SynchRadMaskSize" value="5*mm" /> <!-- mask tip is at 10 mm from the beamline -->
+    <constant name="mask_epsilon" value="0.001*mm" />    
     
     <constant name="size_x" value="60*mm"/>       
     <constant name="size_y" value="12*mm"/>         
diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/materials.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/materials.xml
index d2cec5087..338606639 100644
--- a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/materials.xml
+++ b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/materials.xml
@@ -475,4 +475,35 @@
     <fraction n="0.084" ref="Nb"/>
   </material>
 
+
+  <material name="Water">
+      <D value="1" unit="g/cm3" />
+      <composite n="2" ref="H" />
+      <composite n="1" ref="O" />
+  </material>
+
+  <material name="DefaultMaterial">
+    <D value="7.85" unit="g/cm3"/>
+    <fraction n="0.998" ref="Fe"/>
+    <fraction n=".002"  ref="C"/>
+  </material>
+
+  <material name="IronDens785">
+    <D value="7.85" unit="g/cm3"/>
+    <fraction n="1.0" ref="Fe"/>
+  </material>
+  
+  <material name="AlBeMet162">
+    <D value="2.1" unit="g/cm3"/>
+    <fraction n="0.38" ref="Al"/>
+    <fraction n="0.62" ref="Be"/>
+  </material>
+  
+  <material name="LiquidNDecane">
+    <D value="0.73" unit="g/cm3"/>
+    <composite n="10" ref="C" />
+    <composite n="22" ref="H" />
+  </material>
+
+  
 </materials>
diff --git a/FCCee/ALLEGRO/compact/README.md b/FCCee/ALLEGRO/compact/README.md
index 630ebcbdb..2d8dd9f66 100644
--- a/FCCee/ALLEGRO/compact/README.md
+++ b/FCCee/ALLEGRO/compact/README.md
@@ -8,4 +8,4 @@ Known caveat: the drift chamber has a larger z extent than in the IDEA detector
 
 ALLEGRO_o1_v03: with respect to v02 it features an ECal barrel with 11 layers and cell corners projective along phi.
 The vertex detector and drift chamber are now taken directly from IDEA_o1_v03, this effectively updates both the vertex detector (which was taken from an old CLD version) and the drift chamber (which was corresponding to IDEA_o1_v02/DriftChamber_o1_v01.xml). The z-extent of the drift chamber is now unchanged w.r.t. the IDEA detector (2 m) since it requires optimization anyway.
-Magnetic fields (solenoid + MDI) have been added.
+Magnetic fields (solenoid + MDI) have been added.
\ No newline at end of file
diff --git a/FCCee/IDEA/compact/IDEA_o1_v03/IDEA_o1_v03.xml b/FCCee/IDEA/compact/IDEA_o1_v03/IDEA_o1_v03.xml
index 5ebedf0ed..66a5c49bd 100644
--- a/FCCee/IDEA/compact/IDEA_o1_v03/IDEA_o1_v03.xml
+++ b/FCCee/IDEA/compact/IDEA_o1_v03/IDEA_o1_v03.xml
@@ -34,8 +34,12 @@
   <include ref="DectDimensions_IDEA_o1_v03.xml"/>
 
   <!-- Import accelerator components -->
-  <include ref="Beampipe_o4_v05.xml"/>
-  <include ref="BeamInstrumentation_o1_v01.xml"/>
+  <!-- shape based model of the beam pipe -->
+  <include ref="../../../MDI/compact/MDI_o1_v00/Beampipe_o4_v05.xml" />
+  <include ref="../../../MDI/compact/MDI_o1_v00/BeamInstrumentation_o1_v01.xml" />
+  <!-- engineered CAD model of the beam pipe -->
+  <!-- <include ref="../../../MDI/compact/MDI_o1_v01/Beampipe_CADimport_o1_v02.xml" /> -->
+  <!-- <include ref="../../../MDI/compact/MDI_o1_v01/BeamInstrumentation_o1_v01.xml"/> -->
   <include ref="LumiCal_o1_v01.xml"/>
 
   <!-- Import vertex -->
diff --git a/FCCee/IDEA/compact/IDEA_o1_v03/materials_o1_v02.xml b/FCCee/IDEA/compact/IDEA_o1_v03/materials_o1_v02.xml
index aea439da0..189bc202e 100644
--- a/FCCee/IDEA/compact/IDEA_o1_v03/materials_o1_v02.xml
+++ b/FCCee/IDEA/compact/IDEA_o1_v03/materials_o1_v02.xml
@@ -330,7 +330,7 @@
     <fraction n="0.998" ref="Fe"/>
     <fraction n=".002"  ref="C"/>
   </material>
-  <material name="Material01">
+  <material name="IronDens785">
     <D value="7.85" unit="g/cm3"/>
     <fraction n="1.0" ref="Fe"/>
   </material>  
diff --git a/FCCee/IDEA/compact/README.md b/FCCee/IDEA/compact/README.md
index 4239c24d4..192d63f55 100644
--- a/FCCee/IDEA/compact/README.md
+++ b/FCCee/IDEA/compact/README.md
@@ -15,4 +15,3 @@ IDEA_o1_v03
 ------------
 
 Based on o1_v02 but replacing the drift chamber (o1, v01) for the lightweight implementation based on twisted tubes (o1, v02). NB: production threshold and step limit physics have to be tuned for the drift chamber. July 2024: Added a detailed version of the muon system. 
-
diff --git a/FCCee/IDEA/compact/IDEA_o1_v03/BeamInstrumentation_o1_v01.xml b/FCCee/MDI/compact/MDI_o1_v00/BeamInstrumentation_o1_v01.xml
similarity index 100%
rename from FCCee/IDEA/compact/IDEA_o1_v03/BeamInstrumentation_o1_v01.xml
rename to FCCee/MDI/compact/MDI_o1_v00/BeamInstrumentation_o1_v01.xml
diff --git a/FCCee/IDEA/compact/IDEA_o1_v03/Beampipe_o4_v05.xml b/FCCee/MDI/compact/MDI_o1_v00/Beampipe_o4_v05.xml
similarity index 100%
rename from FCCee/IDEA/compact/IDEA_o1_v03/Beampipe_o4_v05.xml
rename to FCCee/MDI/compact/MDI_o1_v00/Beampipe_o4_v05.xml
diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/HOMAbsorber.xml b/FCCee/MDI/compact/MDI_o1_v00/HOMAbsorber.xml
similarity index 100%
rename from FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/HOMAbsorber.xml
rename to FCCee/MDI/compact/MDI_o1_v00/HOMAbsorber.xml
diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/BeamInstrumentation.xml b/FCCee/MDI/compact/MDI_o1_v01/BeamInstrumentation_o1_v01.xml
similarity index 100%
rename from FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/BeamInstrumentation.xml
rename to FCCee/MDI/compact/MDI_o1_v01/BeamInstrumentation_o1_v01.xml
diff --git a/FCCee/MDI/compact/MDI_o1_v01/Beampipe_CADimport_o1_v02.xml b/FCCee/MDI/compact/MDI_o1_v01/Beampipe_CADimport_o1_v02.xml
new file mode 100644
index 000000000..c4a3132f6
--- /dev/null
+++ b/FCCee/MDI/compact/MDI_o1_v01/Beampipe_CADimport_o1_v02.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
+  xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+
+
+  <info name="FCCee"
+        title="FCCee Beam pipe from CAD drawings"
+        author="aciarma"
+        url="no"
+        status="development"
+        version="1.0">
+    <comment>A beampipe for FCCee coming from F. Fransesini CAD drawings. </comment>
+  </info>
+
+
+
+  <detectors>
+
+    <detector name="Beampipe_STL" type="DD4hep_TestShape_Creator">
+      <check>
+        <shape type="CAD_MultiVolume" ref="./stl_files/Pipe_240430/AlBeMet162_30042024.stl"
+	       unit="mm" material="AlBeMet162">
+	  <volume id="0" name="s1" vis="AlBeMet_vis" material="AlBeMet162"> 
+	    <position x="0*cm"  y="0*cm"  z="0*cm"/>
+            <rotation x="0*rad" y="0*rad" z="0*rad"/>
+	  </volume> 
+        </shape>
+      </check>
+    </detector>
+
+    <detector name="Beampipe_crotch_STL" type="DD4hep_TestShape_Creator">
+      <check>
+        <shape type="CAD_MultiVolume" ref="./stl_files/Pipe_240430/Copper_pipe_28092023.stl"
+               unit="mm" material="Copper">
+          <volume id="0" name="s1" vis="CopperCooling_vis" material="Cu">
+            <position x="0*cm"  y="0*cm"  z="0*cm"/>
+            <rotation x="0*rad" y="pi/2.*rad" z="0*rad"/>
+          </volume>
+        </shape>
+      </check>
+    </detector>
+
+
+    <detector name="Gold_STL" type="DD4hep_TestShape_Creator">
+      <check>
+	<shape type="CAD_MultiVolume" ref="./stl_files/Pipe_240430/Gold_19042024.stl"
+	       unit="mm" material="Gold">
+          <volume id="0" name="s1" vis="Gold_vis" material="Au">
+            <position x="0*cm"  y="0*cm"  z="0*cm"/>
+            <rotation x="0*rad" y="0*rad" z="0*rad"/>
+          </volume>
+	</shape>
+      </check>
+    </detector>
+
+    
+    <detector name="Paraffin_STL" type="DD4hep_TestShape_Creator">
+      <check>
+        <shape type="CAD_MultiVolume" ref="./stl_files/Pipe_240430/Paraffine_19042024.stl"
+	       unit="mm" material="LiquidNDecane">
+          <volume id="0" name="s1" vis="Paraffin_vis" material="LiquidNDecane">
+            <position x="0*cm"  y="0*cm"  z="0*cm"/>
+            <rotation x="0*rad" y="0*rad" z="0*rad"/>
+          </volume>
+        </shape>
+      </check>
+    </detector>
+
+    <detector name="Water_STL" type="DD4hep_TestShape_Creator">
+      <check>
+        <shape type="CAD_MultiVolume" ref="./stl_files/Pipe_240430/Water_30042024.stl"
+               unit="mm" material="Water">
+          <volume id="0" name="s1" vis="Water_vis" material="Water">
+            <position x="0*cm"  y="0*cm"  z="0*cm"/>
+            <rotation x="0*rad" y="0*rad" z="0*rad"/>
+          </volume>
+        </shape>
+      </check>
+    </detector>
+
+    <detector name="Tungsten_STL" type="DD4hep_TestShape_Creator">
+      <check>
+        <shape type="CAD_MultiVolume" ref="./stl_files/Pipe_240430/Tungsten_mask_02102023.stl"
+               unit="mm" material="Tungsten">
+          <volume id="0" name="s1" vis="Tungsten_vis" material="W">
+            <position x="0*cm"  y="0*cm"  z="0*cm"/>
+            <rotation x="0*rad" y="-pi/2.*rad" z="0*rad"/>
+          </volume>
+        </shape>
+      </check>
+    </detector>
+
+
+  </detectors>
+  
+
+
+</lccdd>
diff --git a/FCCee/MDI/compact/README.md b/FCCee/MDI/compact/README.md
new file mode 100644
index 000000000..0b177c6d5
--- /dev/null
+++ b/FCCee/MDI/compact/README.md
@@ -0,0 +1,18 @@
+aciarma - 08/07/24
+
+- MDI_o1_v00
+-- Beampipe_o4_v05.xml : "shape based" beam pipe with AlBeMet central chamber and Paraffin cooling. From IDEA_o1_v02.
+-- BeamInstrumentation_o1_v01.xml : compensating and screening solenoids
+-- HOMAbsorber.xml : old model of the HOM absorbers. Not needed anymore with new low impedance beam pipe.
+
+- MDI_o1_v01 (STL FILES NOT IN THIS REPO!!! WILL BE ADDED LATER)
+-- Beampipe_CADimport_o1_v02.xml : import CAD models for engineered beam pipe (by F. Fransesini/INFN-LNF)
+These .stl files are hosted [here](https://fccsw.web.cern.ch/fccsw/filesForSimDigiReco/MDI/MDI_o1_v01/)
+-- stl_files/Pipe_240430
+    ├── AlBeMet162_30042024.stl    : central and elliptoconical chambers, with cooling manifolds 
+    ├── Copper_pipe_28092023.stl   : low impedance beam pipe separation region
+    ├── Gold_19042024.stl          : 5um coating inside the central chamber 
+    ├── Paraffine_19042024.stl     : cooling for central chamber
+    ├── Tungsten_mask_02102023.stl : SR masks 2.1m upstream
+    └── Water_30042024.stl         : cooling for elliptoconical chambers
+-- BeamInstrumentation_o1_v01.xml : compensating and screening solenoids
\ No newline at end of file
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 83aae7aa0..3d4876777 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -92,7 +92,7 @@ if(DCH_INFO_H_EXIST)
 SET( test_name "test_IDEA_o1_v03" )
 ADD_TEST( t_${test_name} "${CMAKE_INSTALL_PREFIX}/bin/run_test_${PackageName}.sh"
     ddsim --compactFile=${CMAKE_CURRENT_SOURCE_DIR}/../FCCee/IDEA/compact/IDEA_o1_v03/IDEA_o1_v03.xml --runType=batch -G -N=1 --outputFile=testIDEA_o1_v03.slcio )
-SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION  "Exception;EXCEPTION;ERROR;Error" TIMEOUT 700)
+SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION  " Exception; EXCEPTION;ERROR;Error" TIMEOUT 700)
 endif()
 
 #--------------------------------------------------
@@ -108,7 +108,7 @@ if(DCH_INFO_H_EXIST)
 SET( test_name "test_ALLEGRO_o1_v03" )
 ADD_TEST( t_${test_name} "${CMAKE_INSTALL_PREFIX}/bin/run_test_${PackageName}.sh"
   ddsim --compactFile=${CMAKE_CURRENT_SOURCE_DIR}/../FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/ALLEGRO_o1_v03.xml --runType=batch -G -N=1 --outputFile=testALLEGRO_o1_v03.root )
-SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION  "Exception;EXCEPTION;ERROR;Error" )
+SET_TESTS_PROPERTIES( t_${test_name} PROPERTIES FAIL_REGULAR_EXPRESSION  " Exception; EXCEPTION;ERROR;Error" )
 endif()
 
 #--------------------------------------------------