diff --git a/Configuration/Geometry/README.md b/Configuration/Geometry/README.md
index 2ab4877571547..fdaf68b944b16 100644
--- a/Configuration/Geometry/README.md
+++ b/Configuration/Geometry/README.md
@@ -20,6 +20,7 @@ Muon system:
 
 PPS:
 * P2: 2021 baseline (after using its own material files for pixel)
+* P3: 2021 baseline (same as P2 but removing common materials)
 
 The script also handles the common and forward elements of the geometry:
 * O3: 2021 baseline
@@ -28,12 +29,12 @@ The script also handles the common and forward elements of the geometry:
 * F1: 2021 baseline
 
 Several detector combinations have been generated:
-* 2021 = T3+C1+M1+P2+O3+F1
-* 2021ZeroMaterial = T4+C1+M1+P2+O4+F1
-* 2021FlatMinus05Percent = T5+C1+M1+P2+O5+F1
-* 2021FlatMinus10Percent = T6+C1+M1+P2+O5+F1
-* 2021FlatPlus05Percent = T7+C1+M1+P2+O5+F1
-* 2021FlatPlus10Percent = T8+C1+M1+P2+O5+F1
+* 2021 = T3+C1+M1+P3+O3+F1
+* 2021ZeroMaterial = T4+C1+M1+P3+O4+F1
+* 2021FlatMinus05Percent = T5+C1+M1+P3+O5+F1
+* 2021FlatMinus10Percent = T6+C1+M1+P3+O5+F1
+* 2021FlatPlus05Percent = T7+C1+M1+P3+O5+F1
+* 2021FlatPlus10Percent = T8+C1+M1+P3+O5+F1
 
 # Phase 2 Geometries
 
diff --git a/Configuration/Geometry/python/dict2021Geometry.py b/Configuration/Geometry/python/dict2021Geometry.py
index dde801a5f9824..7fe1de45416b3 100644
--- a/Configuration/Geometry/python/dict2021Geometry.py
+++ b/Configuration/Geometry/python/dict2021Geometry.py
@@ -2144,6 +2144,109 @@
         ],
         "reco" :[
 
+        ],
+    },
+    "P3" : {
+        2 : [
+            'Geometry/ForwardCommonData/data/Run2/totemMaterials.xml',
+            'Geometry/ForwardCommonData/data/totemRotations.xml',
+            'Geometry/VeryForwardData/data/RP_Box.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_000.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_001.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_002.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_003.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_004.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_005.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_020.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_021.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_022.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_023.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_024.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_025.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_100.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_101.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_102.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_103.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_104.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_105.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_120.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_121.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_122.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_123.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_124.xml',
+            'Geometry/VeryForwardData/data/RP_Box/RP_Box_125.xml',
+            'Geometry/VeryForwardData/data/RP_Hybrid/v1/RP_Hybrid.xml',
+            'Geometry/VeryForwardData/data/RP_Materials/v2/RP_Materials.xml',
+            'Geometry/VeryForwardData/data/RP_Transformations.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_000.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_001.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_002.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_004.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_005.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_020.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_021.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_022.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_024.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_025.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_100.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_101.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_102.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_104.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_105.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_120.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_121.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_122.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_124.xml',
+            'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_125.xml',
+            'Geometry/VeryForwardData/data/RP_Device.xml',
+            'Geometry/VeryForwardData/data/RP_Vertical_Device.xml',
+            'Geometry/VeryForwardData/data/RP_Horizontal_Device.xml',
+            'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station/v1/CTPPS_220_Right_Station.xml',
+            'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station/v1/CTPPS_220_Left_Station.xml',
+            'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station/v1/CTPPS_210_Right_Station.xml',
+            'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Left_Station/v1/CTPPS_210_Left_Station.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Stations_Assembly.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Cuts_Per_Region.xml',
+            'Geometry/VeryForwardData/data/RP_Sensitive_Dets.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_Materials.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_Transformations.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_Parameters.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Timing_Station_Parameters.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Timing_Horizontal_Pot.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern1_Segment1.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern2_Segment1.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern2_Segment2.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment1.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment2.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment3.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment4.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment1.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment2.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment3.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment4.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment5.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane1.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane2.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane3.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane4.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Detector_Assembly.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml',
+            'Geometry/VeryForwardData/data/ppstrackerMaterials/v2/ppstrackerMaterials.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Pixel_Module/v3/CTPPS_Pixel_Module.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2/v3/CTPPS_Pixel_Module_2x2.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_003.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_023.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_103.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_123.xml',
+            'Geometry/VeryForwardData/data/CTPPS_Pixel_Sens.xml',
+            'Geometry/VeryForwardData/data/CTPPS_2018/RP_Dist_Beam_Cent.xml',
+            ],
+        "sim" : [
+
+        ],
+        "reco" :[
+
         ],
     },
 }
@@ -2151,12 +2254,12 @@
 allDicts = [ commonDict, trackerDict, caloDict, muonDict, forwardDict, ppsDict ]
 
 detectorVersionDict = {
-    ("O3","T3","C1","M1","F1","P2") : "2021",
-    ("O4","T4","C1","M1","F1","P2") : "2021ZeroMaterial",
-    ("O5","T5","C1","M1","F1","P2") : "2021FlatMinus05Percent",
-    ("O5","T6","C1","M1","F1","P2") : "2021FlatMinus10Percent",
-    ("O5","T7","C1","M1","F1","P2") : "2021FlatPlus05Percent",
-    ("O5","T8","C1","M1","F1","P2") : "2021FlatPlus10Percent",
+    ("O3","T3","C1","M1","F1","P3") : "2021",
+    ("O4","T4","C1","M1","F1","P3") : "2021ZeroMaterial",
+    ("O5","T5","C1","M1","F1","P3") : "2021FlatMinus05Percent",
+    ("O5","T6","C1","M1","F1","P3") : "2021FlatMinus10Percent",
+    ("O5","T7","C1","M1","F1","P3") : "2021FlatPlus05Percent",
+    ("O5","T8","C1","M1","F1","P3") : "2021FlatPlus10Percent",
  }
 
-deprecatedSubdets = set([ "T1", "T2", "O1", "O2", "P1" ])
+deprecatedSubdets = set([ "T1", "T2", "O1", "O2", "P1", "P2" ])
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml
index de33659eb03b7..982a013ac1c23 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml
@@ -289,7 +289,7 @@
     <Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_124.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_125.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Hybrid/v1/RP_Hybrid.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Materials/v1/RP_Materials.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Materials/v2/RP_Materials.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Transformations.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_000.xml'/>
@@ -315,10 +315,10 @@
     <Include ref='Geometry/VeryForwardData/data/RP_Device.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Vertical_Device.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Horizontal_Device.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Left_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station/v1/CTPPS_220_Right_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station/v1/CTPPS_220_Left_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station/v1/CTPPS_210_Right_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Left_Station/v1/CTPPS_210_Left_Station.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Stations_Assembly.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Cuts_Per_Region.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Sensitive_Dets.xml'/>
@@ -345,9 +345,9 @@
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane4.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Detector_Assembly.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/ppstrackerMaterials/v1/ppstrackerMaterials.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module/v2/CTPPS_Pixel_Module.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2/v2/CTPPS_Pixel_Module_2x2.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/ppstrackerMaterials/v2/ppstrackerMaterials.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module/v3/CTPPS_Pixel_Module.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2/v3/CTPPS_Pixel_Module_2x2.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_003.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_023.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_103.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus05Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus05Percent.xml
index 8ab2101adc554..2f49bfb9f0dcb 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus05Percent.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus05Percent.xml
@@ -289,7 +289,7 @@
     <Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_124.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_125.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Hybrid/v1/RP_Hybrid.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Materials/v1/RP_Materials.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Materials/v2/RP_Materials.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Transformations.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_000.xml'/>
@@ -315,10 +315,10 @@
     <Include ref='Geometry/VeryForwardData/data/RP_Device.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Vertical_Device.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Horizontal_Device.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Left_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station/v1/CTPPS_220_Right_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station/v1/CTPPS_220_Left_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station/v1/CTPPS_210_Right_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Left_Station/v1/CTPPS_210_Left_Station.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Stations_Assembly.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Cuts_Per_Region.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Sensitive_Dets.xml'/>
@@ -345,9 +345,9 @@
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane4.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Detector_Assembly.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/ppstrackerMaterials/v1/ppstrackerMaterials.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module/v2/CTPPS_Pixel_Module.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2/v2/CTPPS_Pixel_Module_2x2.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/ppstrackerMaterials/v2/ppstrackerMaterials.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module/v3/CTPPS_Pixel_Module.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2/v3/CTPPS_Pixel_Module_2x2.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_003.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_023.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_103.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus10Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus10Percent.xml
index 03176a481d824..81f4821eea96c 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus10Percent.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus10Percent.xml
@@ -289,7 +289,7 @@
     <Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_124.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_125.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Hybrid/v1/RP_Hybrid.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Materials/v1/RP_Materials.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Materials/v2/RP_Materials.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Transformations.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_000.xml'/>
@@ -315,10 +315,10 @@
     <Include ref='Geometry/VeryForwardData/data/RP_Device.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Vertical_Device.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Horizontal_Device.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Left_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station/v1/CTPPS_220_Right_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station/v1/CTPPS_220_Left_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station/v1/CTPPS_210_Right_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Left_Station/v1/CTPPS_210_Left_Station.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Stations_Assembly.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Cuts_Per_Region.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Sensitive_Dets.xml'/>
@@ -345,9 +345,9 @@
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane4.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Detector_Assembly.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/ppstrackerMaterials/v1/ppstrackerMaterials.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module/v2/CTPPS_Pixel_Module.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2/v2/CTPPS_Pixel_Module_2x2.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/ppstrackerMaterials/v2/ppstrackerMaterials.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module/v3/CTPPS_Pixel_Module.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2/v3/CTPPS_Pixel_Module_2x2.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_003.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_023.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_103.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus05Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus05Percent.xml
index de1257999e66b..bd9a2cec74572 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus05Percent.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus05Percent.xml
@@ -289,7 +289,7 @@
     <Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_124.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_125.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Hybrid/v1/RP_Hybrid.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Materials/v1/RP_Materials.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Materials/v2/RP_Materials.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Transformations.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_000.xml'/>
@@ -315,10 +315,10 @@
     <Include ref='Geometry/VeryForwardData/data/RP_Device.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Vertical_Device.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Horizontal_Device.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Left_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station/v1/CTPPS_220_Right_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station/v1/CTPPS_220_Left_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station/v1/CTPPS_210_Right_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Left_Station/v1/CTPPS_210_Left_Station.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Stations_Assembly.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Cuts_Per_Region.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Sensitive_Dets.xml'/>
@@ -345,9 +345,9 @@
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane4.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Detector_Assembly.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/ppstrackerMaterials/v1/ppstrackerMaterials.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module/v2/CTPPS_Pixel_Module.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2/v2/CTPPS_Pixel_Module_2x2.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/ppstrackerMaterials/v2/ppstrackerMaterials.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module/v3/CTPPS_Pixel_Module.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2/v3/CTPPS_Pixel_Module_2x2.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_003.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_023.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_103.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus10Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus10Percent.xml
index 137e144bb0c91..16852695286f7 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus10Percent.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus10Percent.xml
@@ -289,7 +289,7 @@
     <Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_124.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_125.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Hybrid/v1/RP_Hybrid.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Materials/v1/RP_Materials.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Materials/v2/RP_Materials.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Transformations.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_000.xml'/>
@@ -315,10 +315,10 @@
     <Include ref='Geometry/VeryForwardData/data/RP_Device.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Vertical_Device.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Horizontal_Device.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Left_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station/v1/CTPPS_220_Right_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station/v1/CTPPS_220_Left_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station/v1/CTPPS_210_Right_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Left_Station/v1/CTPPS_210_Left_Station.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Stations_Assembly.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Cuts_Per_Region.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Sensitive_Dets.xml'/>
@@ -345,9 +345,9 @@
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane4.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Detector_Assembly.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/ppstrackerMaterials/v1/ppstrackerMaterials.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module/v2/CTPPS_Pixel_Module.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2/v2/CTPPS_Pixel_Module_2x2.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/ppstrackerMaterials/v2/ppstrackerMaterials.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module/v3/CTPPS_Pixel_Module.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2/v3/CTPPS_Pixel_Module_2x2.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_003.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_023.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_103.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021ZeroMaterial.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021ZeroMaterial.xml
index 6ffcda4b2eaa2..07bc6511c27f4 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021ZeroMaterial.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021ZeroMaterial.xml
@@ -289,7 +289,7 @@
     <Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_124.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Box/RP_Box_125.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Hybrid/v1/RP_Hybrid.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Materials/v1/RP_Materials.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Materials/v2/RP_Materials.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Transformations.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_000.xml'/>
@@ -315,10 +315,10 @@
     <Include ref='Geometry/VeryForwardData/data/RP_Device.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Vertical_Device.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Horizontal_Device.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Left_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station/v1/CTPPS_220_Right_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station/v1/CTPPS_220_Left_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station/v1/CTPPS_210_Right_Station.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Left_Station/v1/CTPPS_210_Left_Station.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Stations_Assembly.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Cuts_Per_Region.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Sensitive_Dets.xml'/>
@@ -345,9 +345,9 @@
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane4.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Detector_Assembly.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/ppstrackerMaterials/v1/ppstrackerMaterials.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module/v2/CTPPS_Pixel_Module.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2/v2/CTPPS_Pixel_Module_2x2.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/ppstrackerMaterials/v2/ppstrackerMaterials.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module/v3/CTPPS_Pixel_Module.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2/v3/CTPPS_Pixel_Module_2x2.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_003.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_023.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_103.xml'/>
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus05PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus05PercentXML_cfi.py
index 2ee9a99e13435..117ad57873106 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus05PercentXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus05PercentXML_cfi.py
@@ -292,7 +292,7 @@
         'Geometry/VeryForwardData/data/RP_Box/RP_Box_124.xml',
         'Geometry/VeryForwardData/data/RP_Box/RP_Box_125.xml',
         'Geometry/VeryForwardData/data/RP_Hybrid/v1/RP_Hybrid.xml',
-        'Geometry/VeryForwardData/data/RP_Materials/v1/RP_Materials.xml',
+        'Geometry/VeryForwardData/data/RP_Materials/v2/RP_Materials.xml',
         'Geometry/VeryForwardData/data/RP_Transformations.xml',
         'Geometry/VeryForwardData/data/RP_Detectors_Assembly.xml',
         'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_000.xml',
@@ -318,10 +318,10 @@
         'Geometry/VeryForwardData/data/RP_Device.xml',
         'Geometry/VeryForwardData/data/RP_Vertical_Device.xml',
         'Geometry/VeryForwardData/data/RP_Horizontal_Device.xml',
-        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station.xml',
-        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station.xml',
-        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station.xml',
-        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Left_Station.xml',
+        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station/v1/CTPPS_220_Right_Station.xml',
+        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station/v1/CTPPS_220_Left_Station.xml',
+        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station/v1/CTPPS_210_Right_Station.xml',
+        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Left_Station/v1/CTPPS_210_Left_Station.xml',
         'Geometry/VeryForwardData/data/CTPPS_Stations_Assembly.xml',
         'Geometry/VeryForwardData/data/CTPPS_Cuts_Per_Region.xml',
         'Geometry/VeryForwardData/data/RP_Sensitive_Dets.xml',
@@ -348,9 +348,9 @@
         'Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane4.xml',
         'Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Detector_Assembly.xml',
         'Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml',
-        'Geometry/VeryForwardData/data/ppstrackerMaterials/v1/ppstrackerMaterials.xml',
-        'Geometry/VeryForwardData/data/CTPPS_Pixel_Module/v2/CTPPS_Pixel_Module.xml',
-        'Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2/v2/CTPPS_Pixel_Module_2x2.xml',
+        'Geometry/VeryForwardData/data/ppstrackerMaterials/v2/ppstrackerMaterials.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Pixel_Module/v3/CTPPS_Pixel_Module.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2/v3/CTPPS_Pixel_Module_2x2.xml',
         'Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_003.xml',
         'Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_023.xml',
         'Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_103.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus10PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus10PercentXML_cfi.py
index 943e5dfe12c7f..09acb0f15c6d8 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus10PercentXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus10PercentXML_cfi.py
@@ -292,7 +292,7 @@
         'Geometry/VeryForwardData/data/RP_Box/RP_Box_124.xml',
         'Geometry/VeryForwardData/data/RP_Box/RP_Box_125.xml',
         'Geometry/VeryForwardData/data/RP_Hybrid/v1/RP_Hybrid.xml',
-        'Geometry/VeryForwardData/data/RP_Materials/v1/RP_Materials.xml',
+        'Geometry/VeryForwardData/data/RP_Materials/v2/RP_Materials.xml',
         'Geometry/VeryForwardData/data/RP_Transformations.xml',
         'Geometry/VeryForwardData/data/RP_Detectors_Assembly.xml',
         'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_000.xml',
@@ -318,10 +318,10 @@
         'Geometry/VeryForwardData/data/RP_Device.xml',
         'Geometry/VeryForwardData/data/RP_Vertical_Device.xml',
         'Geometry/VeryForwardData/data/RP_Horizontal_Device.xml',
-        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station.xml',
-        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station.xml',
-        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station.xml',
-        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Left_Station.xml',
+        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station/v1/CTPPS_220_Right_Station.xml',
+        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station/v1/CTPPS_220_Left_Station.xml',
+        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station/v1/CTPPS_210_Right_Station.xml',
+        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Left_Station/v1/CTPPS_210_Left_Station.xml',
         'Geometry/VeryForwardData/data/CTPPS_Stations_Assembly.xml',
         'Geometry/VeryForwardData/data/CTPPS_Cuts_Per_Region.xml',
         'Geometry/VeryForwardData/data/RP_Sensitive_Dets.xml',
@@ -348,9 +348,9 @@
         'Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane4.xml',
         'Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Detector_Assembly.xml',
         'Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml',
-        'Geometry/VeryForwardData/data/ppstrackerMaterials/v1/ppstrackerMaterials.xml',
-        'Geometry/VeryForwardData/data/CTPPS_Pixel_Module/v2/CTPPS_Pixel_Module.xml',
-        'Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2/v2/CTPPS_Pixel_Module_2x2.xml',
+        'Geometry/VeryForwardData/data/ppstrackerMaterials/v2/ppstrackerMaterials.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Pixel_Module/v3/CTPPS_Pixel_Module.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2/v3/CTPPS_Pixel_Module_2x2.xml',
         'Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_003.xml',
         'Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_023.xml',
         'Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_103.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus05PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus05PercentXML_cfi.py
index 00b9c2cc22b9b..a425db1e90b70 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus05PercentXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus05PercentXML_cfi.py
@@ -292,7 +292,7 @@
         'Geometry/VeryForwardData/data/RP_Box/RP_Box_124.xml',
         'Geometry/VeryForwardData/data/RP_Box/RP_Box_125.xml',
         'Geometry/VeryForwardData/data/RP_Hybrid/v1/RP_Hybrid.xml',
-        'Geometry/VeryForwardData/data/RP_Materials/v1/RP_Materials.xml',
+        'Geometry/VeryForwardData/data/RP_Materials/v2/RP_Materials.xml',
         'Geometry/VeryForwardData/data/RP_Transformations.xml',
         'Geometry/VeryForwardData/data/RP_Detectors_Assembly.xml',
         'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_000.xml',
@@ -318,10 +318,10 @@
         'Geometry/VeryForwardData/data/RP_Device.xml',
         'Geometry/VeryForwardData/data/RP_Vertical_Device.xml',
         'Geometry/VeryForwardData/data/RP_Horizontal_Device.xml',
-        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station.xml',
-        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station.xml',
-        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station.xml',
-        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Left_Station.xml',
+        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station/v1/CTPPS_220_Right_Station.xml',
+        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station/v1/CTPPS_220_Left_Station.xml',
+        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station/v1/CTPPS_210_Right_Station.xml',
+        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Left_Station/v1/CTPPS_210_Left_Station.xml',
         'Geometry/VeryForwardData/data/CTPPS_Stations_Assembly.xml',
         'Geometry/VeryForwardData/data/CTPPS_Cuts_Per_Region.xml',
         'Geometry/VeryForwardData/data/RP_Sensitive_Dets.xml',
@@ -348,9 +348,9 @@
         'Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane4.xml',
         'Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Detector_Assembly.xml',
         'Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml',
-        'Geometry/VeryForwardData/data/ppstrackerMaterials/v1/ppstrackerMaterials.xml',
-        'Geometry/VeryForwardData/data/CTPPS_Pixel_Module/v2/CTPPS_Pixel_Module.xml',
-        'Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2/v2/CTPPS_Pixel_Module_2x2.xml',
+        'Geometry/VeryForwardData/data/ppstrackerMaterials/v2/ppstrackerMaterials.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Pixel_Module/v3/CTPPS_Pixel_Module.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2/v3/CTPPS_Pixel_Module_2x2.xml',
         'Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_003.xml',
         'Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_023.xml',
         'Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_103.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus10PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus10PercentXML_cfi.py
index 1dd60e3917db1..8b49320d678c7 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus10PercentXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus10PercentXML_cfi.py
@@ -292,7 +292,7 @@
         'Geometry/VeryForwardData/data/RP_Box/RP_Box_124.xml',
         'Geometry/VeryForwardData/data/RP_Box/RP_Box_125.xml',
         'Geometry/VeryForwardData/data/RP_Hybrid/v1/RP_Hybrid.xml',
-        'Geometry/VeryForwardData/data/RP_Materials/v1/RP_Materials.xml',
+        'Geometry/VeryForwardData/data/RP_Materials/v2/RP_Materials.xml',
         'Geometry/VeryForwardData/data/RP_Transformations.xml',
         'Geometry/VeryForwardData/data/RP_Detectors_Assembly.xml',
         'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_000.xml',
@@ -318,10 +318,10 @@
         'Geometry/VeryForwardData/data/RP_Device.xml',
         'Geometry/VeryForwardData/data/RP_Vertical_Device.xml',
         'Geometry/VeryForwardData/data/RP_Horizontal_Device.xml',
-        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station.xml',
-        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station.xml',
-        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station.xml',
-        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Left_Station.xml',
+        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station/v1/CTPPS_220_Right_Station.xml',
+        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station/v1/CTPPS_220_Left_Station.xml',
+        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station/v1/CTPPS_210_Right_Station.xml',
+        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Left_Station/v1/CTPPS_210_Left_Station.xml',
         'Geometry/VeryForwardData/data/CTPPS_Stations_Assembly.xml',
         'Geometry/VeryForwardData/data/CTPPS_Cuts_Per_Region.xml',
         'Geometry/VeryForwardData/data/RP_Sensitive_Dets.xml',
@@ -348,9 +348,9 @@
         'Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane4.xml',
         'Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Detector_Assembly.xml',
         'Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml',
-        'Geometry/VeryForwardData/data/ppstrackerMaterials/v1/ppstrackerMaterials.xml',
-        'Geometry/VeryForwardData/data/CTPPS_Pixel_Module/v2/CTPPS_Pixel_Module.xml',
-        'Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2/v2/CTPPS_Pixel_Module_2x2.xml',
+        'Geometry/VeryForwardData/data/ppstrackerMaterials/v2/ppstrackerMaterials.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Pixel_Module/v3/CTPPS_Pixel_Module.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2/v3/CTPPS_Pixel_Module_2x2.xml',
         'Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_003.xml',
         'Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_023.xml',
         'Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_103.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py
index c680579cb5acc..5077825ddc868 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py
@@ -292,7 +292,7 @@
         'Geometry/VeryForwardData/data/RP_Box/RP_Box_124.xml',
         'Geometry/VeryForwardData/data/RP_Box/RP_Box_125.xml',
         'Geometry/VeryForwardData/data/RP_Hybrid/v1/RP_Hybrid.xml',
-        'Geometry/VeryForwardData/data/RP_Materials/v1/RP_Materials.xml',
+        'Geometry/VeryForwardData/data/RP_Materials/v2/RP_Materials.xml',
         'Geometry/VeryForwardData/data/RP_Transformations.xml',
         'Geometry/VeryForwardData/data/RP_Detectors_Assembly.xml',
         'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_000.xml',
@@ -318,10 +318,10 @@
         'Geometry/VeryForwardData/data/RP_Device.xml',
         'Geometry/VeryForwardData/data/RP_Vertical_Device.xml',
         'Geometry/VeryForwardData/data/RP_Horizontal_Device.xml',
-        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station.xml',
-        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station.xml',
-        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station.xml',
-        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Left_Station.xml',
+        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station/v1/CTPPS_220_Right_Station.xml',
+        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station/v1/CTPPS_220_Left_Station.xml',
+        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station/v1/CTPPS_210_Right_Station.xml',
+        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Left_Station/v1/CTPPS_210_Left_Station.xml',
         'Geometry/VeryForwardData/data/CTPPS_Stations_Assembly.xml',
         'Geometry/VeryForwardData/data/CTPPS_Cuts_Per_Region.xml',
         'Geometry/VeryForwardData/data/RP_Sensitive_Dets.xml',
@@ -348,9 +348,9 @@
         'Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane4.xml',
         'Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Detector_Assembly.xml',
         'Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml',
-        'Geometry/VeryForwardData/data/ppstrackerMaterials/v1/ppstrackerMaterials.xml',
-        'Geometry/VeryForwardData/data/CTPPS_Pixel_Module/v2/CTPPS_Pixel_Module.xml',
-        'Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2/v2/CTPPS_Pixel_Module_2x2.xml',
+        'Geometry/VeryForwardData/data/ppstrackerMaterials/v2/ppstrackerMaterials.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Pixel_Module/v3/CTPPS_Pixel_Module.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2/v3/CTPPS_Pixel_Module_2x2.xml',
         'Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_003.xml',
         'Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_023.xml',
         'Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_103.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021ZeroMaterialXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021ZeroMaterialXML_cfi.py
index 81b286920df88..a1289fd9b7d82 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021ZeroMaterialXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021ZeroMaterialXML_cfi.py
@@ -292,7 +292,7 @@
         'Geometry/VeryForwardData/data/RP_Box/RP_Box_124.xml',
         'Geometry/VeryForwardData/data/RP_Box/RP_Box_125.xml',
         'Geometry/VeryForwardData/data/RP_Hybrid/v1/RP_Hybrid.xml',
-        'Geometry/VeryForwardData/data/RP_Materials/v1/RP_Materials.xml',
+        'Geometry/VeryForwardData/data/RP_Materials/v2/RP_Materials.xml',
         'Geometry/VeryForwardData/data/RP_Transformations.xml',
         'Geometry/VeryForwardData/data/RP_Detectors_Assembly.xml',
         'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_000.xml',
@@ -318,10 +318,10 @@
         'Geometry/VeryForwardData/data/RP_Device.xml',
         'Geometry/VeryForwardData/data/RP_Vertical_Device.xml',
         'Geometry/VeryForwardData/data/RP_Horizontal_Device.xml',
-        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station.xml',
-        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station.xml',
-        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station.xml',
-        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Left_Station.xml',
+        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station/v1/CTPPS_220_Right_Station.xml',
+        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station/v1/CTPPS_220_Left_Station.xml',
+        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station/v1/CTPPS_210_Right_Station.xml',
+        'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Left_Station/v1/CTPPS_210_Left_Station.xml',
         'Geometry/VeryForwardData/data/CTPPS_Stations_Assembly.xml',
         'Geometry/VeryForwardData/data/CTPPS_Cuts_Per_Region.xml',
         'Geometry/VeryForwardData/data/RP_Sensitive_Dets.xml',
@@ -348,9 +348,9 @@
         'Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane4.xml',
         'Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Detector_Assembly.xml',
         'Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml',
-        'Geometry/VeryForwardData/data/ppstrackerMaterials/v1/ppstrackerMaterials.xml',
-        'Geometry/VeryForwardData/data/CTPPS_Pixel_Module/v2/CTPPS_Pixel_Module.xml',
-        'Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2/v2/CTPPS_Pixel_Module_2x2.xml',
+        'Geometry/VeryForwardData/data/ppstrackerMaterials/v2/ppstrackerMaterials.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Pixel_Module/v3/CTPPS_Pixel_Module.xml',
+        'Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2/v3/CTPPS_Pixel_Module_2x2.xml',
         'Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_003.xml',
         'Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_023.xml',
         'Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_103.xml',
diff --git a/Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Left_Station/v1/CTPPS_210_Left_Station.xml b/Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Left_Station/v1/CTPPS_210_Left_Station.xml
new file mode 100644
index 0000000000000..38fe95608ba27
--- /dev/null
+++ b/Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Left_Station/v1/CTPPS_210_Left_Station.xml
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<DDDefinition>
+    <ConstantsSection label="CTPPS_210_Left_Station.xml" eval="true">
+        <Constant name="RP_210_Left_Station_Length" value="[CTPPS_Stations_Assembly:CTPPS_220_Left_Station_Position_z]-[CTPPS_Stations_Assembly:CTPPS_210_Left_Station_Position_z]"/>
+        <!--Positions calculated from the wall closer to IP point-->
+        <Constant name="RP_210_Left_Prim_Vert_z" value="608*mm"/>
+        <Constant name="RP_210_Left_Prim_Hor_z" value="1058*mm"/>
+        <Constant name="RP_210_Left_Sec_Hor_z" value="9781*mm"/>
+        <Constant name="RP_210_Left_Sec_Vert_z" value="10231*mm"/>
+
+        <Constant name="RP_210_Left_Sec_Rot_Angle" value="8*deg"/>
+        <Constant name="RP_210_Left_Sec_Rot_Angle_neg8" value="-8*deg"/>
+        <Constant name="RP_210_Left_Sec_Rot_Angle_180" value="180*deg"/>
+        <Constant name="RP_210_Left_Sec_Rot_Angle_172" value="172*deg"/>
+ 
+        <Constant name="RP_210_Left_Hor_Vac_Length" value="[RP_Device:RP_Device_Envelope_Radius]+[RP_Device:RP_Device_Length_y]/2-[RP_Horizontal_Device:RP_Device_Hor_Closed_Wall_Thick_Int]"/>
+    </ConstantsSection>
+
+    <RotationSection label="CTPPS_210_Left_Station.xml">
+        <Rotation name="RP_210_Left_Sec_Rotation" 
+            phiX="[RP_210_Left_Sec_Rot_Angle]" thetaX="90*deg" 
+            phiY="(90*deg+[RP_210_Left_Sec_Rot_Angle])" thetaY="90*deg"
+            phiZ="0*deg" thetaZ="0*deg"/>
+        <Rotation name="RP_210_Left_90_y_Sec_Rotation_neg8" 
+            phiX="0*deg" thetaX="180*deg" 
+            phiY="82*deg" thetaY="90*deg"
+            phiZ="-8*deg" thetaZ="90*deg"/>
+        <Rotation name="RP_210_Left_90_x_Sec_Rotation" 
+            phiX="(0*deg+[RP_210_Left_Sec_Rot_Angle_neg8])" thetaX="90*deg" 
+            phiY="0*deg" thetaY="180*deg" 
+            phiZ="(90*deg+[RP_210_Left_Sec_Rot_Angle_neg8])" thetaZ="90*deg"/>
+        <Rotation name="RP_210_Left_Sec_Rotation_neg8" 
+            phiX="[RP_210_Left_Sec_Rot_Angle_neg8]" thetaX="90*deg" 
+            phiY="(90*deg+[RP_210_Left_Sec_Rot_Angle_neg8])" thetaY="90*deg"
+            phiZ="0*deg" thetaZ="0*deg"/>
+        <Rotation name="RP_210_Left_Sec_Rotation_180" 
+            phiX="[RP_210_Left_Sec_Rot_Angle_180]" thetaX="90*deg" 
+            phiY="(90*deg+[RP_210_Left_Sec_Rot_Angle_180])" thetaY="90*deg"
+            phiZ="0*deg" thetaZ="0*deg"/>
+        <Rotation name="RP_210_Left_Sec_Rotation_172" 
+            phiX="[RP_210_Left_Sec_Rot_Angle_172]" thetaX="90*deg" 
+            phiY="(90*deg+[RP_210_Left_Sec_Rot_Angle_172])" thetaY="90*deg"
+            phiZ="0*deg" thetaZ="0*deg"/>
+    </RotationSection>
+    
+    <SolidSection label="CTPPS_210_Left_Station.xml">  
+        <Tube rMin="0*mm" rMax="[RP_Device:RP_Device_Envelope_Radius]*1.1" dz="[RP_210_Left_Station_Length]/2" name="RP_210_Left_Station"/>
+        <Tube rMin="[RP_Device:RP_Device_Beam_Hole_Diam]/2" rMax="[RP_Device:RP_Device_Beam_Hole_Diam]/2+[RP_Device:RP_Device_Wall_Thickness]" dz="([RP_210_Left_Prim_Vert_z]-[RP_Device:RP_Device_Length_z]/2)/2" name="RP_210_Left_Station_Tube_1"/>
+        <Tube rMin="[RP_Device:RP_Device_Beam_Hole_Diam]/2" rMax="[RP_Device:RP_Device_Beam_Hole_Diam]/2+[RP_Device:RP_Device_Wall_Thickness]" dz="([RP_210_Left_Prim_Hor_z]-[RP_210_Left_Prim_Vert_z]-[RP_Device:RP_Device_Length_z])/2" name="RP_210_Left_Station_Tube_2"/>
+        <Tube rMin="[RP_Device:RP_Device_Beam_Hole_Diam]/2" rMax="[RP_Device:RP_Device_Beam_Hole_Diam]/2+[RP_Device:RP_Device_Wall_Thickness]" dz="([RP_210_Left_Sec_Hor_z]-[RP_210_Left_Prim_Hor_z]-[RP_Device:RP_Device_Length_z])/2" name="RP_210_Left_Station_Tube_3"/>
+        <Tube rMin="[RP_Device:RP_Device_Beam_Hole_Diam]/2" rMax="[RP_Device:RP_Device_Beam_Hole_Diam]/2+[RP_Device:RP_Device_Wall_Thickness]" dz="([RP_210_Left_Sec_Vert_z]-[RP_210_Left_Sec_Hor_z]-[RP_Device:RP_Device_Length_z])/2" name="RP_210_Left_Station_Tube_4"/>
+        <Tube rMin="[RP_Device:RP_Device_Beam_Hole_Diam]/2" rMax="[RP_Device:RP_Device_Beam_Hole_Diam]/2+[RP_Device:RP_Device_Wall_Thickness]" dz="([RP_210_Left_Station_Length]-[RP_210_Left_Sec_Vert_z]-[RP_Device:RP_Device_Length_z]/2)/2" name="RP_210_Left_Station_Tube_5"/>
+        <Tube rMin="0*mm" rMax="[RP_Device:RP_Device_Beam_Hole_Diam]/2" dz="[RP_210_Left_Station_Length]/2" name="RP_210_Left_Station_Vacuum_1"/>
+        <Tube rMin="0*mm" rMax="[RP_Device:RP_Device_RP_Hole_Diam]/2" dz="[RP_Device:RP_Device_Envelope_Radius]" name="RP_210_Left_Station_Vert_Vacuum"/>
+        <UnionSolid name="RP_210_Left_Station_Vacuum_2">
+            <rSolid name="RP_210_Left_Station_Vacuum_1"/>
+            <rSolid name="RP_210_Left_Station_Vert_Vacuum"/>
+            <rRotation name="RP_Transformations:RP_x_90_rot"/>
+            <Translation x="0*mm" y="0*mm" z="-[RP_210_Left_Station_Length]/2+[RP_210_Left_Prim_Vert_z]"/>
+        </UnionSolid>
+        <UnionSolid name="RP_210_Left_Station_Vacuum_3">
+            <rSolid name="RP_210_Left_Station_Vacuum_2"/>
+            <rSolid name="RP_210_Left_Station_Vert_Vacuum"/>
+            <rRotation name="RP_210_Left_90_x_Sec_Rotation"/>
+            <Translation x="0*mm" y="0*mm" z="-[RP_210_Left_Station_Length]/2+[RP_210_Left_Sec_Vert_z]"/>
+        </UnionSolid>
+        <Polycone name="RP_210_Left_Station_Hor_Vacuum" startPhi="0*deg" deltaPhi="360*deg" >
+            <ZSection z="-[RP_Device:RP_Device_Length_y]/2+[RP_Horizontal_Device:RP_Device_Hor_Closed_Wall_Thick_Int]" rMin="0*mm" rMax="[RP_Device:RP_Device_RP_Hole_Diam]/2"/>
+            <ZSection z="-[RP_Device:RP_Device_Length_y]/2+[RP_Horizontal_Device:RP_Device_Hor_Closed_Wall_Thick_Int] + [RP_210_Left_Hor_Vac_Length]" rMin="0*mm" rMax="[RP_Device:RP_Device_RP_Hole_Diam]/2"/>
+        </Polycone> 
+        <UnionSolid name="RP_210_Left_Station_Vacuum_4">
+            <rSolid name="RP_210_Left_Station_Vacuum_3"/>
+            <rSolid name="RP_210_Left_Station_Hor_Vacuum"/>
+            <rRotation name="RP_Transformations:RP_y_90_rot"/>
+            <Translation x="0*mm" y="0*mm" z="-[RP_210_Left_Station_Length]/2+[RP_210_Left_Prim_Hor_z]"/>
+        </UnionSolid>
+        <UnionSolid name="RP_210_Left_Station_Vacuum_5">
+            <rSolid name="RP_210_Left_Station_Vacuum_4"/>
+            <rSolid name="RP_210_Left_Station_Hor_Vacuum"/>
+            <rRotation name="RP_210_Left_90_y_Sec_Rotation_neg8"/>
+            <Translation x="0*mm" y="0*mm" z="-[RP_210_Left_Station_Length]/2+[RP_210_Left_Sec_Hor_z]"/>
+        </UnionSolid>
+
+        <Polycone name="RP_210_Left_Station_Vacuum_1_Far" startPhi="0*deg" deltaPhi="360*deg" >
+            <ZSection z="0*mm" rMin="0*mm" rMax="[RP_Device:RP_Device_Beam_Hole_Diam]/2"/>
+            <ZSection z="[RP_210_Left_Station_Length]/2" rMin="0*mm" rMax="[RP_Device:RP_Device_Beam_Hole_Diam]/2"/>
+        </Polycone> 
+        <UnionSolid name="RP_210_Left_Station_Vacuum_2_Far">
+            <rSolid name="RP_210_Left_Station_Vacuum_1_Far"/>
+            <rSolid name="RP_210_Left_Station_Vert_Vacuum"/>
+            <rRotation name="RP_Transformations:RP_x_90_rot"/>
+            <Translation x="0*mm" y="0*mm" z="-[RP_210_Left_Station_Length]/2+[RP_210_Left_Sec_Vert_z]"/>
+        </UnionSolid>
+        <UnionSolid name="RP_210_Left_Station_Vacuum_3_Far">
+            <rSolid name="RP_210_Left_Station_Vacuum_2_Far"/>
+            <rSolid name="RP_210_Left_Station_Hor_Vacuum"/>
+            <rRotation name="RP_Transformations:RP_y_90_rot"/>
+            <Translation x="0*mm" y="0*mm" z="-[RP_210_Left_Station_Length]/2+[RP_210_Left_Sec_Hor_z]"/>
+        </UnionSolid>
+    </SolidSection>
+    
+    <LogicalPartSection label="CTPPS_210_Left_Station.xml">
+        <LogicalPart name="RP_210_Left_Station">
+            <rSolid name="RP_210_Left_Station"/>
+            <rMaterial name="materials:Air"/>
+        </LogicalPart>
+        <LogicalPart name="RP_210_Left_Station_Tube_1">
+            <rSolid name="RP_210_Left_Station_Tube_1"/>
+            <rMaterial name="RP_Materials:AISI-316L-Steel"/>
+        </LogicalPart>
+        <LogicalPart name="RP_210_Left_Station_Tube_2">
+            <rSolid name="RP_210_Left_Station_Tube_2"/>
+            <rMaterial name="RP_Materials:AISI-316L-Steel"/>
+        </LogicalPart>
+        <LogicalPart name="RP_210_Left_Station_Tube_3">
+            <rSolid name="RP_210_Left_Station_Tube_3"/>
+            <rMaterial name="RP_Materials:AISI-316L-Steel"/>
+        </LogicalPart>
+        <LogicalPart name="RP_210_Left_Station_Tube_4">
+            <rSolid name="RP_210_Left_Station_Tube_4"/>
+            <rMaterial name="RP_Materials:AISI-316L-Steel"/>
+        </LogicalPart>
+        <LogicalPart name="RP_210_Left_Station_Tube_5">
+            <rSolid name="RP_210_Left_Station_Tube_5"/>
+            <rMaterial name="RP_Materials:AISI-316L-Steel"/>
+        </LogicalPart>
+        <LogicalPart name="RP_210_Left_Station_Vacuum_5">
+            <rSolid name="RP_210_Left_Station_Vacuum_5"/>
+            <rMaterial name="RP_Materials:RP_Primary_Vacuum"/>
+        </LogicalPart>
+        <LogicalPart name="RP_210_Left_Station_Vacuum_3_Far">
+            <rSolid name="RP_210_Left_Station_Vacuum_3_Far"/>
+            <rMaterial name="RP_Materials:RP_Primary_Vacuum"/>
+        </LogicalPart>
+    </LogicalPartSection>
+    
+    <PosPartSection label="CTPPS_210_Left_Station.xml">
+        <PosPart copyNumber="1">
+            <rParent name="RP_210_Left_Station"/>
+            <rChild name="RP_Vertical_Device:RP_Device_Vert_Corp_3"/>
+            <Translation x="0*mm" y="0*mm" z="-[RP_210_Left_Station_Length]/2+[RP_210_Left_Prim_Vert_z]"/>
+        </PosPart>
+        <PosPart copyNumber="2">
+            <rParent name="RP_210_Left_Station"/>
+            <rChild name="RP_Vertical_Device:RP_Device_Vert_Corp_3"/>
+            <rRotation name="RP_210_Left_Sec_Rotation_neg8"/>
+            <Translation x="0*mm" y="0*mm" z="-[RP_210_Left_Station_Length]/2+[RP_210_Left_Sec_Vert_z]"/>
+        </PosPart>
+        <PosPart copyNumber="1">
+            <rParent name="RP_210_Left_Station"/>
+            <rChild name="RP_Horizontal_Device:RP_Device_Hor_Corp_3"/>
+            <rRotation name="RP_210_Left_Sec_Rotation_180"/>
+            <Translation x="0*mm" y="0*mm" z="-[RP_210_Left_Station_Length]/2+[RP_210_Left_Prim_Hor_z]"/>
+        </PosPart>
+        <PosPart copyNumber="2">
+            <rParent name="RP_210_Left_Station"/>
+            <rChild name="RP_Horizontal_Device:RP_Device_Hor_Corp_3"/>
+            <rRotation name="RP_210_Left_Sec_Rotation_172"/>
+            <Translation x="0*mm" y="0*mm" z="-[RP_210_Left_Station_Length]/2+[RP_210_Left_Sec_Hor_z]"/>
+        </PosPart>
+        
+        <PosPart copyNumber="1">
+            <rParent name="RP_210_Left_Station"/>
+            <rChild name="RP_210_Left_Station_Tube_1"/>
+            <Translation x="0*mm" y="0*mm" z="-[RP_210_Left_Station_Length]/2+([RP_210_Left_Prim_Vert_z]-[RP_Device:RP_Device_Length_z]/2)/2"/>
+        </PosPart>
+        <PosPart copyNumber="1">
+            <rParent name="RP_210_Left_Station"/>
+            <rChild name="RP_210_Left_Station_Tube_2"/>
+            <Translation x="0*mm" y="0*mm" z="-[RP_210_Left_Station_Length]/2+([RP_210_Left_Prim_Vert_z]+[RP_210_Left_Prim_Hor_z])/2"/>
+        </PosPart>
+        <PosPart copyNumber="1">
+            <rParent name="RP_210_Left_Station"/>
+            <rChild name="RP_210_Left_Station_Tube_3"/>
+            <Translation x="0*mm" y="0*mm" z="-[RP_210_Left_Station_Length]/2+([RP_210_Left_Prim_Hor_z]+[RP_210_Left_Sec_Hor_z])/2"/>
+        </PosPart>
+        <PosPart copyNumber="1">
+            <rParent name="RP_210_Left_Station"/>
+            <rChild name="RP_210_Left_Station_Tube_4"/>
+            <Translation x="0*mm" y="0*mm" z="-[RP_210_Left_Station_Length]/2+([RP_210_Left_Sec_Hor_z]+[RP_210_Left_Sec_Vert_z])/2"/>
+        </PosPart>
+        <PosPart copyNumber="1">
+            <rParent name="RP_210_Left_Station"/>
+            <rChild name="RP_210_Left_Station_Tube_5"/>
+            <Translation x="0*mm" y="0*mm" z="[RP_210_Left_Station_Length]/2-([RP_210_Left_Station_Length]-[RP_210_Left_Sec_Vert_z]-[RP_Device:RP_Device_Length_z]/2)/2"/>
+        </PosPart>
+        <PosPart copyNumber="1">
+            <rParent name="RP_210_Left_Station"/>
+            <rChild name="RP_210_Left_Station_Vacuum_5"/>
+            <rRotation name="RP_210_Left_Sec_Rotation_180"/>
+            <!--<rRotation name="RP_210_Left_Sec_Rotation_180"/>-->
+        </PosPart>
+
+        <PosPart copyNumber="1">
+            <rParent name="RP_210_Left_Station_Vacuum_5"/>
+            <rChild name="RP_210_Left_Station_Vacuum_3_Far"/>
+            <rRotation name="RP_210_Left_Sec_Rotation_neg8"/>
+        </PosPart>
+        
+        <PosPart copyNumber="0">
+            <rParent name="RP_210_Left_Station_Vacuum_5"/>
+            <rChild name="RP_Box_000:RP_box_primary_vacuum"/>
+            <rRotation name="RP_Transformations:RP_z_180_rot"/>
+            <Translation x="0*mm" y="-[RP_Dist_Beam_Cent:RP_147_Left_Det_Dist_1]-[RP_Box:RP_Box_primary_vacuum_y]/2" z="[RP_210_Left_Prim_Vert_z]-[RP_210_Left_Station_Length]/2"/>
+        </PosPart>
+        <PosPart copyNumber="1">
+            <rParent name="RP_210_Left_Station_Vacuum_5"/>
+            <rChild name="RP_Box_001:RP_box_primary_vacuum"/>
+            <Translation x="0*mm" y="[RP_Dist_Beam_Cent:RP_147_Left_Det_Dist_0]+[RP_Box:RP_Box_primary_vacuum_y]/2" z="[RP_210_Left_Prim_Vert_z]-[RP_210_Left_Station_Length]/2"/>
+        </PosPart>
+        <PosPart copyNumber="2">
+            <rParent name="RP_210_Left_Station_Vacuum_5"/>
+            <rChild name="RP_Box_002:RP_box_primary_vacuum"/>
+            <rRotation name="RP_Transformations:RP_90_cw_z_rot"/>
+            <Translation x="-(-[RP_Dist_Beam_Cent:RP_147_Left_Det_Dist_2]-[RP_Box:RP_Box_primary_vacuum_y]/2)" y="0*mm" z="[RP_210_Left_Prim_Hor_z]-[RP_210_Left_Station_Length]/2"/>
+        </PosPart>
+        <PosPart copyNumber="10003">
+            <rParent name="RP_210_Left_Station_Vacuum_3_Far"/>
+            <rChild name="RP_Box_003:RP_box_primary_vacuum"/>
+            <rRotation name="RP_Transformations:RP_90_cw_z_rot"/>
+            <Translation x="-(-[RP_Dist_Beam_Cent:RP_147_Left_Det_Dist_3]-[RP_Box:RP_Box_primary_vacuum_y]/2)" y="0*mm" z="[RP_210_Left_Sec_Hor_z]-[RP_210_Left_Station_Length]/2"/>
+        </PosPart>
+        <PosPart copyNumber="4">
+            <rParent name="RP_210_Left_Station_Vacuum_3_Far"/>
+            <rChild name="RP_Box_004:RP_box_primary_vacuum"/>
+            <rRotation name="RP_Transformations:RP_z_180_rot"/>
+            <Translation x="0*mm" y="-[RP_Dist_Beam_Cent:RP_147_Left_Det_Dist_5]-[RP_Box:RP_Box_primary_vacuum_y]/2" z="[RP_210_Left_Sec_Vert_z]-[RP_210_Left_Station_Length]/2"/>
+        </PosPart>
+        <PosPart copyNumber="5">
+            <rParent name="RP_210_Left_Station_Vacuum_3_Far"/>
+            <rChild name="RP_Box_005:RP_box_primary_vacuum"/>
+            <Translation x="0*mm" y="[RP_Dist_Beam_Cent:RP_147_Left_Det_Dist_4]+[RP_Box:RP_Box_primary_vacuum_y]/2" z="[RP_210_Left_Sec_Vert_z]-[RP_210_Left_Station_Length]/2"/>
+        </PosPart>
+    </PosPartSection>
+</DDDefinition>
diff --git a/Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station/v1/CTPPS_210_Right_Station.xml b/Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station/v1/CTPPS_210_Right_Station.xml
new file mode 100644
index 0000000000000..c3cfc5ad7740f
--- /dev/null
+++ b/Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station/v1/CTPPS_210_Right_Station.xml
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<DDDefinition>
+    <ConstantsSection label="CTPPS_210_Right_Station.xml" eval="true">
+        <Constant name="RP_210_Right_Station_Length" value="-([CTPPS_Stations_Assembly:CTPPS_220_Right_Station_Position_z]-[CTPPS_Stations_Assembly:CTPPS_210_Right_Station_Position_z])"/>
+        <!--Positions calculated from the wall closer to IP point-->
+        <Constant name="RP_210_Right_Prim_Vert_z" value="608*mm"/>
+        <Constant name="RP_210_Right_Prim_Hor_z" value="1058*mm"/>
+        <Constant name="RP_210_Right_Sec_Hor_z" value="9781*mm"/>
+        <Constant name="RP_210_Right_Sec_Vert_z" value="10231*mm"/>
+
+        <Constant name="RP_210_Right_Sec_Rot_Angle" value="8*deg"/>
+        <Constant name="RP_210_Right_Sec_Rot_Angle_neg8" value="-8*deg"/>
+        <Constant name="RP_210_Right_Sec_Rot_Angle_180" value="180*deg"/>
+        <Constant name="RP_210_Right_Sec_Rot_Angle_172" value="172*deg"/>
+
+        <Constant name="RP_210_Right_Hor_Vac_Length" value="[RP_Device:RP_Device_Envelope_Radius]+[RP_Device:RP_Device_Length_y]/2-[RP_Horizontal_Device:RP_Device_Hor_Closed_Wall_Thick_Int]"/>
+    </ConstantsSection>
+
+    <RotationSection label="CTPPS_210_Right_Station.xml">
+        <Rotation name="RP_210_Right_Sec_Rotation" 
+            phiX="[RP_210_Right_Sec_Rot_Angle]" thetaX="90*deg" 
+            phiY="(90*deg+[RP_210_Right_Sec_Rot_Angle])" thetaY="90*deg"
+            phiZ="0*deg" thetaZ="0*deg"/>
+        <Rotation name="RP_210_Right_90_y_Sec_Rotation_neg8" 
+            phiX="0*deg" thetaX="180*deg" 
+            phiY="(90*deg+[RP_210_Right_Sec_Rot_Angle_neg8])" thetaY="90*deg" 
+            phiZ="(0*deg+[RP_210_Right_Sec_Rot_Angle_neg8])" thetaZ="90*deg"/>
+        <Rotation name="RP_210_Right_90_x_Sec_Rotation_neg8" 
+            phiX="(0*deg+[RP_210_Right_Sec_Rot_Angle_neg8])" thetaX="90*deg" 
+            phiY="0*deg" thetaY="180*deg" 
+            phiZ="(90*deg+[RP_210_Right_Sec_Rot_Angle_neg8])" thetaZ="90*deg"/>
+        <Rotation name="RP_210_Right_Sec_Rotation_neg8" 
+            phiX="[RP_210_Right_Sec_Rot_Angle_neg8]" thetaX="90*deg" 
+            phiY="(90*deg+[RP_210_Right_Sec_Rot_Angle_neg8])" thetaY="90*deg"
+            phiZ="0*deg" thetaZ="0*deg"/>
+        <Rotation name="RP_210_Right_Sec_Rotation_180" 
+            phiX="[RP_210_Right_Sec_Rot_Angle_180]" thetaX="90*deg" 
+            phiY="(90*deg+[RP_210_Right_Sec_Rot_Angle_180])" thetaY="90*deg"
+            phiZ="0*deg" thetaZ="0*deg"/>
+        <Rotation name="RP_210_Right_Sec_Rotation_172" 
+            phiX="[RP_210_Right_Sec_Rot_Angle_172]" thetaX="90*deg" 
+            phiY="(90*deg+[RP_210_Right_Sec_Rot_Angle_172])" thetaY="90*deg"
+            phiZ="0*deg" thetaZ="0*deg"/>
+    </RotationSection>
+
+    <SolidSection label="CTPPS_210_Right_Station.xml">  
+        <Tube rMin="0*mm" rMax="[RP_Device:RP_Device_Envelope_Radius]*1.1" dz="[RP_210_Right_Station_Length]/2" name="RP_210_Right_Station"/>
+        <Tube rMin="[RP_Device:RP_Device_Beam_Hole_Diam]/2" rMax="[RP_Device:RP_Device_Beam_Hole_Diam]/2+[RP_Device:RP_Device_Wall_Thickness]" dz="([RP_210_Right_Prim_Vert_z]-[RP_Device:RP_Device_Length_z]/2)/2" name="RP_210_Right_Station_Tube_1"/>
+        <Tube rMin="[RP_Device:RP_Device_Beam_Hole_Diam]/2" rMax="[RP_Device:RP_Device_Beam_Hole_Diam]/2+[RP_Device:RP_Device_Wall_Thickness]" dz="([RP_210_Right_Prim_Hor_z]-[RP_210_Right_Prim_Vert_z]-[RP_Device:RP_Device_Length_z])/2" name="RP_210_Right_Station_Tube_2"/>
+        <Tube rMin="[RP_Device:RP_Device_Beam_Hole_Diam]/2" rMax="[RP_Device:RP_Device_Beam_Hole_Diam]/2+[RP_Device:RP_Device_Wall_Thickness]" dz="([RP_210_Right_Sec_Hor_z]-[RP_210_Right_Prim_Hor_z]-[RP_Device:RP_Device_Length_z])/2" name="RP_210_Right_Station_Tube_3"/>
+        <Tube rMin="[RP_Device:RP_Device_Beam_Hole_Diam]/2" rMax="[RP_Device:RP_Device_Beam_Hole_Diam]/2+[RP_Device:RP_Device_Wall_Thickness]" dz="([RP_210_Right_Sec_Vert_z]-[RP_210_Right_Sec_Hor_z]-[RP_Device:RP_Device_Length_z])/2" name="RP_210_Right_Station_Tube_4"/>
+        <Tube rMin="[RP_Device:RP_Device_Beam_Hole_Diam]/2" rMax="[RP_Device:RP_Device_Beam_Hole_Diam]/2+[RP_Device:RP_Device_Wall_Thickness]" dz="([RP_210_Right_Station_Length]-[RP_210_Right_Sec_Vert_z]-[RP_Device:RP_Device_Length_z]/2)/2" name="RP_210_Right_Station_Tube_5"/>
+        <Tube rMin="0*mm" rMax="[RP_Device:RP_Device_Beam_Hole_Diam]/2" dz="[RP_210_Right_Station_Length]/2" name="RP_210_Right_Station_Vacuum_1"/>
+        <Tube rMin="0*mm" rMax="[RP_Device:RP_Device_RP_Hole_Diam]/2" dz="[RP_Device:RP_Device_Envelope_Radius]" name="RP_210_Right_Station_Vert_Vacuum"/>
+        <UnionSolid name="RP_210_Right_Station_Vacuum_2">
+            <rSolid name="RP_210_Right_Station_Vacuum_1"/>
+            <rSolid name="RP_210_Right_Station_Vert_Vacuum"/>
+            <rRotation name="RP_Transformations:RP_x_90_rot"/>
+            <Translation x="0*mm" y="0*mm" z="-(-[RP_210_Right_Station_Length]/2+[RP_210_Right_Prim_Vert_z])"/>
+        </UnionSolid>
+        <UnionSolid name="RP_210_Right_Station_Vacuum_3">
+            <rSolid name="RP_210_Right_Station_Vacuum_2"/>
+            <rSolid name="RP_210_Right_Station_Vert_Vacuum"/>
+            <rRotation name="RP_210_Right_90_x_Sec_Rotation_neg8"/>
+            <Translation x="0*mm" y="0*mm" z="-(-[RP_210_Right_Station_Length]/2+[RP_210_Right_Sec_Vert_z])"/>
+        </UnionSolid>
+        <Polycone name="RP_210_Right_Station_Hor_Vacuum" startPhi="0*deg" deltaPhi="360*deg" >
+            <ZSection z="-[RP_Device:RP_Device_Length_y]/2+[RP_Horizontal_Device:RP_Device_Hor_Closed_Wall_Thick_Int]" rMin="0*mm" rMax="[RP_Device:RP_Device_RP_Hole_Diam]/2"/>
+            <ZSection z="-[RP_Device:RP_Device_Length_y]/2+[RP_Horizontal_Device:RP_Device_Hor_Closed_Wall_Thick_Int] + [RP_210_Right_Hor_Vac_Length]" rMin="0*mm" rMax="[RP_Device:RP_Device_RP_Hole_Diam]/2"/>
+        </Polycone> 
+        <UnionSolid name="RP_210_Right_Station_Vacuum_4">
+            <rSolid name="RP_210_Right_Station_Vacuum_3"/>
+            <rSolid name="RP_210_Right_Station_Hor_Vacuum"/>
+            <rRotation name="RP_Transformations:RP_y_90_rot"/>
+            <Translation x="0*mm" y="0*mm" z="-(-[RP_210_Right_Station_Length]/2+[RP_210_Right_Prim_Hor_z])"/>
+        </UnionSolid>
+        <UnionSolid name="RP_210_Right_Station_Vacuum_5">
+            <rSolid name="RP_210_Right_Station_Vacuum_4"/>
+            <rSolid name="RP_210_Right_Station_Hor_Vacuum"/>
+            <rRotation name="RP_210_Right_90_y_Sec_Rotation_neg8"/>
+            <Translation x="0*mm" y="0*mm" z="-(-[RP_210_Right_Station_Length]/2+[RP_210_Right_Sec_Hor_z])"/>
+        </UnionSolid>
+
+        <Polycone name="RP_210_Right_Station_Vacuum_1_Far" startPhi="0*deg" deltaPhi="360*deg" >
+            <ZSection z="0*mm" rMin="0*mm" rMax="[RP_Device:RP_Device_Beam_Hole_Diam]/2"/>
+            <ZSection z="-([RP_210_Right_Station_Length]/2)" rMin="0*mm" rMax="[RP_Device:RP_Device_Beam_Hole_Diam]/2"/>
+        </Polycone> 
+        <UnionSolid name="RP_210_Right_Station_Vacuum_2_Far">
+            <rSolid name="RP_210_Right_Station_Vacuum_1_Far"/>
+            <rSolid name="RP_210_Right_Station_Vert_Vacuum"/>
+            <rRotation name="RP_Transformations:RP_x_90_rot"/>
+            <Translation x="0*mm" y="0*mm" z="-(-[RP_210_Right_Station_Length]/2+[RP_210_Right_Sec_Vert_z])"/>
+        </UnionSolid>
+        <UnionSolid name="RP_210_Right_Station_Vacuum_3_Far">
+            <rSolid name="RP_210_Right_Station_Vacuum_2_Far"/>
+            <rSolid name="RP_210_Right_Station_Hor_Vacuum"/>
+            <rRotation name="RP_Transformations:RP_y_90_rot"/>
+            <Translation x="0*mm" y="0*mm" z="-(-[RP_210_Right_Station_Length]/2+[RP_210_Right_Sec_Hor_z])"/>
+        </UnionSolid>
+    </SolidSection>
+
+    <LogicalPartSection label="CTPPS_210_Right_Station.xml">
+        <LogicalPart name="RP_210_Right_Station">
+            <rSolid name="RP_210_Right_Station"/>
+            <rMaterial name="materials:Air"/>
+        </LogicalPart>
+        <LogicalPart name="RP_210_Right_Station_Tube_1">
+            <rSolid name="RP_210_Right_Station_Tube_1"/>
+            <rMaterial name="RP_Materials:AISI-316L-Steel"/>
+        </LogicalPart>
+        <LogicalPart name="RP_210_Right_Station_Tube_2">
+            <rSolid name="RP_210_Right_Station_Tube_2"/>
+            <rMaterial name="RP_Materials:AISI-316L-Steel"/>
+        </LogicalPart>
+        <LogicalPart name="RP_210_Right_Station_Tube_3">
+            <rSolid name="RP_210_Right_Station_Tube_3"/>
+            <rMaterial name="RP_Materials:AISI-316L-Steel"/>
+        </LogicalPart>
+        <LogicalPart name="RP_210_Right_Station_Tube_4">
+            <rSolid name="RP_210_Right_Station_Tube_4"/>
+            <rMaterial name="RP_Materials:AISI-316L-Steel"/>
+        </LogicalPart>
+        <LogicalPart name="RP_210_Right_Station_Tube_5">
+            <rSolid name="RP_210_Right_Station_Tube_5"/>
+            <rMaterial name="RP_Materials:AISI-316L-Steel"/>
+        </LogicalPart>
+        <LogicalPart name="RP_210_Right_Station_Vacuum_5">
+            <rSolid name="RP_210_Right_Station_Vacuum_5"/>
+            <rMaterial name="RP_Materials:RP_Primary_Vacuum"/>
+        </LogicalPart>
+        <LogicalPart name="RP_210_Right_Station_Vacuum_3_Far">
+            <rSolid name="RP_210_Right_Station_Vacuum_3_Far"/>
+            <rMaterial name="RP_Materials:RP_Primary_Vacuum"/>
+        </LogicalPart>
+    </LogicalPartSection>
+
+    <PosPartSection label="CTPPS_210_Right_Station.xml">
+        <PosPart copyNumber="1">
+            <rParent name="RP_210_Right_Station"/>
+            <rChild name="RP_Vertical_Device:RP_Device_Vert_Corp_3"/>
+            <Translation x="0*mm" y="0*mm" z="-(-[RP_210_Right_Station_Length]/2+[RP_210_Right_Prim_Vert_z])"/>
+        </PosPart>
+        <PosPart copyNumber="2">
+            <rParent name="RP_210_Right_Station"/>
+            <rChild name="RP_Vertical_Device:RP_Device_Vert_Corp_3"/>
+            <rRotation name="RP_210_Right_Sec_Rotation_neg8"/>
+            <Translation x="0*mm" y="0*mm" z="-(-[RP_210_Right_Station_Length]/2+[RP_210_Right_Sec_Vert_z])"/>
+        </PosPart>
+        <PosPart copyNumber="1">
+            <rParent name="RP_210_Right_Station"/>
+            <rChild name="RP_Horizontal_Device:RP_Device_Hor_Corp_3"/>
+            <rRotation name="RP_210_Right_Sec_Rotation_180"/>
+            <Translation x="0*mm" y="0*mm" z="-(-[RP_210_Right_Station_Length]/2+[RP_210_Right_Prim_Hor_z])"/>
+        </PosPart>
+        <PosPart copyNumber="2">
+            <rParent name="RP_210_Right_Station"/>
+            <rChild name="RP_Horizontal_Device:RP_Device_Hor_Corp_3"/>
+            <rRotation name="RP_210_Right_Sec_Rotation_172"/>
+            <Translation x="0*mm" y="0*mm" z="-(-[RP_210_Right_Station_Length]/2+[RP_210_Right_Sec_Hor_z])"/>
+        </PosPart>
+
+        <PosPart copyNumber="1">
+            <rParent name="RP_210_Right_Station"/>
+            <rChild name="RP_210_Right_Station_Tube_1"/>
+            <Translation x="0*mm" y="0*mm" z="-(-[RP_210_Right_Station_Length]/2+([RP_210_Right_Prim_Vert_z]-[RP_Device:RP_Device_Length_z]/2)/2)"/>
+        </PosPart>
+        <PosPart copyNumber="1">
+            <rParent name="RP_210_Right_Station"/>
+            <rChild name="RP_210_Right_Station_Tube_2"/>
+            <Translation x="0*mm" y="0*mm" z="-(-[RP_210_Right_Station_Length]/2+([RP_210_Right_Prim_Vert_z]+[RP_210_Right_Prim_Hor_z])/2)"/>
+        </PosPart>
+        <PosPart copyNumber="1">
+            <rParent name="RP_210_Right_Station"/>
+            <rChild name="RP_210_Right_Station_Tube_3"/>
+            <Translation x="0*mm" y="0*mm" z="-(-[RP_210_Right_Station_Length]/2+([RP_210_Right_Prim_Hor_z]+[RP_210_Right_Sec_Hor_z])/2)"/>
+        </PosPart>
+        <PosPart copyNumber="1">
+            <rParent name="RP_210_Right_Station"/>
+            <rChild name="RP_210_Right_Station_Tube_4"/>
+            <Translation x="0*mm" y="0*mm" z="-(-[RP_210_Right_Station_Length]/2+([RP_210_Right_Sec_Hor_z]+[RP_210_Right_Sec_Vert_z])/2)"/>
+        </PosPart>
+        <PosPart copyNumber="1">
+            <rParent name="RP_210_Right_Station"/>
+            <rChild name="RP_210_Right_Station_Tube_5"/>
+            <Translation x="0*mm" y="0*mm" z="-([RP_210_Right_Station_Length]/2-([RP_210_Right_Station_Length]-[RP_210_Right_Sec_Vert_z]-[RP_Device:RP_Device_Length_z]/2)/2)"/>
+        </PosPart>
+        <PosPart copyNumber="1">
+            <rParent name="RP_210_Right_Station"/>
+            <rChild name="RP_210_Right_Station_Vacuum_5"/>
+            <rRotation name="RP_210_Right_Sec_Rotation_180"/>
+        </PosPart>
+
+        <PosPart copyNumber="1">
+            <rParent name="RP_210_Right_Station_Vacuum_5"/>
+            <rChild name="RP_210_Right_Station_Vacuum_3_Far"/>
+            <rRotation name="RP_210_Right_Sec_Rotation_neg8"/>
+        </PosPart>
+
+        <PosPart copyNumber="100">
+            <rParent name="RP_210_Right_Station_Vacuum_5"/>
+            <rChild name="RP_Box_100:RP_box_primary_vacuum"/>
+            <rRotation name="RP_Transformations:RP_180_z_180_y_rot"/>
+            <Translation x="0*mm" y="-[RP_Dist_Beam_Cent:RP_147_Right_Det_Dist_1]-[RP_Box:RP_Box_primary_vacuum_y]/2" z="-([RP_210_Right_Prim_Vert_z]-[RP_210_Right_Station_Length]/2)"/>
+        </PosPart>
+        <PosPart copyNumber="101">
+            <rParent name="RP_210_Right_Station_Vacuum_5"/>
+            <rChild name="RP_Box_101:RP_box_primary_vacuum"/>
+            <rRotation name="RP_Transformations:RP_y_180_rot"/>
+            <Translation x="0*mm" y="[RP_Dist_Beam_Cent:RP_147_Right_Det_Dist_0]+[RP_Box:RP_Box_primary_vacuum_y]/2" z="-([RP_210_Right_Prim_Vert_z]-[RP_210_Right_Station_Length]/2)"/>
+        </PosPart>
+        <PosPart copyNumber="102">
+            <rParent name="RP_210_Right_Station_Vacuum_5"/>
+            <rChild name="RP_Box_102:RP_box_primary_vacuum"/>
+            <rRotation name="RP_Transformations:RP_90_z_cw_180_y_rot"/>
+            <Translation x="-(-[RP_Dist_Beam_Cent:RP_147_Right_Det_Dist_2]-[RP_Box:RP_Box_primary_vacuum_y]/2)" y="0*mm" z="-([RP_210_Right_Prim_Hor_z]-[RP_210_Right_Station_Length]/2)"/>
+        </PosPart>
+        <PosPart copyNumber="10103">
+            <rParent name="RP_210_Right_Station_Vacuum_3_Far"/>
+            <rChild name="RP_Box_103:RP_box_primary_vacuum"/>
+            <rRotation name="RP_Transformations:RP_90_z_cw_180_y_rot"/>
+            <Translation x="-(-[RP_Dist_Beam_Cent:RP_147_Right_Det_Dist_3]-[RP_Box:RP_Box_primary_vacuum_y]/2)" y="0*mm" z="-([RP_210_Right_Sec_Hor_z]-[RP_210_Right_Station_Length]/2)"/>
+        </PosPart>
+        <PosPart copyNumber="104">
+            <rParent name="RP_210_Right_Station_Vacuum_3_Far"/>
+            <rChild name="RP_Box_104:RP_box_primary_vacuum"/>
+            <rRotation name="RP_Transformations:RP_180_z_180_y_rot"/>
+            <Translation x="0*mm" y="-[RP_Dist_Beam_Cent:RP_147_Right_Det_Dist_5]-[RP_Box:RP_Box_primary_vacuum_y]/2" z="-([RP_210_Right_Sec_Vert_z]-[RP_210_Right_Station_Length]/2)"/>
+        </PosPart>
+        <PosPart copyNumber="105">
+            <rParent name="RP_210_Right_Station_Vacuum_3_Far"/>
+            <rChild name="RP_Box_105:RP_box_primary_vacuum"/>
+            <rRotation name="RP_Transformations:RP_y_180_rot"/>
+            <Translation x="0*mm" y="[RP_Dist_Beam_Cent:RP_147_Right_Det_Dist_4]+[RP_Box:RP_Box_primary_vacuum_y]/2" z="-([RP_210_Right_Sec_Vert_z]-[RP_210_Right_Station_Length]/2)"/>
+        </PosPart>
+    </PosPartSection>
+</DDDefinition>
diff --git a/Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station/v1/CTPPS_220_Left_Station.xml b/Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station/v1/CTPPS_220_Left_Station.xml
new file mode 100644
index 0000000000000..ac2a6cb87a7a8
--- /dev/null
+++ b/Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station/v1/CTPPS_220_Left_Station.xml
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<DDDefinition>
+    <ConstantsSection label="CTPPS_220_Left_Station.xml" eval="true">
+        <Constant name="RP_220_Left_Station_Length" value="6588*mm"/>
+        <!--Positions calculated from the wall closer to IP point-->
+        <Constant name="RP_220_Left_Prim_Vert_z" value="608*mm"/>
+        <Constant name="RP_220_Left_Prim_Hor_z" value="1058*mm"/>
+        <Constant name="RP_220_Left_Sec_Hor_z" value="5530*mm"/>
+        <Constant name="RP_220_Left_Sec_Vert_z" value="5980*mm"/>
+        <Constant name="RP_220_Left_Timing_z" value="1680*mm"/>
+        <Constant name="RP_220_Left_Rot_Angle_180" value="180*deg"/>
+        <Constant name="RP_220_Left_Hor_Vac_Length" value="[RP_Device:RP_Device_Envelope_Radius]+[RP_Device:RP_Device_Length_y]/2-[RP_Horizontal_Device:RP_Device_Hor_Closed_Wall_Thick_Int]"/>
+    </ConstantsSection>
+
+    <RotationSection label="CTPPS_220_Left_Station.xml">
+        <Rotation name="RP_220_Left_Sec_Rotation_180" 
+            phiX="[RP_220_Left_Rot_Angle_180]" thetaX="90*deg" 
+            phiY="(90*deg+[RP_220_Left_Rot_Angle_180])" thetaY="90*deg"
+            phiZ="0*deg" thetaZ="0*deg"/>
+        <Rotation name="PPS_Timing_rot" phiX="0*deg" thetaX="0*deg" phiY="90*deg" thetaY="90*deg" phiZ="0*deg" thetaZ="270*deg"/>
+    </RotationSection>
+
+    <SolidSection label="CTPPS_220_Left_Station.xml">  
+        <Tube rMin="0*mm" rMax="[RP_Device:RP_Device_Envelope_Radius]*1.1" dz="[RP_220_Left_Station_Length]/2" name="RP_220_Left_Station"/>
+        <Tube rMin="[RP_Device:RP_Device_Beam_Hole_Diam]/2" rMax="[RP_Device:RP_Device_Beam_Hole_Diam]/2+[RP_Device:RP_Device_Wall_Thickness]" dz="([RP_220_Left_Prim_Vert_z]-[RP_Device:RP_Device_Length_z]/2)/2" name="RP_220_Left_Station_Tube_1"/>
+        <Tube rMin="[RP_Device:RP_Device_Beam_Hole_Diam]/2" rMax="[RP_Device:RP_Device_Beam_Hole_Diam]/2+[RP_Device:RP_Device_Wall_Thickness]" dz="([RP_220_Left_Prim_Hor_z]-[RP_220_Left_Prim_Vert_z]-[RP_Device:RP_Device_Length_z])/2" name="RP_220_Left_Station_Tube_2"/>
+        <Tube rMin="[RP_Device:RP_Device_Beam_Hole_Diam]/2" rMax="[RP_Device:RP_Device_Beam_Hole_Diam]/2+[RP_Device:RP_Device_Wall_Thickness]" dz="([RP_220_Left_Timing_z]-[RP_220_Left_Prim_Hor_z]-[RP_Device:RP_Device_Length_z])/2" name="RP_220_Left_Station_Tube_3a"/>
+        <Tube rMin="[RP_Device:RP_Device_Beam_Hole_Diam]/2" rMax="[RP_Device:RP_Device_Beam_Hole_Diam]/2+[RP_Device:RP_Device_Wall_Thickness]" dz="([RP_220_Left_Sec_Hor_z]-[RP_220_Left_Timing_z]-[RP_Device:RP_Device_Length_z])/2" name="RP_220_Left_Station_Tube_3b"/>
+        <Tube rMin="[RP_Device:RP_Device_Beam_Hole_Diam]/2" rMax="[RP_Device:RP_Device_Beam_Hole_Diam]/2+[RP_Device:RP_Device_Wall_Thickness]" dz="([RP_220_Left_Sec_Vert_z]-[RP_220_Left_Sec_Hor_z]-[RP_Device:RP_Device_Length_z])/2" name="RP_220_Left_Station_Tube_4"/>
+        <Tube rMin="[RP_Device:RP_Device_Beam_Hole_Diam]/2" rMax="[RP_Device:RP_Device_Beam_Hole_Diam]/2+[RP_Device:RP_Device_Wall_Thickness]" dz="([RP_220_Left_Station_Length]-[RP_220_Left_Sec_Vert_z]-[RP_Device:RP_Device_Length_z]/2)/2" name="RP_220_Left_Station_Tube_5"/>
+        <Tube rMin="0*mm" rMax="[RP_Device:RP_Device_Beam_Hole_Diam]/2" dz="[RP_220_Left_Station_Length]/2" name="RP_220_Left_Station_Vacuum_1"/>
+        <Tube rMin="0*mm" rMax="[RP_Device:RP_Device_RP_Hole_Diam]/2" dz="[RP_Device:RP_Device_Envelope_Radius]" name="RP_220_Left_Station_Vert_Vacuum"/>
+        <Tube name="CTPPS_Timing_Positive_Station_Hor_Vacuum" rMin="0*mm" rMax="[CTPPS_Timing_Station_Parameters:Timing_Hole_Diam]/2" dz="[CTPPS_Timing_Station_Parameters:Hor_Vac_Length]/2"/>
+        <UnionSolid name="RP_220_Left_Station_Vacuum_2">
+            <rSolid name="RP_220_Left_Station_Vacuum_1"/>
+            <rSolid name="RP_220_Left_Station_Vert_Vacuum"/>
+            <rRotation name="RP_Transformations:RP_x_90_rot"/>
+            <Translation x="0*mm" y="0*mm" z="-[RP_220_Left_Station_Length]/2+[RP_220_Left_Prim_Vert_z]"/>
+        </UnionSolid>
+        <UnionSolid name="RP_220_Left_Station_Vacuum_3">
+            <rSolid name="RP_220_Left_Station_Vacuum_2"/>
+            <rSolid name="RP_220_Left_Station_Vert_Vacuum"/>
+            <rRotation name="RP_Transformations:RP_x_90_rot"/>
+            <Translation x="0*mm" y="0*mm" z="-[RP_220_Left_Station_Length]/2+[RP_220_Left_Sec_Vert_z]"/>
+        </UnionSolid>
+        <!--<Tube name="CTPPS_Timing_Positive_Station" rMin="0*mm" rMax="[CTPPS_Timing_Station_Parameters:Device_Envelope_Radius]*1.1" dz="[CTPPS_Timing_Station_Parameters:Station_Length]/2"/>-->
+        <UnionSolid name="CTPPS_Timing_Positive_Station_Vacuum_3a">
+          <rSolid name="RP_220_Left_Station_Vacuum_3"/>
+          <rSolid name="CTPPS_Timing_Positive_Station_Hor_Vacuum"/>
+          <rRotation name="CTPPS_Diamond_Transformations:y_90_rot"/>
+<!--      <rRotation name="rotations:90YX"/>-->
+<!--      <rRotation name="CTPPS_Diamond_Transformations:y90D"/>-->
+          <Translation x="[CTPPS_Timing_Station_Parameters:Hor_Vac_Length]/2-[CTPPS_Timing_Station_Parameters:Device_Length_y]/2+[CTPPS_Timing_Station_Parameters:Hor_Closed_Wall_Thick_Int]" y="0*mm" z="-[RP_220_Left_Station_Length]/2+[RP_220_Left_Timing_z]"/>
+        </UnionSolid>
+
+        <Tube rMin="0*mm" rMax="[RP_Device:RP_Device_RP_Hole_Diam]/2" dz="[RP_220_Left_Hor_Vac_Length]/2" name="RP_220_Left_Station_Hor_Vacuum"/>
+        <UnionSolid name="RP_220_Left_Station_Vacuum_4">
+            <rSolid name="CTPPS_Timing_Positive_Station_Vacuum_3a"/>
+            <rSolid name="RP_220_Left_Station_Hor_Vacuum"/>
+            <rRotation name="RP_Transformations:RP_y_90_rot"/>
+            <Translation x="-(-[RP_220_Left_Hor_Vac_Length]/2+[RP_Device:RP_Device_Length_y]/2-[RP_Horizontal_Device:RP_Device_Hor_Closed_Wall_Thick_Int])" y="0*mm" z="-[RP_220_Left_Station_Length]/2+[RP_220_Left_Prim_Hor_z]"/>
+        </UnionSolid>
+        <UnionSolid name="RP_220_Left_Station_Vacuum_5">
+            <rSolid name="RP_220_Left_Station_Vacuum_4"/>
+            <rSolid name="RP_220_Left_Station_Hor_Vacuum"/>
+            <rRotation name="RP_Transformations:RP_y_90_rot"/>
+            <Translation x="-(-[RP_220_Left_Hor_Vac_Length]/2+[RP_Device:RP_Device_Length_y]/2-[RP_Horizontal_Device:RP_Device_Hor_Closed_Wall_Thick_Int])" y="0*mm" z="-[RP_220_Left_Station_Length]/2+[RP_220_Left_Sec_Hor_z]"/>
+        </UnionSolid>
+    </SolidSection>
+    
+    <LogicalPartSection label="CTPPS_220_Left_Station.xml">
+        <LogicalPart name="RP_220_Left_Station">
+            <rSolid name="RP_220_Left_Station"/>
+            <rMaterial name="materials:Air"/>
+        </LogicalPart>
+        <LogicalPart name="RP_220_Left_Station_Tube_1">
+            <rSolid name="RP_220_Left_Station_Tube_1"/>
+            <rMaterial name="RP_Materials:AISI-316L-Steel"/>
+        </LogicalPart>
+        <LogicalPart name="RP_220_Left_Station_Tube_2">
+            <rSolid name="RP_220_Left_Station_Tube_2"/>
+            <rMaterial name="RP_Materials:AISI-316L-Steel"/>
+        </LogicalPart>
+        <LogicalPart name="RP_220_Left_Station_Tube_3a">
+            <rSolid name="RP_220_Left_Station_Tube_3a"/>
+            <rMaterial name="RP_Materials:AISI-316L-Steel"/>
+        </LogicalPart>
+        <LogicalPart name="RP_220_Left_Station_Tube_3b">
+            <rSolid name="RP_220_Left_Station_Tube_3b"/>
+            <rMaterial name="RP_Materials:AISI-316L-Steel"/>
+        </LogicalPart>
+        <LogicalPart name="RP_220_Left_Station_Tube_4">
+            <rSolid name="RP_220_Left_Station_Tube_4"/>
+            <rMaterial name="RP_Materials:AISI-316L-Steel"/>
+        </LogicalPart>
+        <LogicalPart name="RP_220_Left_Station_Tube_5">
+            <rSolid name="RP_220_Left_Station_Tube_5"/>
+            <rMaterial name="RP_Materials:AISI-316L-Steel"/>
+        </LogicalPart>
+        <LogicalPart name="RP_220_Left_Station_Vacuum_5">
+            <rSolid name="RP_220_Left_Station_Vacuum_5"/>
+            <rMaterial name="RP_Materials:RP_Primary_Vacuum"/>
+        </LogicalPart>
+    </LogicalPartSection>
+    
+    <PosPartSection label="CTPPS_220_Left_Station.xml">
+        <PosPart copyNumber="1">
+            <rParent name="RP_220_Left_Station"/>
+            <rChild name="RP_Vertical_Device:RP_Device_Vert_Corp_3"/>
+            <Translation x="0*mm" y="0*mm" z="-[RP_220_Left_Station_Length]/2+[RP_220_Left_Prim_Vert_z]"/>
+        </PosPart>
+        <PosPart copyNumber="2">
+            <rParent name="RP_220_Left_Station"/>
+            <rChild name="RP_Vertical_Device:RP_Device_Vert_Corp_3"/>
+            <Translation x="0*mm" y="0*mm" z="-[RP_220_Left_Station_Length]/2+[RP_220_Left_Sec_Vert_z]"/>
+        </PosPart>
+        <PosPart copyNumber="1">
+            <rParent name="RP_220_Left_Station"/>
+            <rChild name="RP_Horizontal_Device:RP_Device_Hor_Corp_3"/>
+            <rRotation name="RP_220_Left_Sec_Rotation_180"/>
+            <Translation x="0*mm" y="0*mm" z="-[RP_220_Left_Station_Length]/2+[RP_220_Left_Prim_Hor_z]"/>
+        </PosPart>
+        <PosPart copyNumber="2">
+            <rParent name="RP_220_Left_Station"/>
+            <rChild name="RP_Horizontal_Device:RP_Device_Hor_Corp_3"/>
+            <rRotation name="RP_220_Left_Sec_Rotation_180"/>
+            <Translation x="0*mm" y="0*mm" z="-[RP_220_Left_Station_Length]/2+[RP_220_Left_Sec_Hor_z]"/>
+        </PosPart>
+        <PosPart copyNumber="3">
+            <rParent name="RP_220_Left_Station"/>
+            <rChild name="RP_Horizontal_Device:RP_Device_Hor_Corp_3"/>
+            <rRotation name="RP_220_Left_Sec_Rotation_180"/>
+            <Translation x="0*mm" y="0*mm" z="-[RP_220_Left_Station_Length]/2+[RP_220_Left_Timing_z]"/>
+        </PosPart>
+        <PosPart copyNumber="1">
+            <rParent name="RP_220_Left_Station"/>
+            <rChild name="RP_220_Left_Station_Tube_1"/>
+            <Translation x="0*mm" y="0*mm" z="-[RP_220_Left_Station_Length]/2+([RP_220_Left_Prim_Vert_z]-[RP_Device:RP_Device_Length_z]/2)/2"/>
+        </PosPart>
+        <PosPart copyNumber="1">
+            <rParent name="RP_220_Left_Station"/>
+            <rChild name="RP_220_Left_Station_Tube_2"/>
+            <Translation x="0*mm" y="0*mm" z="-[RP_220_Left_Station_Length]/2+([RP_220_Left_Prim_Vert_z]+[RP_220_Left_Prim_Hor_z])/2"/>
+        </PosPart>
+        <PosPart copyNumber="1">
+            <rParent name="RP_220_Left_Station"/>
+            <rChild name="RP_220_Left_Station_Tube_3a"/>
+            <Translation x="0*mm" y="0*mm" z="-[RP_220_Left_Station_Length]/2+([RP_220_Left_Prim_Hor_z]+[RP_220_Left_Timing_z])/2"/>
+        </PosPart>
+        <PosPart copyNumber="1">
+            <rParent name="RP_220_Left_Station"/>
+            <rChild name="RP_220_Left_Station_Tube_3b"/>
+            <Translation x="0*mm" y="0*mm" z="-[RP_220_Left_Station_Length]/2+([RP_220_Left_Timing_z]+[RP_220_Left_Sec_Hor_z])/2"/>
+        </PosPart>
+        <PosPart copyNumber="1">
+            <rParent name="RP_220_Left_Station"/>
+            <rChild name="RP_220_Left_Station_Tube_4"/>
+            <Translation x="0*mm" y="0*mm" z="-[RP_220_Left_Station_Length]/2+([RP_220_Left_Sec_Hor_z]+[RP_220_Left_Sec_Vert_z])/2"/>
+        </PosPart>
+        <PosPart copyNumber="1">
+            <rParent name="RP_220_Left_Station"/>
+            <rChild name="RP_220_Left_Station_Tube_5"/>
+            <Translation x="0*mm" y="0*mm" z="[RP_220_Left_Station_Length]/2-([RP_220_Left_Station_Length]-[RP_220_Left_Sec_Vert_z]-[RP_Device:RP_Device_Length_z]/2)/2"/>
+        </PosPart>
+        <PosPart copyNumber="1">
+            <rParent name="RP_220_Left_Station"/>
+            <rChild name="RP_220_Left_Station_Vacuum_5"/>
+            <rRotation name="RP_220_Left_Sec_Rotation_180"/>
+        </PosPart>
+        
+        <PosPart copyNumber="20">
+            <rParent name="RP_220_Left_Station_Vacuum_5"/>
+            <rChild name="RP_Box_020:RP_box_primary_vacuum"/>
+            <Translation x="0*mm" y="[RP_Dist_Beam_Cent:RP_220_Left_Det_Dist_0]+[RP_Box:RP_Box_primary_vacuum_y]/2" z="[RP_220_Left_Prim_Vert_z]-[RP_220_Left_Station_Length]/2"/>
+        </PosPart>
+        <PosPart copyNumber="21">
+            <rParent name="RP_220_Left_Station_Vacuum_5"/>
+            <rChild name="RP_Box_021:RP_box_primary_vacuum"/>
+            <rRotation name="RP_Transformations:RP_z_180_rot"/>
+            <Translation x="0*mm" y="-[RP_Dist_Beam_Cent:RP_220_Left_Det_Dist_1]-[RP_Box:RP_Box_primary_vacuum_y]/2" z="[RP_220_Left_Prim_Vert_z]-[RP_220_Left_Station_Length]/2"/>
+        </PosPart>
+        <PosPart copyNumber="22">
+            <rParent name="RP_220_Left_Station_Vacuum_5"/>
+            <rChild name="RP_Box_022:RP_box_primary_vacuum"/>
+            <rRotation name="RP_Transformations:RP_90_cw_z_rot"/>
+            <Translation x="-(-[RP_Dist_Beam_Cent:RP_220_Left_Det_Dist_2]-[RP_Box:RP_Box_primary_vacuum_y]/2)" y="0*mm" z="[RP_220_Left_Prim_Hor_z]-[RP_220_Left_Station_Length]/2"/>
+        </PosPart>
+        <PosPart copyNumber="10023">
+            <rParent name="RP_220_Left_Station_Vacuum_5"/>
+            <rChild name="RP_Box_023:RP_box_primary_vacuum"/>
+            <rRotation name="RP_Transformations:RP_90_cw_z_rot"/>
+            <Translation x="-(-[RP_Dist_Beam_Cent:RP_220_Left_Det_Dist_3]-[RP_Box:RP_Box_primary_vacuum_y]/2)" y="0*mm" z="[RP_220_Left_Sec_Hor_z]-[RP_220_Left_Station_Length]/2"/>
+        </PosPart>
+        <PosPart copyNumber="24">
+            <rParent name="RP_220_Left_Station_Vacuum_5"/>
+            <rChild name="RP_Box_024:RP_box_primary_vacuum"/>
+            <Translation x="0*mm" y="[RP_Dist_Beam_Cent:RP_220_Left_Det_Dist_4]+[RP_Box:RP_Box_primary_vacuum_y]/2" z="[RP_220_Left_Sec_Vert_z]-[RP_220_Left_Station_Length]/2"/>
+        </PosPart>
+        <PosPart copyNumber="25">
+            <rParent name="RP_220_Left_Station_Vacuum_5"/>
+            <rChild name="RP_Box_025:RP_box_primary_vacuum"/>
+            <rRotation name="RP_Transformations:RP_z_180_rot"/>
+            <Translation x="0*mm" y="-[RP_Dist_Beam_Cent:RP_220_Left_Det_Dist_5]-[RP_Box:RP_Box_primary_vacuum_y]/2" z="[RP_220_Left_Sec_Vert_z]-[RP_220_Left_Station_Length]/2"/>
+        </PosPart>
+        <PosPart copyNumber="16">
+            <rParent name="RP_220_Left_Station_Vacuum_5"/>
+            <rChild name="CTPPS_Timing_Horizontal_Pot:Primary_Vacuum"/>
+            <rRotation name="rotations:90YX"/>
+            <Translation x="-(-([RP_Dist_Beam_Cent:CTPPS_45_Det_Dist]+[CTPPS_Timing_Horizontal_Pot:plane_length]+[CTPPS_Timing_Horizontal_Pot:cut_depth]+[CTPPS_Timing_Horizontal_Pot:thin_window_thickness])/2)" y="0*cm" z="-[RP_220_Left_Station_Length]/2+[RP_220_Left_Timing_z]"/>
+        </PosPart>
+    </PosPartSection>
+</DDDefinition>
diff --git a/Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station/v1/CTPPS_220_Right_Station.xml b/Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station/v1/CTPPS_220_Right_Station.xml
new file mode 100644
index 0000000000000..25916dfdb7ebd
--- /dev/null
+++ b/Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station/v1/CTPPS_220_Right_Station.xml
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<DDDefinition>
+    <ConstantsSection label="CTPPS_220_Right_Station.xml" eval="true">
+        <Constant name="RP_220_Right_Station_Length" value="6588*mm"/>
+        <!--Positions calculated from the wall closer to IP point-->
+        <Constant name="RP_220_Right_Prim_Vert_z" value="608*mm"/>
+        <Constant name="RP_220_Right_Prim_Hor_z" value="1058*mm"/>
+        <Constant name="RP_220_Right_Sec_Hor_z" value="5530*mm"/>
+        <Constant name="RP_220_Right_Sec_Vert_z" value="5980*mm"/>
+        <Constant name="RP_220_Right_Timing_z" value="1680*mm"/>
+        <Constant name="RP_220_Right_Rot_Angle_180" value="180*deg"/>
+        <Constant name="RP_220_Right_Hor_Vac_Length" value="[RP_Device:RP_Device_Envelope_Radius]+[RP_Device:RP_Device_Length_y]/2-[RP_Horizontal_Device:RP_Device_Hor_Closed_Wall_Thick_Int]"/>
+    </ConstantsSection>
+
+    <RotationSection label="CTPPS_220_Right_Station.xml">
+        <Rotation name="RP_220_Right_Sec_Rotation_180" 
+            phiX="[RP_220_Right_Rot_Angle_180]" thetaX="90*deg" 
+            phiY="(90*deg+[RP_220_Right_Rot_Angle_180])" thetaY="90*deg"
+            phiZ="0*deg" thetaZ="0*deg"/>
+        <Rotation name="PPS_Timing_rot" phiX="0*deg" thetaX="0*deg" phiY="90*deg" thetaY="90*deg" phiZ="0*deg" thetaZ="270*deg"/>
+    </RotationSection>
+
+    <SolidSection label="CTPPS_220_Right_Station.xml">  
+        <Tube rMin="0*mm" rMax="[RP_Device:RP_Device_Envelope_Radius]*1.1" dz="[RP_220_Right_Station_Length]/2" name="RP_220_Right_Station"/>
+        <Tube rMin="[RP_Device:RP_Device_Beam_Hole_Diam]/2" rMax="[RP_Device:RP_Device_Beam_Hole_Diam]/2+[RP_Device:RP_Device_Wall_Thickness]" dz="([RP_220_Right_Prim_Vert_z]-[RP_Device:RP_Device_Length_z]/2)/2" name="RP_220_Right_Station_Tube_1"/>
+        <Tube rMin="[RP_Device:RP_Device_Beam_Hole_Diam]/2" rMax="[RP_Device:RP_Device_Beam_Hole_Diam]/2+[RP_Device:RP_Device_Wall_Thickness]" dz="([RP_220_Right_Prim_Hor_z]-[RP_220_Right_Prim_Vert_z]-[RP_Device:RP_Device_Length_z])/2" name="RP_220_Right_Station_Tube_2"/>
+        <Tube rMin="[RP_Device:RP_Device_Beam_Hole_Diam]/2" rMax="[RP_Device:RP_Device_Beam_Hole_Diam]/2+[RP_Device:RP_Device_Wall_Thickness]" dz="([RP_220_Right_Timing_z]-[RP_220_Right_Prim_Hor_z]-[RP_Device:RP_Device_Length_z])/2" name="RP_220_Right_Station_Tube_3a"/>
+        <Tube rMin="[RP_Device:RP_Device_Beam_Hole_Diam]/2" rMax="[RP_Device:RP_Device_Beam_Hole_Diam]/2+[RP_Device:RP_Device_Wall_Thickness]" dz="([RP_220_Right_Sec_Hor_z]-[RP_220_Right_Timing_z]-[RP_Device:RP_Device_Length_z])/2" name="RP_220_Right_Station_Tube_3b"/>
+        <Tube rMin="[RP_Device:RP_Device_Beam_Hole_Diam]/2" rMax="[RP_Device:RP_Device_Beam_Hole_Diam]/2+[RP_Device:RP_Device_Wall_Thickness]" dz="([RP_220_Right_Sec_Vert_z]-[RP_220_Right_Sec_Hor_z]-[RP_Device:RP_Device_Length_z])/2" name="RP_220_Right_Station_Tube_4"/>
+        <Tube rMin="[RP_Device:RP_Device_Beam_Hole_Diam]/2" rMax="[RP_Device:RP_Device_Beam_Hole_Diam]/2+[RP_Device:RP_Device_Wall_Thickness]" dz="([RP_220_Right_Station_Length]-[RP_220_Right_Sec_Vert_z]-[RP_Device:RP_Device_Length_z]/2)/2" name="RP_220_Right_Station_Tube_5"/>
+        <Tube rMin="0*mm" rMax="[RP_Device:RP_Device_Beam_Hole_Diam]/2" dz="[RP_220_Right_Station_Length]/2" name="RP_220_Right_Station_Vacuum_1"/>
+        <Tube rMin="0*mm" rMax="[RP_Device:RP_Device_RP_Hole_Diam]/2" dz="[RP_Device:RP_Device_Envelope_Radius]" name="RP_220_Right_Station_Vert_Vacuum"/>
+        <Tube name="CTPPS_Timing_Negative_Station_Hor_Vacuum" rMin="0*mm" rMax="[CTPPS_Timing_Station_Parameters:Timing_Hole_Diam]/2" dz="[CTPPS_Timing_Station_Parameters:Hor_Vac_Length]/2"/>
+        <UnionSolid name="RP_220_Right_Station_Vacuum_2">
+            <rSolid name="RP_220_Right_Station_Vacuum_1"/>
+            <rSolid name="RP_220_Right_Station_Vert_Vacuum"/>
+            <rRotation name="RP_Transformations:RP_x_90_rot"/>
+            <Translation x="0*mm" y="0*mm" z="-(-[RP_220_Right_Station_Length]/2+[RP_220_Right_Prim_Vert_z])"/>
+        </UnionSolid>
+        <UnionSolid name="RP_220_Right_Station_Vacuum_3">
+            <rSolid name="RP_220_Right_Station_Vacuum_2"/>
+            <rSolid name="RP_220_Right_Station_Vert_Vacuum"/>
+            <rRotation name="RP_Transformations:RP_x_90_rot"/>
+            <Translation x="0*mm" y="0*mm" z="-(-[RP_220_Right_Station_Length]/2+[RP_220_Right_Sec_Vert_z])"/>
+        </UnionSolid>
+       <UnionSolid name="CTPPS_Timing_Negative_Station_Vacuum_3a">
+          <rSolid name="RP_220_Right_Station_Vacuum_3"/>
+          <rSolid name="CTPPS_Timing_Negative_Station_Hor_Vacuum"/>
+          <rRotation name="CTPPS_Diamond_Transformations:y_90_rot"/>
+<!--      <rRotation name="rotations:90YX"/>-->
+<!--      <rRotation name="CTPPS_Diamond_Transformations:y90D"/>-->
+          <Translation x="[CTPPS_Timing_Station_Parameters:Hor_Vac_Length]/2-[CTPPS_Timing_Station_Parameters:Device_Length_y]/2+[CTPPS_Timing_Station_Parameters:Hor_Closed_Wall_Thick_Int]" y="0*mm" z="-(-[RP_220_Right_Station_Length]/2+[RP_220_Right_Timing_z])"/>
+        </UnionSolid>
+        
+        <Tube rMin="0*mm" rMax="[RP_Device:RP_Device_RP_Hole_Diam]/2" dz="[RP_220_Right_Hor_Vac_Length]/2" name="RP_220_Right_Station_Hor_Vacuum"/>
+        <UnionSolid name="RP_220_Right_Station_Vacuum_4">
+            <rSolid name="CTPPS_Timing_Negative_Station_Vacuum_3a"/>
+            <rSolid name="RP_220_Right_Station_Hor_Vacuum"/>
+            <rRotation name="RP_Transformations:RP_y_90_rot"/>
+            <Translation x="-(-[RP_220_Right_Hor_Vac_Length]/2+[RP_Device:RP_Device_Length_y]/2-[RP_Horizontal_Device:RP_Device_Hor_Closed_Wall_Thick_Int])" y="0*mm" z="-(-[RP_220_Right_Station_Length]/2+[RP_220_Right_Prim_Hor_z])"/>
+        </UnionSolid>
+        <UnionSolid name="RP_220_Right_Station_Vacuum_5">
+            <rSolid name="RP_220_Right_Station_Vacuum_4"/>
+            <rSolid name="RP_220_Right_Station_Hor_Vacuum"/>
+            <rRotation name="RP_Transformations:RP_y_90_rot"/>
+            <Translation x="-(-[RP_220_Right_Hor_Vac_Length]/2+[RP_Device:RP_Device_Length_y]/2-[RP_Horizontal_Device:RP_Device_Hor_Closed_Wall_Thick_Int])" y="0*mm" z="-(-[RP_220_Right_Station_Length]/2+[RP_220_Right_Sec_Hor_z])"/>
+        </UnionSolid>
+    </SolidSection>
+    
+    <LogicalPartSection label="CTPPS_220_Right_Station.xml">
+        <LogicalPart name="RP_220_Right_Station">
+            <rSolid name="RP_220_Right_Station"/>
+            <rMaterial name="materials:Air"/>
+        </LogicalPart>
+        <LogicalPart name="RP_220_Right_Station_Tube_1">
+            <rSolid name="RP_220_Right_Station_Tube_1"/>
+            <rMaterial name="RP_Materials:AISI-316L-Steel"/>
+        </LogicalPart>
+        <LogicalPart name="RP_220_Right_Station_Tube_2">
+            <rSolid name="RP_220_Right_Station_Tube_2"/>
+            <rMaterial name="RP_Materials:AISI-316L-Steel"/>
+        </LogicalPart>
+        <LogicalPart name="RP_220_Right_Station_Tube_3a">
+            <rSolid name="RP_220_Right_Station_Tube_3a"/>
+            <rMaterial name="RP_Materials:AISI-316L-Steel"/>
+        </LogicalPart>
+        <LogicalPart name="RP_220_Right_Station_Tube_3b">
+            <rSolid name="RP_220_Right_Station_Tube_3b"/>
+            <rMaterial name="RP_Materials:AISI-316L-Steel"/>
+        </LogicalPart>
+        <LogicalPart name="RP_220_Right_Station_Tube_4">
+            <rSolid name="RP_220_Right_Station_Tube_4"/>
+            <rMaterial name="RP_Materials:AISI-316L-Steel"/>
+        </LogicalPart>
+        <LogicalPart name="RP_220_Right_Station_Tube_5">
+            <rSolid name="RP_220_Right_Station_Tube_5"/>
+            <rMaterial name="RP_Materials:AISI-316L-Steel"/>
+        </LogicalPart>
+        <LogicalPart name="RP_220_Right_Station_Vacuum_5">
+            <rSolid name="RP_220_Right_Station_Vacuum_5"/>
+            <rMaterial name="RP_Materials:RP_Primary_Vacuum"/>
+        </LogicalPart>
+    </LogicalPartSection>
+    
+    <PosPartSection label="CTPPS_220_Right_Station.xml">
+        <PosPart copyNumber="1">
+            <rParent name="RP_220_Right_Station"/>
+            <rChild name="RP_Vertical_Device:RP_Device_Vert_Corp_3"/>
+            <Translation x="0*mm" y="0*mm" z="-(-[RP_220_Right_Station_Length]/2+[RP_220_Right_Prim_Vert_z])"/>
+        </PosPart>
+        <PosPart copyNumber="2">
+            <rParent name="RP_220_Right_Station"/>
+            <rChild name="RP_Vertical_Device:RP_Device_Vert_Corp_3"/>
+            <Translation x="0*mm" y="0*mm" z="-(-[RP_220_Right_Station_Length]/2+[RP_220_Right_Sec_Vert_z])"/>
+        </PosPart>
+        <PosPart copyNumber="1">
+            <rParent name="RP_220_Right_Station"/>
+            <rChild name="RP_Horizontal_Device:RP_Device_Hor_Corp_3"/>
+            <rRotation name="RP_220_Right_Sec_Rotation_180"/>
+            <Translation x="0*mm" y="0*mm" z="-(-[RP_220_Right_Station_Length]/2+[RP_220_Right_Prim_Hor_z])"/>
+        </PosPart>
+        <PosPart copyNumber="2">
+            <rParent name="RP_220_Right_Station"/>
+            <rChild name="RP_Horizontal_Device:RP_Device_Hor_Corp_3"/>
+            <rRotation name="RP_220_Right_Sec_Rotation_180"/>
+            <Translation x="0*mm" y="0*mm" z="-(-[RP_220_Right_Station_Length]/2+[RP_220_Right_Sec_Hor_z])"/>
+        </PosPart>
+        <PosPart copyNumber="3">
+            <rParent name="RP_220_Right_Station"/>
+            <rChild name="RP_Horizontal_Device:RP_Device_Hor_Corp_3"/>
+            <rRotation name="RP_220_Right_Sec_Rotation_180"/>
+            <Translation x="0*mm" y="0*mm" z="-(-[RP_220_Right_Station_Length]/2+[RP_220_Right_Timing_z])"/>
+        </PosPart>
+        <PosPart copyNumber="1">
+            <rParent name="RP_220_Right_Station"/>
+            <rChild name="RP_220_Right_Station_Tube_1"/>
+            <Translation x="0*mm" y="0*mm" z="-(-[RP_220_Right_Station_Length]/2+([RP_220_Right_Prim_Vert_z]-[RP_Device:RP_Device_Length_z]/2)/2)"/>
+        </PosPart>
+        <PosPart copyNumber="1">
+            <rParent name="RP_220_Right_Station"/>
+            <rChild name="RP_220_Right_Station_Tube_2"/>
+            <Translation x="0*mm" y="0*mm" z="-(-[RP_220_Right_Station_Length]/2+([RP_220_Right_Prim_Vert_z]+[RP_220_Right_Prim_Hor_z])/2)"/>
+        </PosPart>
+        <PosPart copyNumber="1">
+            <rParent name="RP_220_Right_Station"/>
+            <rChild name="RP_220_Right_Station_Tube_3a"/>
+            <Translation x="0*mm" y="0*mm" z="-(-[RP_220_Right_Station_Length]/2+([RP_220_Right_Prim_Hor_z]+[RP_220_Right_Timing_z])/2)"/>
+        </PosPart>
+        <PosPart copyNumber="1">
+            <rParent name="RP_220_Right_Station"/>
+            <rChild name="RP_220_Right_Station_Tube_3b"/>
+            <Translation x="0*mm" y="0*mm" z="-(-[RP_220_Right_Station_Length]/2+([RP_220_Right_Timing_z]+[RP_220_Right_Sec_Hor_z])/2)"/>
+        </PosPart>
+        <PosPart copyNumber="1">
+            <rParent name="RP_220_Right_Station"/>
+            <rChild name="RP_220_Right_Station_Tube_4"/>
+            <Translation x="0*mm" y="0*mm" z="-(-[RP_220_Right_Station_Length]/2+([RP_220_Right_Sec_Hor_z]+[RP_220_Right_Sec_Vert_z])/2)"/>
+        </PosPart>
+        <PosPart copyNumber="1">
+            <rParent name="RP_220_Right_Station"/>
+            <rChild name="RP_220_Right_Station_Tube_5"/>
+            <Translation x="0*mm" y="0*mm" z="-([RP_220_Right_Station_Length]/2-([RP_220_Right_Station_Length]-[RP_220_Right_Sec_Vert_z]-[RP_Device:RP_Device_Length_z]/2)/2)"/>
+        </PosPart>
+        <PosPart copyNumber="1">
+            <rParent name="RP_220_Right_Station"/>
+            <rChild name="RP_220_Right_Station_Vacuum_5"/>
+            <rRotation name="RP_220_Right_Sec_Rotation_180"/>
+        </PosPart>
+        
+        <PosPart copyNumber="120">
+            <rParent name="RP_220_Right_Station_Vacuum_5"/>
+            <rChild name="RP_Box_120:RP_box_primary_vacuum"/>
+            <rRotation name="RP_Transformations:RP_y_180_rot"/>
+            <Translation x="0*mm" y="[RP_Dist_Beam_Cent:RP_220_Right_Det_Dist_0]+[RP_Box:RP_Box_primary_vacuum_y]/2" z="-([RP_220_Right_Prim_Vert_z]-[RP_220_Right_Station_Length]/2)"/>
+        </PosPart>
+        <PosPart copyNumber="121">
+            <rParent name="RP_220_Right_Station_Vacuum_5"/>
+            <rChild name="RP_Box_121:RP_box_primary_vacuum"/>
+            <rRotation name="RP_Transformations:RP_180_z_180_y_rot"/>
+            <Translation x="0*mm" y="-[RP_Dist_Beam_Cent:RP_220_Right_Det_Dist_1]-[RP_Box:RP_Box_primary_vacuum_y]/2" z="-([RP_220_Right_Prim_Vert_z]-[RP_220_Right_Station_Length]/2)"/>
+        </PosPart>
+        <PosPart copyNumber="122">
+            <rParent name="RP_220_Right_Station_Vacuum_5"/>
+            <rChild name="RP_Box_122:RP_box_primary_vacuum"/>
+            <rRotation name="RP_Transformations:RP_90_z_cw_180_y_rot"/>
+            <Translation x="-(-[RP_Dist_Beam_Cent:RP_220_Right_Det_Dist_2]-[RP_Box:RP_Box_primary_vacuum_y]/2)" y="0*mm" z="-([RP_220_Right_Prim_Hor_z]-[RP_220_Right_Station_Length]/2)"/>
+        </PosPart>
+        <PosPart copyNumber="10123">
+            <rParent name="RP_220_Right_Station_Vacuum_5"/>
+            <rChild name="RP_Box_123:RP_box_primary_vacuum"/>
+            <rRotation name="RP_Transformations:RP_90_z_cw_180_y_rot"/>
+            <Translation x="-(-[RP_Dist_Beam_Cent:RP_220_Right_Det_Dist_3]-[RP_Box:RP_Box_primary_vacuum_y]/2)" y="0*mm" z="-([RP_220_Right_Sec_Hor_z]-[RP_220_Right_Station_Length]/2)"/>
+        </PosPart>
+        <PosPart copyNumber="124">
+            <rParent name="RP_220_Right_Station_Vacuum_5"/>
+            <rChild name="RP_Box_124:RP_box_primary_vacuum"/>
+            <rRotation name="RP_Transformations:RP_y_180_rot"/>
+            <Translation x="0*mm" y="[RP_Dist_Beam_Cent:RP_220_Right_Det_Dist_4]+[RP_Box:RP_Box_primary_vacuum_y]/2" z="-([RP_220_Right_Sec_Vert_z]-[RP_220_Right_Station_Length]/2)"/>
+        </PosPart>
+        <PosPart copyNumber="125">
+            <rParent name="RP_220_Right_Station_Vacuum_5"/>
+            <rChild name="RP_Box_125:RP_box_primary_vacuum"/>
+            <rRotation name="RP_Transformations:RP_180_z_180_y_rot"/>
+            <Translation x="0*mm" y="-[RP_Dist_Beam_Cent:RP_220_Right_Det_Dist_5]-[RP_Box:RP_Box_primary_vacuum_y]/2" z="-([RP_220_Right_Sec_Vert_z]-[RP_220_Right_Station_Length]/2)"/>
+        </PosPart>
+        <PosPart copyNumber="116">
+            <rParent name="RP_220_Right_Station_Vacuum_5"/>
+            <rChild name="CTPPS_Timing_Horizontal_Pot:Primary_Vacuum"/>
+            <rRotation name="rotations:90YX"/>
+            <Translation x="-(-([RP_Dist_Beam_Cent:CTPPS_56_Det_Dist]+[CTPPS_Timing_Horizontal_Pot:plane_length]+[CTPPS_Timing_Horizontal_Pot:cut_depth]+[CTPPS_Timing_Horizontal_Pot:thin_window_thickness])/2)" y="0*cm" z="-(-[RP_220_Right_Station_Length]/2+[RP_220_Right_Timing_z])"/>
+        </PosPart>
+    </PosPartSection>
+</DDDefinition>
diff --git a/Geometry/VeryForwardData/data/CTPPS_Pixel_Module/v3/CTPPS_Pixel_Module.xml b/Geometry/VeryForwardData/data/CTPPS_Pixel_Module/v3/CTPPS_Pixel_Module.xml
new file mode 100644
index 0000000000000..b55e55d36f4f5
--- /dev/null
+++ b/Geometry/VeryForwardData/data/CTPPS_Pixel_Module/v3/CTPPS_Pixel_Module.xml
@@ -0,0 +1,387 @@
+<?xml version="1.0"?>
+<DDDefinition>
+
+<!--
+CTPPS Tracker module
+
+Author: F.Ferro - INFN Genova
+
+-->
+
+<ConstantsSection label="CTPPS_Pixel_Module.xml" eval="true">
+<Constant name="EnvelopL" value="57*mm"/>
+<Constant name="EnvelopW" value="86*mm"/>     <!-- Hybrid+Glue+TPG+Glue+hybrid -->
+<Constant name="EnvelopT" value="1.31*mm"/>    <!--  FLEX+TPG+ROC+BB+WAFER+2COLLE-->
+
+<!-- TPG 
+
+                          86
+     ____________________________
+     |                                        |
+     |                                        |
+     |                                        |
+     |                                        |  57
+     |                                        |
+     |                                        |
+     |_________   27.2     ________|
+        29.25   \________/               2.2
+                         25.6
+                   0.8
+
+thickness 0.5mm
+
+-->
+
+<Constant name="TPGL" value="57*mm"/>
+<Constant name="TPGW" value="86*mm"/>    
+<Constant name="TPGT" value="0.5*mm"/>
+<Constant name="TPGappW1" value="25.6*mm"/> 
+<Constant name="TPGappW2" value="27.2*mm"/> 
+<Constant name="TPGappL" value="2.2*mm"/>
+
+
+<Constant name="HybridL1" value="57*mm-22.6*mm"/><!-- 57 - (24.8-2.2) -->
+<Constant name="HybridW1" value="66*mm"/>     
+<Constant name="HybridL2" value="22.6*mm"/>
+<Constant name="HybridW2" value="21.1*mm"/>     
+<Constant name="HybridT" value="0.3*mm"/>
+<Constant name="HybridappW2" value="2.8*mm"/>     
+<Constant name="HybridappW1" value="2*mm"/>     
+<Constant name="HybridappL" value="2.2*mm"/>  <!--   = TPGappL  -->
+
+
+
+<Constant name="TPGvsROCoffset"  value="0.0*mm"/> <!-- value="0.32*mm"/> -->
+
+
+ <Constant name="ROChipL"            value="7.9*mm"/>    <!-- Readout chip length -->
+ <Constant name="ROChipW"            value="10.2*mm"/>     <!-- Readout chip width -->
+ <Constant name="ROChipT"            value="0.150*mm"/>    <!-- Readout chip thickness -->
+ <Constant name="ROChipSpaceL"       value="0.2*mm"/>    <!-- Distance (along width) between adjacent chips -->
+ <Constant name="ROChipSpaceW"       value="0.2*mm"/>    <!-- Distance (along length) between  adjacent chips -->
+
+
+
+ <Constant name="WaferL"            value="24.4*mm"/>    
+ <Constant name="WaferW"            value="16.6*mm"/>    
+ <Constant name="WaferT"            value="0.23*mm"/>   
+
+ <Constant name="ROCvsWaferoffset" value="0.15*mm"/>  <!-- value="0.4*mm"/> -->
+
+ <Constant name="GlueT"              value="0.050*mm"/>
+
+ <Constant name="BumpBondT"          value="0.030*mm"/>
+ <Constant name="BumpBondW"          value="[WaferW]/2-3*[ROChipSpaceW]/2."  />
+
+
+</ConstantsSection>
+
+<SolidSection label="CTPPS_Pixel_Module.xml">
+
+<!--
+
+THE ENVELOP IS DONE OF TWO PARTS: ONE WITH THE TPG SHAPE AND THE THICKNESS OF FLEX+TPG+ROC+BB+WAFER+2GLUES; THE OTHER ONE IS A PARALLELEPIPED THAT DESCRIBES THE SENSOR  PROTUBERANCE AND IS WIDE AS THE SENSOR, THICK LIKE THE SENSOR AND 0.15 MM HIGH 
+
+-->
+
+ <Box name="Envelop1"              dx="[EnvelopW]/2."   dy="[EnvelopL]/2."    dz="[EnvelopT]/2." /><!--  FLEX+TPG+ROC+BB+WAFER+2GLUES envelop  -->
+                                           
+<Trd1 name="Envelop2"              dx1="[TPGappW2]/2."  dx2="[TPGappW1]/2."   dy1="[EnvelopT]/2." dy2="[EnvelopT]/2."  dz="[TPGappL]/2." /> <!-- appendice envelop  -->   
+                                           
+<Box name="Envelop3"              dx="[WaferW]/2."   dy="0.075*mm"   dz="[WaferT]/2." /> <!-- PROTUBERANCE sensor envelop  -->   
+                                          
+
+<UnionSolid name="Envelop4">
+  <rSolid name="Envelop1"/>
+    <rSolid name="Envelop2"/>
+<rRotation name="rotations:RM1902" />
+   <Translation x="0." y="-[EnvelopL]/2.-[TPGappL]/2." z="0."/>
+  </UnionSolid>
+
+<UnionSolid name="Envelop">
+  <rSolid name="Envelop4"/>
+    <rSolid name="Envelop3"/>
+    <Translation x="0." y="-[EnvelopL]/2.-[TPGappL]-0.075*mm" z="[EnvelopT]/2.-[WaferT]/2."/>
+  </UnionSolid>
+
+
+<!--
+
+
+FOR THE TPG I TAKE AN OBJECT AS ENVELOP1+ENVELOP2 BUT 500uM THICK. FOR THE TWO FLEX HYBRID I TAKE AN OBJECT DONE AS TH TPG BUT WITH A HOLE OF 21.1X24.8 MM2 AND 300uM THICK. THE SAME FOR THE GLUES.
+
+
+--> 
+
+
+<!-- TPG  -->
+<Box name="TPG1"              dx="[TPGW]/2."   dy="[TPGL]/2."    dz="[TPGT]/2." />
+<Trd1 name="TPG2"              dx1="[TPGappW2]/2."  dx2="[TPGappW1]/2."   dy1="[TPGT]/2." dy2="[TPGT]/2."  dz="[TPGappL]/2." /> <!-- appendix  -->   
+<UnionSolid name="TPG">
+  <rSolid name="TPG1"/>
+  <rSolid name="TPG2"/>
+  <rRotation name="rotations:RM1902" />
+  <Translation x="0." y="-[TPGL]/2.-[TPGappL]/2." z="0."/>
+</UnionSolid>
+
+<Box name="TPGGlue1"              dx="[HybridW1]/2."   dy="[TPGL]/2."    dz="[GlueT]/2." />
+<Trd1 name="TPGGlue2"              dx1="[TPGappW2]/2."  dx2="[TPGappW1]/2."   dy1="[GlueT]/2." dy2="[GlueT]/2."  dz="[TPGappL]/2." /> <!-- appendix  -->   
+<Box name="ScassoColla"      dx="[HybridW2]/2."   dy="[HybridL2]/2.+[HybridappL]/2."    dz="[GlueT]" /> 
+
+
+<UnionSolid name="TPGGlue3">
+  <rSolid name="CTPPS_Pixel_Module:TPGGlue1"/>
+  <rSolid name="CTPPS_Pixel_Module:TPGGlue2"/>
+  <rRotation name="rotations:RM1902" />
+  <Translation x="0." y="-[TPGL]/2.-[TPGappL]/2." z="0."/>
+</UnionSolid>
+
+<SubtractionSolid name="TPGGlue">
+  <rSolid name="CTPPS_Pixel_Module:TPGGlue3"/>
+  <rSolid name="CTPPS_Pixel_Module:ScassoColla"/>
+  <rRotation name="rotations:000D" />
+  <Translation x="0" y=" -([TPGL]/2.-[HybridL2]+[HybridL2]/2.+[HybridappL]/2.)" z="0."/> 
+</SubtractionSolid>
+
+
+
+<Tubs name="HoleTPG" rMin="0*m" rMax="2*mm" dz="[TPGT]/2." startPhi="0*deg" deltaPhi="360*deg"/>
+
+
+<!-- FLEX HYDRID : two hybrids equal, one should have a tail  -->
+<Box name="Hybrid1"              dx="[HybridW1]/2."   dy="[TPGL]/2."    dz="[HybridT]/2." />
+<Trd1 name="Hybrid2"              dx1="[TPGappW2]/2."  dx2="[TPGappW1]/2."   dy1="[HybridT]/2." dy2="[HybridT]/2."  dz="[TPGappL]/2." /> <!-- appendix  -->   
+<UnionSolid name="Hybrid3">
+  <rSolid name="Hybrid1"/>
+  <rSolid name="Hybrid2"/>
+  <rRotation name="rotations:RM1902" />
+  <Translation x="0." y="-[TPGL]/2.-[TPGappL]/2." z="0."/>
+</UnionSolid>
+
+<Box name="Scasso"              dx="[HybridW2]/2."   dy="([HybridL2]+[HybridappL])/2."    dz="[HybridT]" />
+<SubtractionSolid name="Hybrid">
+  <rSolid name="Hybrid3"/>
+  <rSolid name="Scasso"/>
+  <Translation x="0." y="-([TPGL]/2.-[HybridL2]+[HybridL2]/2.+[HybridappL]/2.)" z="0."/>
+</SubtractionSolid>
+
+<Box name="RPixWafer"              dx="[WaferW]/2."   dy="[WaferL]/2."     dz="[WaferT]/2." />
+
+<Box name="ROChip"        dx="[ROChipW]/2" dy="[ROChipL]/2"
+                                        dz="[ROChipT]/2" />
+
+
+ <Box name="BumpBond"        dx="[BumpBondW]/2" dy="[ROChipL]/2"
+                                        dz="[BumpBondT]/2" />
+
+
+</SolidSection>
+
+
+
+
+<LogicalPartSection label="CTPPS_Pixel_Module.xml">
+
+ <LogicalPart name="Envelop" category="unspecified">
+  <rSolid name="Envelop"/>
+  <rMaterial name="materials:Vacuum"/>
+ </LogicalPart>
+
+
+
+ <LogicalPart name="TPG" category="unspecified">
+  <rSolid name="TPG"/>
+  <rMaterial name="pixfwdMaterials:FPix_TPG"/>
+ </LogicalPart>
+
+ <LogicalPart name="TPGGlue" category="unspecified">
+  <rSolid name="CTPPS_Pixel_Module:TPGGlue"/>
+  <rMaterial name="pixfwdMaterials:FPix_Thermflow"/>
+ </LogicalPart>
+
+ <LogicalPart name="HoleTPG" category="unspecified">
+  <rSolid name="HoleTPG"/>
+  <rMaterial name="materials:Vacuum"/>
+ </LogicalPart>
+
+
+ <LogicalPart name="Hybrid" category="unspecified">
+  <rSolid name="Hybrid"/>
+  <rMaterial name="pixfwdMaterials:Pix_Fwd_HDI"/> 
+
+ 
+
+ </LogicalPart>
+
+ <LogicalPart name="RPixWafer" category="unspecified">
+  <rSolid name="RPixWafer"/>
+  <rMaterial name="materials:Silicon"/>
+ </LogicalPart>
+ 
+ <LogicalPart name="ROChip" category="unspecified">
+  <rSolid name="ROChip"/>
+  <rMaterial name="pixfwdMaterials:Pix_Fwd_ROChip"/>
+ </LogicalPart>
+
+ <LogicalPart name="BumpBond" category="unspecified">
+  <rSolid name="BumpBond"/>
+  <rMaterial name="ppstrackerMaterials:Pix_Fwd_Bump"/>
+ </LogicalPart>
+
+
+</LogicalPartSection>
+
+
+ 
+<PosPartSection label="CTPPS_Pixel_Module.xml">
+
+
+ <PosPart copyNumber="1">
+  <rParent name="CTPPS_Pixel_Module:Envelop"/>
+  <rChild name="CTPPS_Pixel_Module:TPG"/>
+  <Translation x="0"  y="[EnvelopL]/2.-[TPGL]/2."  z="-[EnvelopT]/2.+[HybridT]+[GlueT]+[TPGT]/2." /> 
+ </PosPart>
+
+ <PosPart copyNumber="1">
+  <rParent name="CTPPS_Pixel_Module:Envelop"/>
+  <rChild name="CTPPS_Pixel_Module:TPGGlue"/>
+  <Translation x="0"  y="[EnvelopL]/2.-[TPGL]/2."  z="-[EnvelopT]/2.+[HybridT]+[GlueT]/2." />
+ </PosPart>
+<PosPart copyNumber="2">
+  <rParent name="CTPPS_Pixel_Module:Envelop"/>
+  <rChild name="CTPPS_Pixel_Module:TPGGlue"/>
+  <Translation x="0"  y="[EnvelopL]/2.-[TPGL]/2."  z="-[EnvelopT]/2.+[HybridT]+[GlueT]+[TPGT]+[GlueT]/2." />
+ </PosPart>
+
+ <PosPart copyNumber="1">
+  <rParent name="CTPPS_Pixel_Module:TPG"/>
+  <rChild name="CTPPS_Pixel_Module:HoleTPG"/>
+  <Translation x="[TPGW]/2.-4*mm"  y="[TPGL]/2.-15*mm"  z="0*mm" />
+ </PosPart>
+
+ <PosPart copyNumber="2">
+  <rParent name="CTPPS_Pixel_Module:TPG"/>
+  <rChild name="CTPPS_Pixel_Module:HoleTPG"/>
+  <Translation x="-[TPGW]/2.+4*mm"  y="[TPGL]/2.-15*mm"  z="0*mm" />
+ </PosPart>
+
+ <PosPart copyNumber="3">
+  <rParent name="CTPPS_Pixel_Module:TPG"/>
+  <rChild name="CTPPS_Pixel_Module:HoleTPG"/>
+  <Translation x="[TPGW]/2.-4*mm"  y="[TPGL]/2.-52*mm"  z="0*mm" />
+ </PosPart>
+
+ <PosPart copyNumber="4">
+  <rParent name="CTPPS_Pixel_Module:TPG"/>
+  <rChild name="CTPPS_Pixel_Module:HoleTPG"/>
+  <Translation x="-[TPGW]/2.+4*mm"  y="[TPGL]/2.-52*mm"  z="0*mm" />
+ </PosPart>
+
+
+
+
+ <PosPart copyNumber="1">
+  <rParent name="CTPPS_Pixel_Module:Envelop"/>
+  <rChild name="CTPPS_Pixel_Module:Hybrid"/>
+  <Translation x="0"  y="[EnvelopL]/2.-[TPGL]/2."  z="-[EnvelopT]/2.+[HybridT]/2." />
+ </PosPart>
+
+ <PosPart copyNumber="2">
+  <rParent name="CTPPS_Pixel_Module:Envelop"/>
+  <rChild name="CTPPS_Pixel_Module:Hybrid"/>
+  <Translation x="0"  y="[EnvelopL]/2.-[TPGL]/2."  z="-[EnvelopT]/2.+[HybridT]+[GlueT]+[TPGT]+[GlueT]+[HybridT]/2." />
+ </PosPart>
+
+
+
+
+
+
+<PosPart copyNumber="1">
+  <rParent name="CTPPS_Pixel_Module:Envelop"/>
+  <rChild name="CTPPS_Pixel_Module:ROChip"/>
+  <Translation x="-[ROChipW]/2.-[ROChipSpaceW]/2."  y="[EnvelopL]/2.-[TPGL]-[TPGappL]+[ROChipL]/2.-[TPGvsROCoffset]"  z="-[EnvelopT]/2.+[HybridT]+[GlueT]+[TPGT]+[GlueT]+[ROChipT]/2." />
+ </PosPart>
+
+<PosPart copyNumber="2">
+  <rParent name="CTPPS_Pixel_Module:Envelop"/>
+  <rChild name="CTPPS_Pixel_Module:ROChip"/>
+  <Translation x="[ROChipW]/2.+[ROChipSpaceW]/2."  y="[EnvelopL]/2.-[TPGL]-[TPGappL]+[ROChipL]/2.-[TPGvsROCoffset]"  z="-[EnvelopT]/2.+[HybridT]+[GlueT]+[TPGT]+[GlueT]+[ROChipT]/2." />
+ </PosPart>
+
+<PosPart copyNumber="3">
+  <rParent name="CTPPS_Pixel_Module:Envelop"/>
+  <rChild name="CTPPS_Pixel_Module:ROChip"/>
+  <Translation x="-[ROChipW]/2.-[ROChipSpaceW]/2."  y="[EnvelopL]/2.-[TPGL]-[TPGappL]+3*[ROChipL]/2.+[ROChipSpaceL]-[TPGvsROCoffset]"  z="-[EnvelopT]/2.+[HybridT]+[GlueT]+[TPGT]+[GlueT]+[ROChipT]/2." />
+ </PosPart>
+
+<PosPart copyNumber="4">
+  <rParent name="CTPPS_Pixel_Module:Envelop"/>
+  <rChild name="CTPPS_Pixel_Module:ROChip"/>
+  <Translation x="[ROChipW]/2.+[ROChipSpaceW]/2."  y="[EnvelopL]/2.-[TPGL]-[TPGappL]+3*[ROChipL]/2.+[ROChipSpaceL]-[TPGvsROCoffset]"  z="-[EnvelopT]/2.+[HybridT]+[GlueT]+[TPGT]+[GlueT]+[ROChipT]/2." />
+ </PosPart>
+
+<PosPart copyNumber="5">
+  <rParent name="CTPPS_Pixel_Module:Envelop"/>
+  <rChild name="CTPPS_Pixel_Module:ROChip"/>
+  <Translation x="-[ROChipW]/2.-[ROChipSpaceW]/2."  y="[EnvelopL]/2.-[TPGL]-[TPGappL]+5*[ROChipL]/2.+2*[ROChipSpaceL]-[TPGvsROCoffset]"  z="-[EnvelopT]/2.+[HybridT]+[GlueT]+[TPGT]+[GlueT]+[ROChipT]/2." />
+ </PosPart>
+
+<PosPart copyNumber="6">
+  <rParent name="CTPPS_Pixel_Module:Envelop"/>
+  <rChild name="CTPPS_Pixel_Module:ROChip"/>
+  <Translation x="[ROChipW]/2.+[ROChipSpaceW]/2."  y="[EnvelopL]/2.-[TPGL]-[TPGappL]+5*[ROChipL]/2.+2*[ROChipSpaceL]-[TPGvsROCoffset]"  z="-[EnvelopT]/2.+[HybridT]+[GlueT]+[TPGT]+[GlueT]+[ROChipT]/2." />
+ </PosPart>
+
+
+<PosPart copyNumber="1">
+  <rParent name="CTPPS_Pixel_Module:Envelop"/>
+  <rChild name="CTPPS_Pixel_Module:BumpBond"/>
+  <Translation x="-[WaferW]/4.+3*[ROChipSpaceW]/4."  y="[EnvelopL]/2.-[TPGL]-[TPGappL]+[ROChipL]/2.-[TPGvsROCoffset]"  z="-[EnvelopT]/2.+[HybridT]+[GlueT]+[TPGT]+[GlueT]+[ROChipT]+[BumpBondT]/2." />
+ </PosPart>
+
+<PosPart copyNumber="2">
+  <rParent name="CTPPS_Pixel_Module:Envelop"/>
+  <rChild name="CTPPS_Pixel_Module:BumpBond"/>
+  <Translation x="+[WaferW]/4.-3*[ROChipSpaceW]/4."  y="[EnvelopL]/2.-[TPGL]-[TPGappL]+[ROChipL]/2.-[TPGvsROCoffset]"  z="-[EnvelopT]/2.+[HybridT]+[GlueT]+[TPGT]+[GlueT]+[ROChipT]+[BumpBondT]/2." />
+ </PosPart>
+
+<PosPart copyNumber="3">
+  <rParent name="CTPPS_Pixel_Module:Envelop"/>
+  <rChild name="CTPPS_Pixel_Module:BumpBond"/>
+  <Translation x="-[WaferW]/4.+3*[ROChipSpaceW]/4."  y="[EnvelopL]/2.-[TPGL]-[TPGappL]+3*[ROChipL]/2.+[ROChipSpaceL]-[TPGvsROCoffset]"  z="-[EnvelopT]/2.+[HybridT]+[GlueT]+[TPGT]+[GlueT]+[ROChipT]+[BumpBondT]/2." />
+ </PosPart>
+
+<PosPart copyNumber="4">
+  <rParent name="CTPPS_Pixel_Module:Envelop"/>
+  <rChild name="CTPPS_Pixel_Module:BumpBond"/>
+  <Translation x="+[WaferW]/4.-3*[ROChipSpaceW]/4."  y="[EnvelopL]/2.-[TPGL]-[TPGappL]+3*[ROChipL]/2.+[ROChipSpaceL]-[TPGvsROCoffset]"  z="-[EnvelopT]/2.+[HybridT]+[GlueT]+[TPGT]+[GlueT]+[ROChipT]+[BumpBondT]/2." />
+ </PosPart>
+
+<PosPart copyNumber="5">
+  <rParent name="CTPPS_Pixel_Module:Envelop"/>
+  <rChild name="CTPPS_Pixel_Module:BumpBond"/>
+  <Translation x="-[WaferW]/4.+3*[ROChipSpaceW]/4."  y="[EnvelopL]/2.-[TPGL]-[TPGappL]+5*[ROChipL]/2.+2*[ROChipSpaceL]-[TPGvsROCoffset]"  z="-[EnvelopT]/2.+[HybridT]+[GlueT]+[TPGT]+[GlueT]+[ROChipT]+[BumpBondT]/2." />
+ </PosPart>
+
+<PosPart copyNumber="6">
+  <rParent name="CTPPS_Pixel_Module:Envelop"/>
+  <rChild name="CTPPS_Pixel_Module:BumpBond"/>
+  <Translation x="+[WaferW]/4.-3*[ROChipSpaceW]/4."  y="[EnvelopL]/2.-[TPGL]-[TPGappL]+5*[ROChipL]/2.+2*[ROChipSpaceL]-[TPGvsROCoffset]"  z="-[EnvelopT]/2.+[HybridT]+[GlueT]+[TPGT]+[GlueT]+[ROChipT]+[BumpBondT]/2." />
+ </PosPart>
+
+
+
+<PosPart copyNumber="1">
+  <rParent name="CTPPS_Pixel_Module:Envelop"/>
+  <rChild name="CTPPS_Pixel_Module:RPixWafer"/>
+  <Translation x="0"  y="[EnvelopL]/2.-[TPGL]-[TPGappL]-[TPGvsROCoffset]-[ROCvsWaferoffset]+[WaferL]/2."  z="-[EnvelopT]/2.+[HybridT]+[GlueT]+[TPGT]+[GlueT]+[ROChipT]+[BumpBondT]+[WaferT]/2." />
+
+ </PosPart>
+
+
+</PosPartSection>
+
+
+
+</DDDefinition>
diff --git a/Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2/v3/CTPPS_Pixel_Module_2x2.xml b/Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2/v3/CTPPS_Pixel_Module_2x2.xml
new file mode 100644
index 0000000000000..eb92d1eb52694
--- /dev/null
+++ b/Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2/v3/CTPPS_Pixel_Module_2x2.xml
@@ -0,0 +1,371 @@
+<?xml version="1.0"?>
+<DDDefinition>
+
+<!--
+CTPPS Tracker module 2x2
+
+Author: F.Ferro - INFN Genova
+
+-->
+
+<ConstantsSection label="CTPPS_Pixel_Module_2x2.xml" eval="true">
+
+<Constant name="EnvelopL" value="57*mm"/>
+<Constant name="EnvelopW" value="86*mm"/>     <!-- Hybrid+Glue+TPG+Glue+hybrid -->
+<Constant name="EnvelopT" value="1.31*mm"/>    <!--  FLEX+TPG+ROC+BB+WAFER+2COLLE-->
+
+<!-- TPG 
+
+                          86
+     ____________________________
+     |                                        |
+     |                                        |
+     |                                        |
+     |                                        |  57
+     |                                        |
+     |                                        |
+     |_________   27.2     ________|
+        29.25   \________/               2.2
+                         25.6
+                   0.8
+
+thickness 0.5mm
+
+-->
+
+<Constant name="TPGL" value="57*mm"/>
+<Constant name="TPGW" value="86*mm"/>    
+<Constant name="TPGT" value="0.5*mm"/>
+<Constant name="TPGappW1" value="25.6*mm"/> 
+<Constant name="TPGappW2" value="27.2*mm"/> 
+<Constant name="TPGappL" value="2.2*mm"/>
+
+
+<Constant name="HybridL1" value="57*mm-22.6*mm"/><!-- 57 - (24.8-2.2) -->
+<Constant name="HybridW1" value="66*mm"/>     
+<Constant name="HybridL2" value="22.6*mm"/>
+<Constant name="HybridW2" value="21.1*mm"/>     
+<Constant name="HybridT" value="0.3*mm"/>
+<Constant name="HybridappW2" value="2.8*mm"/>     
+<Constant name="HybridappW1" value="2*mm"/>     
+<Constant name="HybridappL" value="2.2*mm"/>  <!--   = TPGappL  -->
+
+
+
+<Constant name="TPGvsROCoffset"  value="0.0*mm"/> <!-- value="0.32*mm"/> -->
+
+
+ <Constant name="ROChipL"            value="7.9*mm"/>    <!-- Readout chip length -->
+ <Constant name="ROChipW"            value="10.2*mm"/>     <!-- Readout chip width -->
+ <Constant name="ROChipT"            value="0.150*mm"/>    <!-- Readout chip thickness -->
+ <Constant name="ROChipSpaceL"       value="0.2*mm"/>    <!-- Distance (along width) between adjacent chips -->
+ <Constant name="ROChipSpaceW"       value="0.2*mm"/>    <!-- Distance (along length) between  adjacent chips -->
+
+
+
+ <Constant name="WaferL"            value="24.4*mm"/>    
+ <Constant name="WaferW"            value="16.6*mm"/>    
+ <Constant name="WaferT"            value="0.23*mm"/>   
+
+<Constant name="noWaferL"  value="8.1*mm"/>
+
+ <Constant name="ROCvsWaferoffset" value="0.15*mm"/>  <!-- value="0.4*mm"/> -->
+
+ <Constant name="GlueT"              value="0.050*mm"/>
+
+ <Constant name="BumpBondT"          value="0.030*mm"/>
+ <Constant name="BumpBondW"          value="[WaferW]/2-3*[ROChipSpaceW]/2."  />
+
+
+</ConstantsSection>
+
+<SolidSection label="CTPPS_Pixel_Module_2x2.xml">
+
+<!--
+
+THE ENVELOP IS DONE OF TWO PARTS: ONE WITH THE TPG SHAPE AND THE THICKNESS OF FLEX+TPG+ROC+BB+WAFER+2GLUES; THE OTHER ONE IS A PARALLELEPIPED THAT DESCRIBES THE SENSOR  PROTUBERANCE AND IS WIDE AS THE SENSOR, THICK LIKE THE SENSOR AND 0.15 MM HIGH 
+
+-->
+
+ <Box name="Envelop1"              dx="[EnvelopW]/2."   dy="[EnvelopL]/2."    dz="[EnvelopT]/2." /><!--  FLEX+TPG+ROC+BB+WAFER+2GLUES envelop  -->
+                                           
+<Trd1 name="Envelop2"              dx1="[TPGappW2]/2."  dx2="[TPGappW1]/2."   dy1="[EnvelopT]/2." dy2="[EnvelopT]/2."  dz="[TPGappL]/2." /> <!-- appendice envelop  -->   
+                                           
+<Box name="Envelop3"              dx="[WaferW]/2."   dy="0.075*mm"   dz="[WaferT]/2." /> <!-- PROTUBERANCE sensor envelop  -->   
+                                          
+
+<UnionSolid name="Envelop4">
+  <rSolid name="Envelop1"/>
+    <rSolid name="Envelop2"/>
+<rRotation name="rotations:RM1902" />
+   <Translation x="0." y="-[EnvelopL]/2.-[TPGappL]/2." z="0."/>
+  </UnionSolid>
+
+<UnionSolid name="Envelop">
+  <rSolid name="Envelop4"/>
+    <rSolid name="Envelop3"/>
+    <Translation x="0." y="-[EnvelopL]/2.-[TPGappL]-0.075*mm" z="[EnvelopT]/2.-[WaferT]/2."/>
+  </UnionSolid>
+
+
+<!--
+
+
+FOR THE TPG I TAKE AN OBJECT AS ENVELOP1+ENVELOP2 BUT 500uM THICK. FOR THE TWO FLEX HYBRID I TAKE AN OBJECT DONE AS TH TPG BUT WITH A HOLE OF 21.1X24.8 MM2 AND 300uM THICK. THE SAME FOR THE GLUES.
+
+
+--> 
+
+
+<!-- TPG  -->
+<Box name="TPG1"              dx="[TPGW]/2."   dy="[TPGL]/2."    dz="[TPGT]/2." />
+<Trd1 name="TPG2"              dx1="[TPGappW2]/2."  dx2="[TPGappW1]/2."   dy1="[TPGT]/2." dy2="[TPGT]/2."  dz="[TPGappL]/2." /> <!-- appendix  -->   
+<UnionSolid name="TPG">
+  <rSolid name="TPG1"/>
+  <rSolid name="TPG2"/>
+  <rRotation name="rotations:RM1902" />
+  <Translation x="0." y="-[TPGL]/2.-[TPGappL]/2." z="0."/>
+</UnionSolid>
+
+<Box name="TPGGlue1"              dx="[HybridW1]/2."   dy="[TPGL]/2."    dz="[GlueT]/2." />
+<Trd1 name="TPGGlue2"              dx1="[TPGappW2]/2."  dx2="[TPGappW1]/2."   dy1="[GlueT]/2." dy2="[GlueT]/2."  dz="[TPGappL]/2." /> <!-- appendix  -->   
+<Box name="ScassoColla"      dx="[HybridW2]/2."   dy="[HybridL2]/2.+[HybridappL]/2."    dz="[GlueT]" /> 
+
+
+<UnionSolid name="TPGGlue3">
+  <rSolid name="CTPPS_Pixel_Module_2x2:TPGGlue1"/>
+  <rSolid name="CTPPS_Pixel_Module_2x2:TPGGlue2"/>
+  <rRotation name="rotations:RM1902" />
+  <Translation x="0." y="-[TPGL]/2.-[TPGappL]/2." z="0."/>
+</UnionSolid>
+
+<SubtractionSolid name="TPGGlue">
+  <rSolid name="CTPPS_Pixel_Module_2x2:TPGGlue3"/>
+  <rSolid name="CTPPS_Pixel_Module_2x2:ScassoColla"/>
+  <rRotation name="rotations:000D" />
+  <Translation x="0" y=" -([TPGL]/2.-[HybridL2]+[HybridL2]/2.+[HybridappL]/2.)" z="0."/> 
+</SubtractionSolid>
+
+
+
+<Tubs name="HoleTPG" rMin="0*m" rMax="2*mm" dz="[TPGT]/2." startPhi="0*deg" deltaPhi="360*deg"/>
+
+
+<!-- FLEX HYDRID : two hybrids equal, one should have a tail  -->
+<Box name="Hybrid1"              dx="[HybridW1]/2."   dy="[TPGL]/2."    dz="[HybridT]/2." />
+<Trd1 name="Hybrid2"              dx1="[TPGappW2]/2."  dx2="[TPGappW1]/2."   dy1="[HybridT]/2." dy2="[HybridT]/2."  dz="[TPGappL]/2." /> <!-- appendix  -->   
+<UnionSolid name="Hybrid3">
+  <rSolid name="Hybrid1"/>
+  <rSolid name="Hybrid2"/>
+  <rRotation name="rotations:RM1902" />
+  <Translation x="0." y="-[TPGL]/2.-[TPGappL]/2." z="0."/>
+</UnionSolid>
+
+<Box name="Scasso"              dx="[HybridW2]/2."   dy="([HybridL2]+[HybridappL])/2."    dz="[HybridT]" />
+<SubtractionSolid name="Hybrid">
+  <rSolid name="Hybrid3"/>
+  <rSolid name="Scasso"/>
+  <Translation x="0." y="-([TPGL]/2.-[HybridL2]+[HybridL2]/2.+[HybridappL]/2.)" z="0."/>
+</SubtractionSolid>
+
+<Box name="RPixWafer2x2"              dx="[WaferW]/2."   dy="[WaferL]/2."     dz="[WaferT]/2." />
+<Box name="RPixnoWafer"              dx="[WaferW]/2."   dy="[noWaferL]/2."     dz="[WaferT]/2." />
+
+
+<Box name="ROChip"        dx="[ROChipW]/2" dy="[ROChipL]/2"
+                                        dz="[ROChipT]/2" />
+
+
+ <Box name="BumpBond"        dx="[BumpBondW]/2" dy="[ROChipL]/2"
+                                        dz="[BumpBondT]/2" />
+
+
+</SolidSection>
+
+
+
+
+<LogicalPartSection label="CTPPS_Pixel_Module_2x2.xml">
+
+ <LogicalPart name="Envelop" category="unspecified">
+  <rSolid name="Envelop"/>
+  <rMaterial name="materials:Vacuum"/>
+ </LogicalPart>
+
+
+
+ <LogicalPart name="TPG" category="unspecified">
+  <rSolid name="TPG"/>
+  <rMaterial name="pixfwdMaterials:FPix_TPG"/>
+ </LogicalPart>
+
+ <LogicalPart name="TPGGlue" category="unspecified">
+  <rSolid name="CTPPS_Pixel_Module_2x2:TPGGlue"/>
+  <rMaterial name="pixfwdMaterials:FPix_Thermflow"/>
+ </LogicalPart>
+
+ <LogicalPart name="HoleTPG" category="unspecified">
+  <rSolid name="HoleTPG"/>
+  <rMaterial name="materials:Vacuum"/>
+ </LogicalPart>
+
+
+ <LogicalPart name="Hybrid" category="unspecified">
+  <rSolid name="Hybrid"/>
+  <rMaterial name="pixfwdMaterials:Pix_Fwd_HDI"/> 
+
+ 
+
+ </LogicalPart>
+
+ <LogicalPart name="RPixWafer2x2" category="unspecified">
+  <rSolid name="RPixWafer2x2"/>
+  <rMaterial name="materials:Silicon"/>
+ </LogicalPart>
+
+<LogicalPart name="RPixnoWafer" category="unspecified">
+  <rSolid name="RPixnoWafer"/>
+  <rMaterial name="materials:Vacuum"/>
+ </LogicalPart>
+ 
+ <LogicalPart name="ROChip" category="unspecified">
+  <rSolid name="ROChip"/>
+  <rMaterial name="pixfwdMaterials:Pix_Fwd_ROChip"/>
+ </LogicalPart>
+
+ <LogicalPart name="BumpBond" category="unspecified">
+  <rSolid name="BumpBond"/>
+  <rMaterial name="ppstrackerMaterials:Pix_Fwd_Bump"/>
+ </LogicalPart>
+
+
+</LogicalPartSection>
+
+
+ 
+<PosPartSection label="CTPPS_Pixel_Module_2x2.xml">
+
+
+ <PosPart copyNumber="1">
+  <rParent name="CTPPS_Pixel_Module_2x2:Envelop"/>
+  <rChild name="CTPPS_Pixel_Module_2x2:TPG"/>
+  <Translation x="0"  y="[EnvelopL]/2.-[TPGL]/2."  z="-[EnvelopT]/2.+[HybridT]+[GlueT]+[TPGT]/2." /> 
+ </PosPart>
+
+ <PosPart copyNumber="1">
+  <rParent name="CTPPS_Pixel_Module_2x2:Envelop"/>
+  <rChild name="CTPPS_Pixel_Module_2x2:TPGGlue"/>
+  <Translation x="0"  y="[EnvelopL]/2.-[TPGL]/2."  z="-[EnvelopT]/2.+[HybridT]+[GlueT]/2." />
+ </PosPart>
+<PosPart copyNumber="2">
+  <rParent name="CTPPS_Pixel_Module_2x2:Envelop"/>
+  <rChild name="CTPPS_Pixel_Module_2x2:TPGGlue"/>
+  <Translation x="0"  y="[EnvelopL]/2.-[TPGL]/2."  z="-[EnvelopT]/2.+[HybridT]+[GlueT]+[TPGT]+[GlueT]/2." />
+ </PosPart>
+
+ <PosPart copyNumber="1">
+  <rParent name="CTPPS_Pixel_Module_2x2:TPG"/>
+  <rChild name="CTPPS_Pixel_Module_2x2:HoleTPG"/>
+  <Translation x="[TPGW]/2.-4*mm"  y="[TPGL]/2.-15*mm"  z="0*mm" />
+ </PosPart>
+
+ <PosPart copyNumber="2">
+  <rParent name="CTPPS_Pixel_Module_2x2:TPG"/>
+  <rChild name="CTPPS_Pixel_Module_2x2:HoleTPG"/>
+  <Translation x="-[TPGW]/2.+4*mm"  y="[TPGL]/2.-15*mm"  z="0*mm" />
+ </PosPart>
+
+ <PosPart copyNumber="3">
+  <rParent name="CTPPS_Pixel_Module_2x2:TPG"/>
+  <rChild name="CTPPS_Pixel_Module_2x2:HoleTPG"/>
+  <Translation x="[TPGW]/2.-4*mm"  y="[TPGL]/2.-52*mm"  z="0*mm" />
+ </PosPart>
+
+ <PosPart copyNumber="4">
+  <rParent name="CTPPS_Pixel_Module_2x2:TPG"/>
+  <rChild name="CTPPS_Pixel_Module_2x2:HoleTPG"/>
+  <Translation x="-[TPGW]/2.+4*mm"  y="[TPGL]/2.-52*mm"  z="0*mm" />
+ </PosPart>
+
+
+
+
+ <PosPart copyNumber="1">
+  <rParent name="CTPPS_Pixel_Module_2x2:Envelop"/>
+  <rChild name="CTPPS_Pixel_Module_2x2:Hybrid"/>
+  <Translation x="0"  y="[EnvelopL]/2.-[TPGL]/2."  z="-[EnvelopT]/2.+[HybridT]/2." />
+ </PosPart>
+
+ <PosPart copyNumber="2">
+  <rParent name="CTPPS_Pixel_Module_2x2:Envelop"/>
+  <rChild name="CTPPS_Pixel_Module_2x2:Hybrid"/>
+  <Translation x="0"  y="[EnvelopL]/2.-[TPGL]/2."  z="-[EnvelopT]/2.+[HybridT]+[GlueT]+[TPGT]+[GlueT]+[HybridT]/2." />
+ </PosPart>
+
+
+
+
+
+
+<PosPart copyNumber="1">
+  <rParent name="CTPPS_Pixel_Module_2x2:Envelop"/>
+  <rChild name="CTPPS_Pixel_Module_2x2:ROChip"/>
+  <Translation x="-[ROChipW]/2.-[ROChipSpaceW]/2."  y="[EnvelopL]/2.-[TPGL]-[TPGappL]+[ROChipL]/2.-[TPGvsROCoffset]"  z="-[EnvelopT]/2.+[HybridT]+[GlueT]+[TPGT]+[GlueT]+[ROChipT]/2." />
+ </PosPart>
+
+<PosPart copyNumber="2">
+  <rParent name="CTPPS_Pixel_Module_2x2:Envelop"/>
+  <rChild name="CTPPS_Pixel_Module_2x2:ROChip"/>
+  <Translation x="[ROChipW]/2.+[ROChipSpaceW]/2."  y="[EnvelopL]/2.-[TPGL]-[TPGappL]+[ROChipL]/2.-[TPGvsROCoffset]"  z="-[EnvelopT]/2.+[HybridT]+[GlueT]+[TPGT]+[GlueT]+[ROChipT]/2." />
+ </PosPart>
+
+<PosPart copyNumber="3">
+  <rParent name="CTPPS_Pixel_Module_2x2:Envelop"/>
+  <rChild name="CTPPS_Pixel_Module_2x2:ROChip"/>
+  <Translation x="-[ROChipW]/2.-[ROChipSpaceW]/2."  y="[EnvelopL]/2.-[TPGL]-[TPGappL]+3*[ROChipL]/2.+[ROChipSpaceL]-[TPGvsROCoffset]"  z="-[EnvelopT]/2.+[HybridT]+[GlueT]+[TPGT]+[GlueT]+[ROChipT]/2." />
+ </PosPart>
+
+<PosPart copyNumber="4">
+  <rParent name="CTPPS_Pixel_Module_2x2:Envelop"/>
+  <rChild name="CTPPS_Pixel_Module_2x2:ROChip"/>
+  <Translation x="[ROChipW]/2.+[ROChipSpaceW]/2."  y="[EnvelopL]/2.-[TPGL]-[TPGappL]+3*[ROChipL]/2.+[ROChipSpaceL]-[TPGvsROCoffset]"  z="-[EnvelopT]/2.+[HybridT]+[GlueT]+[TPGT]+[GlueT]+[ROChipT]/2." />
+ </PosPart>
+
+<PosPart copyNumber="1">
+  <rParent name="CTPPS_Pixel_Module_2x2:Envelop"/>
+  <rChild name="CTPPS_Pixel_Module_2x2:BumpBond"/>
+  <Translation x="-[WaferW]/4.+3*[ROChipSpaceW]/4."  y="[EnvelopL]/2.-[TPGL]-[TPGappL]+[ROChipL]/2.-[TPGvsROCoffset]"  z="-[EnvelopT]/2.+[HybridT]+[GlueT]+[TPGT]+[GlueT]+[ROChipT]+[BumpBondT]/2." />
+ </PosPart>
+
+<PosPart copyNumber="2">
+  <rParent name="CTPPS_Pixel_Module_2x2:Envelop"/>
+  <rChild name="CTPPS_Pixel_Module_2x2:BumpBond"/>
+  <Translation x="+[WaferW]/4.-3*[ROChipSpaceW]/4."  y="[EnvelopL]/2.-[TPGL]-[TPGappL]+[ROChipL]/2.-[TPGvsROCoffset]"  z="-[EnvelopT]/2.+[HybridT]+[GlueT]+[TPGT]+[GlueT]+[ROChipT]+[BumpBondT]/2." />
+ </PosPart>
+
+<PosPart copyNumber="3">
+  <rParent name="CTPPS_Pixel_Module_2x2:Envelop"/>
+  <rChild name="CTPPS_Pixel_Module_2x2:BumpBond"/>
+  <Translation x="-[WaferW]/4.+3*[ROChipSpaceW]/4."  y="[EnvelopL]/2.-[TPGL]-[TPGappL]+3*[ROChipL]/2.+[ROChipSpaceL]-[TPGvsROCoffset]"  z="-[EnvelopT]/2.+[HybridT]+[GlueT]+[TPGT]+[GlueT]+[ROChipT]+[BumpBondT]/2." />
+ </PosPart>
+
+<PosPart copyNumber="4">
+  <rParent name="CTPPS_Pixel_Module_2x2:Envelop"/>
+  <rChild name="CTPPS_Pixel_Module_2x2:BumpBond"/>
+  <Translation x="+[WaferW]/4.-3*[ROChipSpaceW]/4."  y="[EnvelopL]/2.-[TPGL]-[TPGappL]+3*[ROChipL]/2.+[ROChipSpaceL]-[TPGvsROCoffset]"  z="-[EnvelopT]/2.+[HybridT]+[GlueT]+[TPGT]+[GlueT]+[ROChipT]+[BumpBondT]/2." />
+ </PosPart>
+
+<PosPart copyNumber="1">
+  <rParent name="CTPPS_Pixel_Module_2x2:Envelop"/>
+  <rChild name="CTPPS_Pixel_Module_2x2:RPixWafer2x2"/>
+  <Translation x="0"  y="[EnvelopL]/2.-[TPGL]-[TPGappL]-[TPGvsROCoffset]-[ROCvsWaferoffset]+[WaferL]/2."  z="-[EnvelopT]/2.+[HybridT]+[GlueT]+[TPGT]+[GlueT]+[ROChipT]+[BumpBondT]+[WaferT]/2." />
+ </PosPart>
+
+<PosPart copyNumber="1">
+  <rParent name="CTPPS_Pixel_Module_2x2:RPixWafer2x2"/>
+  <rChild name="CTPPS_Pixel_Module_2x2:RPixnoWafer"/>
+  <Translation x="0"  y="[WaferL]/2.-[noWaferL]/2."  z="0" />
+ </PosPart>
+</PosPartSection>
+
+</DDDefinition>
diff --git a/Geometry/VeryForwardData/data/RP_Materials/v2/RP_Materials.xml b/Geometry/VeryForwardData/data/RP_Materials/v2/RP_Materials.xml
new file mode 100644
index 0000000000000..aacd934ead2cb
--- /dev/null
+++ b/Geometry/VeryForwardData/data/RP_Materials/v2/RP_Materials.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0"?>
+<DDDefinition>
+
+ <MaterialSection label="RP_Materials.xml">
+  <ElementaryMaterial name="RP_Primary_Vacuum" density="1e-13*mg/cm3" symbol=" "
+   atomicWeight="1*g/mole" atomicNumber="1"/>
+  <ElementaryMaterial name="RP_Secondary_Vacuum" density="1e-13*mg/cm3" symbol=" "
+   atomicWeight="1*g/mole" atomicNumber="1"/>
+  <CompositeMaterial name="AISI-316L-Steel" density="8*g/cm3" symbol=" " method="mixture by weight">
+   <MaterialFraction fraction="0.0003">
+    <rMaterial name="materials:Carbon"/>
+   </MaterialFraction>
+   <MaterialFraction fraction="0.02">
+    <rMaterial name="materials:Manganese"/>
+   </MaterialFraction>
+   <MaterialFraction fraction="0.01">
+    <rMaterial name="materials:Silicon"/>
+   </MaterialFraction>
+   <MaterialFraction fraction="0.00045">
+    <rMaterial name="materials:Phosphor"/>
+   </MaterialFraction>
+   <MaterialFraction fraction="0.0003">
+    <rMaterial name="materials:Sulfur"/>
+   </MaterialFraction>
+   <MaterialFraction fraction="0.12">
+    <rMaterial name="materials:Nickel"/>
+   </MaterialFraction>
+   <MaterialFraction fraction="0.18">
+    <rMaterial name="materials:Chromium"/>
+   </MaterialFraction>
+   <MaterialFraction fraction="0.025">
+    <rMaterial name="materials:Molybdenum"/>
+   </MaterialFraction>
+   <MaterialFraction fraction="0.64395">
+    <rMaterial name="materials:Iron"/>
+   </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="Epoxy" density="1.32*g/cm3" symbol=" " method="mixture by weight">
+   <MaterialFraction fraction="0.53539691">
+    <rMaterial name="materials:Carbon"/>
+   </MaterialFraction>
+   <MaterialFraction fraction="0.13179314">
+    <rMaterial name="materials:Hydrogen"/>
+   </MaterialFraction>
+   <MaterialFraction fraction="0.33280996">
+    <rMaterial name="materials:Oxygen"/>
+   </MaterialFraction>
+  </CompositeMaterial>
+  
+  <CompositeMaterial name="Glass" density="2.23*g/cm3" symbol=" " method="mixture by weight">
+   <MaterialFraction fraction="0.36611059">
+    <rMaterial name="materials:Silicon"/>
+   </MaterialFraction>
+   <MaterialFraction fraction="0.53173295">
+    <rMaterial name="materials:Oxygen"/>
+   </MaterialFraction>
+   <MaterialFraction fraction="0.007820091">
+    <rMaterial name="materials:Bor 10"/>
+   </MaterialFraction>
+   <MaterialFraction fraction="0.0344084">
+    <rMaterial name="materials:Bor 11"/>
+   </MaterialFraction>
+   <MaterialFraction fraction="0.059927964">
+    <rMaterial name="materials:Sodium"/>
+   </MaterialFraction>
+  </CompositeMaterial>
+  
+ <CompositeMaterial name="PCB" density="1.957*g/cm3" symbol=" " method="mixture by weight">
+  <MaterialFraction fraction="0.2562774130">
+   <rMaterial name="materials:Silicon"/>
+  </MaterialFraction>
+  <MaterialFraction fraction="0.4720560530">
+   <rMaterial name="materials:Oxygen"/>
+  </MaterialFraction>
+  <MaterialFraction fraction="0.0054740637">
+   <rMaterial name="materials:Bor 10"/>
+  </MaterialFraction>
+  <MaterialFraction fraction="0.0240858800">
+   <rMaterial name="materials:Bor 11"/>
+  </MaterialFraction>
+  <MaterialFraction fraction="0.0419495748">
+   <rMaterial name="materials:Sodium"/>
+  </MaterialFraction>
+  <MaterialFraction fraction="0.1606190730">
+   <rMaterial name="materials:Carbon"/>
+  </MaterialFraction>
+  <MaterialFraction fraction="0.0395379420">
+   <rMaterial name="materials:Hydrogen"/>
+  </MaterialFraction>
+ </CompositeMaterial>
+ 
+  <CompositeMaterial name="CE7" density="2.44*g/cm3" symbol=" " method="mixture by weight">
+   <MaterialFraction fraction="0.7">
+    <rMaterial name="materials:Silicon"/>
+   </MaterialFraction>
+   <MaterialFraction fraction="0.3">
+    <rMaterial name="materials:Aluminium"/>
+   </MaterialFraction>
+  </CompositeMaterial>
+ </MaterialSection>
+</DDDefinition>
diff --git a/Geometry/VeryForwardData/data/ppstrackerMaterials/v2/ppstrackerMaterials.xml b/Geometry/VeryForwardData/data/ppstrackerMaterials/v2/ppstrackerMaterials.xml
new file mode 100644
index 0000000000000..b4d356e537848
--- /dev/null
+++ b/Geometry/VeryForwardData/data/ppstrackerMaterials/v2/ppstrackerMaterials.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<DDDefinition>
+  
+
+<MaterialSection label="ppstrackerMaterials.xml">
+
+  <CompositeMaterial name="Pix_Fwd_Bump" density="0.41391*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="1.00">
+      <rMaterial name="pixfwdMaterials:FPix_TinLeadSolder"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+
+</MaterialSection>
+
+</DDDefinition>