diff --git a/epic/compact/pid/pfrich.xml b/epic/compact/pid/pfrich.xml
index cf32513..22b03f4 100644
--- a/epic/compact/pid/pfrich.xml
+++ b/epic/compact/pid/pfrich.xml
@@ -1,12 +1,10 @@
 <!-- SPDX-License-Identifier: LGPL-3.0-or-later -->
-<!-- Copyright (C) 2022 Wouter Deconinck -->
+<!-- Copyright (C) 2023 Wenliang (Bill) Li  -->
 
 <lccdd>
 
 <define>
 
-<!-- Copyright (C) 2022 Wouter Deconinck -->
-
 
 <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
 <!-- Actual global parameters -->
@@ -40,34 +38,73 @@
 <constant name="PFRICH_pixel_pitch"           value="PFRICH_pixel_size + PFRICH_pixel_gap"/>  <!-- center-to-center distance between SiPMs in a 8x8 panel -->
 
 <constant name="PFRICH_debug_optics"  value="0"/>
+
+<!-- Flange -->
+<constant name="FLANGE_EPIPE_DIAMETER" value="10.53*cm"/>
+<constant name="FLANGE_HPIPE_DIAMETER" value="4.47*cm"/>
+<constant name="FLANGE_HPIPE_OFFSET" value="6.76*cm"/>
+<constant name="CLEARANCE" value="0.5*cm"/>
+
+<!-- Mirrors -->
+
+<constant name="CONICAL_MIRROR_INNER_RADIUS" value="12.0*cm"/>
+<constant name="CONICAL_MIRROR_OUTER_RADIUS" value="57.0*cm"/>
+<constant name="INNER_MIRROR_THICKNESS" value="0.1*cm"/>
+<constant name="OUTER_MIRROR_THICKNESS" value="0.2*cm"/>
+
+<constant name="FIDUCIAL_VOLUME_LENGTH" value="49.1*cm"/>
+<constant name="SENSOR_AREA_LENGTH" value="5*cm"/>
+<constant name="HRPPD_CENTRAL_ROW_OFFSET" value="4.0*cm"/>
+<constant name="HRPPD_WINDOW_THICKNESS" value="0.38*cm"/>
+<constant name="HRPPD_CONTAINER_VOLUME_HEIGHT" value="3.2*cm"/>
+<constant name="HRPPD_INSTALLATION_GAP" value="0.25*cm"/>
+
+<constant name="HRPPD_SUPPORT_GRID_BAR_HEIGHT" value="0.2*cm"/>
+
+<constant name="HRPPD_TILE_SIZE" value="12.0*cm"/>
+<constant name="HRPPD_OPEN_AREA_SIZE" value="11.4*cm"/>
+<constant name="HRPPD_ACTIVE_AREA_SIZE" value="10.8*cm"/>
+<constant name="HRPPD_CERAMIC_BODY_THICKNESS" value="0.9*cm"/>
+<constant name="HRPPD_BASEPLATE_THICKNESS" value="0.3*cm"/>
+<constant name="HRPPD_PLATING_LAYER_THICKNESS" value="0.006*cm"/>
+<constant name="EFFECTIVE_MCP_THICKNESS" value="2 * 0.06 * 0.3*cm"/>
+
+<constant name="READOUT_PCB_THICKNESS" value="0.2*cm"/>
+<constant name="READOUT_PCB_SIZE" value="HRPPD_OPEN_AREA_SIZE - 0.2*cm"/>
+
+<constant name="ASIC_SIZE_XY" value="1.6*cm"/>
+<constant name="ASIC_THICKNESS" value="0.1*cm"/>
+
+<!-- Aerogel -->
+
+<constant name="AEROGEL_INNER_WALL_THICKNESS" value="0.01"/>
+<constant name="VESSEL_INNER_WALL_THICKNESS" value="0.29 * 2.54"/>
+<constant name="VESSEL_OUTER_WALL_THICKNESS" value="0.54 * 2.54"/>
+<constant name="VESSEL_OUTER_RADIUS" value="63.8"/>
+<constant name="VESSEL_FRONT_SIDE_THICKNESS" value="0.29 * 2.54"/>
+<constant name="FLANGE_CLEARANCE" value="0.5"/>
+<constant name="BUILDING_BLOCK_CLEARANCE" value="0.1"/>
+<constant name="AEROGEL_BAND_COUNT" value="3"/>
+<constant name="AEROGEL_SEPARATOR_WALL_THICKNESS" value="0.05"/>
+<constant name="AEROGEL_OUTER_WALL_THICKNESS" value="0.1"/>
+
+<!-- hardcoded constants -->
 </define>
 
   <detectors>
 
-
-  <!--   <detector id="BackwardRICH_ID" name="PFRICH" type="DD4hep_GdmlDetector"> -->
-  <!--      <gdmlFile ref="pfrich.gdml"/> -->
-  <!--    <gdmlFile ref="pfrich_prototype_gdml.gdml"/> -->
-  <!--  <detector id="BackwardRICH_ID" name="PFRICH" type="DD4hep_GdmlDetector"> -->
-
- <!--   <detector id="BackwardRICH_ID" name="PFRICH" type="epic_PFRICH_v1"> -->
-
 <detector
   id="BackwardRICH_ID"
-  name="PFRICH"
-  type="epic_PFRICH_v1"
-  readout="PFRICHHits"
+  name="RICHEndcapN"
+  type="epic_PFRICH"
+  readout="RICHEndcapNHits"
   gas="C4F10_PFRICH"
   material="Aluminum"
   vis_vessel="DRICH_vessel_vis"
   vis_gas="DRICH_gas_vis"
   >
 
-    <gdmlFile ref="pdrich_import_test.gdml"/>
-
-   <!--     <include ref="pdrich_import_test_gdml.xml"/>  -->
-
-      <parent name="/world_volume"/>
+    <parent name="/world_volume"/>
 
     <dimensions
       zmin="PFRICH_zmin"
@@ -210,14 +247,11 @@
   focus_tune_z="6.15*cm"
   />
 
-
-
 </detector>
 </detectors>
 
-
 <readouts>
-  <readout name="PFRICHHits">
+  <readout name="RICHEndcapNHits">
     <segmentation
       type="CartesianGridXY"
       grid_size_x="PFRICH_pixel_pitch"