diff --git a/ALICE3/Core/FastTracker.cxx b/ALICE3/Core/FastTracker.cxx
index 84fa174c224..5837d717884 100644
--- a/ALICE3/Core/FastTracker.cxx
+++ b/ALICE3/Core/FastTracker.cxx
@@ -22,6 +22,7 @@
 #include <TObject.h>
 
 #include <fstream>
+#include <map>
 #include <string>
 #include <vector>
 
@@ -184,7 +185,7 @@ void FastTracker::AddSiliconALICE3(float scaleX0VD, std::vector<float> pixelReso
   AddLayer("B03", 7., 250, x0OT, xrhoOT, resRPhiOT, resZOT, eff, 1);
   AddLayer("B04", 9., 250, x0OT, xrhoOT, resRPhiOT, resZOT, eff, 1);
   AddLayer("B05", 12., 250, x0OT, xrhoOT, resRPhiOT, resZOT, eff, 1);
-  AddLayer("iTOF", 19, 250, x0iTOF, xrhoiTOF, resRPhiOT, resZOT, eff, 0);
+  AddLayer("iTOF", 19, 250, x0iTOF, xrhoiTOF, resRPhiOT, resZOT, 0.0f, 0);
   AddLayer("B06", 20., 250, x0OT, xrhoOT, resRPhiOT, resZOT, eff, 1);
   AddLayer("B07", 30., 250, x0OT, xrhoOT, resRPhiOT, resZOT, eff, 1);
   AddLayer("B08", 45., 250, x0OT, xrhoOT, resRPhiOT, resZOT, eff, 1);
diff --git a/ALICE3/TableProducer/OTF/onTheFlyTracker.cxx b/ALICE3/TableProducer/OTF/onTheFlyTracker.cxx
index 0f785534159..fddfdebd2a0 100644
--- a/ALICE3/TableProducer/OTF/onTheFlyTracker.cxx
+++ b/ALICE3/TableProducer/OTF/onTheFlyTracker.cxx
@@ -138,7 +138,7 @@ struct OnTheFlyTracker {
     Configurable<int> minSiliconHits{"minSiliconHits", 6, "minimum number of silicon hits to accept track"};
     Configurable<int> minSiliconHitsIfTPCUsed{"minSiliconHitsIfTPCUsed", 2, "minimum number of silicon hits to accept track in case TPC info is present"};
     Configurable<int> minTPCClusters{"minTPCClusters", 70, "minimum number of TPC hits necessary to consider minSiliconHitsIfTPCUsed"};
-    Configurable<int> alice3detector{"alice3detector", 2, "0: ALICE 3 v1, 1: ALICE 3 v4, 2: ALICE 3 Sep 2025"};
+    Configurable<std::string> alice3geo{"alice3geo", "2", "0: ALICE 3 v1, 1: ALICE 3 v4, 2: ALICE 3 Sep 2025, or path to ccdb with a3 geo"};
     Configurable<bool> applyZacceptance{"applyZacceptance", false, "apply z limits to detector layers or not"};
     Configurable<bool> applyMSCorrection{"applyMSCorrection", true, "apply ms corrections for secondaries or not"};
     Configurable<bool> applyElossCorrection{"applyElossCorrection", true, "apply eloss corrections for secondaries or not"};
@@ -408,31 +408,26 @@ struct OnTheFlyTracker {
     rand.SetSeed(seed);
 
     // configure FastTracker
-    fastTracker.SetMagneticField(magneticField);
-    fastTracker.SetApplyZacceptance(fastTrackerSettings.applyZacceptance);
-    fastTracker.SetApplyMSCorrection(fastTrackerSettings.applyMSCorrection);
-    fastTracker.SetApplyElossCorrection(fastTrackerSettings.applyElossCorrection);
+    if (enableSecondarySmearing) {
+      fastTracker.SetMagneticField(magneticField);
+      fastTracker.SetApplyZacceptance(fastTrackerSettings.applyZacceptance);
+      fastTracker.SetApplyMSCorrection(fastTrackerSettings.applyMSCorrection);
+      fastTracker.SetApplyElossCorrection(fastTrackerSettings.applyElossCorrection);
 
-    switch (fastTrackerSettings.alice3detector) {
-      case 0:
+      if (fastTrackerSettings.alice3geo.value == "0") {
         fastTracker.AddSiliconALICE3v2(fastTrackerSettings.pixelRes);
-        break;
-
-      case 1:
+      } else if (fastTrackerSettings.alice3geo.value == "1") {
         fastTracker.AddSiliconALICE3v4(fastTrackerSettings.pixelRes);
         fastTracker.AddTPC(0.1, 0.1);
-        break;
-
-      case 2:
+      } else if (fastTrackerSettings.alice3geo.value == "2") {
         fastTracker.AddSiliconALICE3(fastTrackerSettings.scaleVD, fastTrackerSettings.pixelRes);
-        break;
+      } else {
+        fastTracker.AddGenericDetector(fastTrackerSettings.alice3geo, ccdb.operator->());
+      }
 
-      default:
-        break;
+      // print fastTracker settings
+      fastTracker.Print();
     }
-
-    // print fastTracker settings
-    fastTracker.Print();
   }
 
   /// Function to decay the xi