diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/ALLEGRO_o1_v03.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/ALLEGRO_o1_v03.xml
index fc2ca3b09..0d478c06e 100644
--- a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/ALLEGRO_o1_v03.xml
+++ b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/ALLEGRO_o1_v03.xml
@@ -45,9 +45,9 @@
-
+
-
+
diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/HCalBarrel_TileCal_v03.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/HCalBarrel_TileCal_v03.xml
new file mode 100644
index 000000000..8b9e9a07e
--- /dev/null
+++ b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/HCalBarrel_TileCal_v03.xml
@@ -0,0 +1,183 @@
+
+
+
+ The first FCCee HCal layout based on ATLAS HCal, not optimised yet
+ 1. Nov 2022, J. Faltova: update material and radial segmentation for FCCee
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ system:4,layer:5,row:9,theta:9,phi:10
+
+
+
+
+ system:4,layer:5,row:9,phi:10
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/HCalEndcaps_ThreeParts_TileCal_v03.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/HCalEndcaps_ThreeParts_TileCal_v03.xml
new file mode 100644
index 000000000..32f2978bf
--- /dev/null
+++ b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v03/HCalEndcaps_ThreeParts_TileCal_v03.xml
@@ -0,0 +1,197 @@
+
+
+
+ HCal layout based on ATLAS HCal, with realistic longitudinal segmentation and steel support
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ system:4,type:3,layer:6,row:11,theta:11,phi:10
+
+
+
+
+ system:4,type:3,layer:6,row:-8,phi:10
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v04/ALLEGRO_o1_v04.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v04/ALLEGRO_o1_v04.xml
index a0a5dcf1a..4acb0d6f3 100644
--- a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v04/ALLEGRO_o1_v04.xml
+++ b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v04/ALLEGRO_o1_v04.xml
@@ -45,9 +45,9 @@
-
+
-
+
diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v04/HCalBarrel_TileCal_v03.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v04/HCalBarrel_TileCal_v03.xml
new file mode 120000
index 000000000..1bde7347d
--- /dev/null
+++ b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v04/HCalBarrel_TileCal_v03.xml
@@ -0,0 +1 @@
+../ALLEGRO_o1_v03/HCalBarrel_TileCal_v03.xml
\ No newline at end of file
diff --git a/FCCee/ALLEGRO/compact/ALLEGRO_o1_v04/HCalEndcaps_ThreeParts_TileCal_v03.xml b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v04/HCalEndcaps_ThreeParts_TileCal_v03.xml
new file mode 120000
index 000000000..9fb72eebd
--- /dev/null
+++ b/FCCee/ALLEGRO/compact/ALLEGRO_o1_v04/HCalEndcaps_ThreeParts_TileCal_v03.xml
@@ -0,0 +1 @@
+../ALLEGRO_o1_v03/HCalEndcaps_ThreeParts_TileCal_v03.xml
\ No newline at end of file
diff --git a/detectorSegmentations/include/detectorSegmentations/FCCSWHCalPhiRowHandle_k4geo.h b/detectorSegmentations/include/detectorSegmentations/FCCSWHCalPhiRowHandle_k4geo.h
new file mode 100644
index 000000000..5ca4fe05a
--- /dev/null
+++ b/detectorSegmentations/include/detectorSegmentations/FCCSWHCalPhiRowHandle_k4geo.h
@@ -0,0 +1,119 @@
+#ifndef DETECTORSEGMENTATIONS_HCALPHIROWHANDLE_K4GEO_H
+#define DETECTORSEGMENTATIONS_HCALPHIROWHANDLE_K4GEO_H
+
+// FCCSW
+#include "detectorSegmentations/FCCSWHCalPhiRow_k4geo.h"
+
+// DD4hep
+#include "DD4hep/Segmentations.h"
+#include "DD4hep/detail/SegmentationsInterna.h"
+
+/// Namespace for the AIDA detector description toolkit
+namespace dd4hep {
+/// Namespace for base segmentations
+
+
+// Forward declarations
+class Segmentation;
+template class SegmentationWrapper;
+
+/// We need some abbreviation to make the code more readable.
+typedef Handle> FCCSWHCalPhiRowHandle_k4geo;
+
+/// Implementation class for the HCal phi-row segmentation.
+/**
+ * Concrete user handle to serve specific needs of client code
+ * which requires access to the base functionality not served
+ * by the super-class Segmentation.
+ *
+ * Note:
+ * We only check the validity of the underlying handle.
+ * If for whatever reason the implementation object is not valid
+ * This is not checked.
+ * In principle this CANNOT happen unless some brain-dead has
+ * fiddled with the handled object directly.....
+ *
+ * Note:
+ * The handle base corrsponding to this object in for
+ * conveniance reasons instantiated in DD4hep/src/Segmentations.cpp.
+ *
+ */
+class FCCSWHCalPhiRow_k4geo : public FCCSWHCalPhiRowHandle_k4geo {
+public:
+ /// Defintion of the basic handled object
+ typedef FCCSWHCalPhiRowHandle_k4geo::Object Object;
+
+public:
+ /// Default constructor
+ FCCSWHCalPhiRow_k4geo() = default;
+ /// Copy constructor
+ FCCSWHCalPhiRow_k4geo(const FCCSWHCalPhiRow_k4geo& e) = default;
+ /// Copy Constructor from segmentation base object
+ FCCSWHCalPhiRow_k4geo(const Segmentation& e) : Handle