diff --git a/RecFCCeeCalorimeter/src/components/CreateFCCeeCaloNeighbours.cpp b/RecFCCeeCalorimeter/src/components/CreateFCCeeCaloNeighbours.cpp
index fa25906b..8e8eabbe 100644
--- a/RecFCCeeCalorimeter/src/components/CreateFCCeeCaloNeighbours.cpp
+++ b/RecFCCeeCalorimeter/src/components/CreateFCCeeCaloNeighbours.cpp
@@ -105,7 +105,6 @@ StatusCode CreateFCCeeCaloNeighbours::initialize() {
       (*decoder)[m_activeFieldNamesSegmented[iSys]].set(volumeId, ilayer);
       (*decoder)["theta"].set(volumeId, 0);
       (*decoder)["module"].set(volumeId, 0);
-      //(*decoder)["phi"].set(volumeId, 0);
       // Get number of segmentation cells within the active volume
       // numberOfCells: return Array of the number of cells in (module, theta) and the minimum theta ID.
       auto numCells = det::utils::numberOfCells(volumeId, *segmentation);
@@ -156,8 +155,8 @@ StatusCode CreateFCCeeCaloNeighbours::initialize() {
 													  "module", "theta"},
 													 extrema,
 													 id,
-													 {false, true, false},
-													 false)));
+													 m_includeDiagonalCells
+													 )));
         }
       }
     }
diff --git a/RecFCCeeCalorimeter/src/components/CreateFCCeeCaloNeighbours.h b/RecFCCeeCalorimeter/src/components/CreateFCCeeCaloNeighbours.h
index 199816fa..2330e53d 100644
--- a/RecFCCeeCalorimeter/src/components/CreateFCCeeCaloNeighbours.h
+++ b/RecFCCeeCalorimeter/src/components/CreateFCCeeCaloNeighbours.h
@@ -1,5 +1,5 @@
-#ifndef RECCALORIMETER_CREATEFCCEECALONEIGHBOURS_H
-#define RECCALORIMETER_CREATEFCCEECALONEIGHBOURS_H
+#ifndef RECFCCEECALORIMETER_CREATEFCCEECALONEIGHBOURS_H
+#define RECFCCEECALORIMETER_CREATEFCCEECALONEIGHBOURS_H
 
 // Gaudi
 #include "GaudiKernel/Service.h"
@@ -26,7 +26,7 @@ class IGeoSvc;
  *  The volumes for which the neighbour map is created can be either segmented in theta-module (e.g. ECal inclined),
  *  or can contain nested volumes (e.g. HCal barrel).
  *
- *  @author Anna Zaborowska
+ *  @author Giovanni Marchiori
  */
 
 class CreateFCCeeCaloNeighbours : public extends1<Service, ICaloCreateMap> {
@@ -60,7 +60,9 @@ class CreateFCCeeCaloNeighbours : public extends1<Service, ICaloCreateMap> {
   Gaudi::Property<std::vector<unsigned int>> m_activeVolumesNumbersSegmented{this, "activeVolumesNumbers", {12}};
   // Radii of layers in the segmented volume
   Gaudi::Property<std::vector<double>> m_activeVolumesTheta{this, "activeVolumesTheta"};
-
+  /// Whether to create the geant4 geometry or not
+  Gaudi::Property<bool> m_includeDiagonalCells{this, "UseDiagonalCells", false, "If True will consider also diagonal neighbours in volumes with theta-module segmentation"};
+  
   /// Names of the detector readout for volumes with nested volume structure and no segmentation
   Gaudi::Property<std::vector<std::string>> m_readoutNamesNested{this, "readoutNamesVolumes"};
   /// Name of the field describing the nested volume
@@ -90,4 +92,4 @@ class CreateFCCeeCaloNeighbours : public extends1<Service, ICaloCreateMap> {
   Gaudi::Property<double> m_hCalPhiOffset{this, "hCalPhiOffset"};
 };
 
-#endif /* RECALORIMETER_CREATEFCCHHCALONEIGHBOURS_H */
+#endif /* RECFCCEECALORIMETER_CREATEFCCEECALONEIGHBOURS_H */