diff --git a/macro/beamtime/mcbm2020/build_event_win.C b/macro/beamtime/mcbm2020/build_event_win.C
index 731f9e5b40d86513d55a5fce9eb152636bc240e6..63a80c37069d84aa3852014ee2703a9e3501b6a0 100644
--- a/macro/beamtime/mcbm2020/build_event_win.C
+++ b/macro/beamtime/mcbm2020/build_event_win.C
@@ -55,13 +55,46 @@ void build_event_win(UInt_t uRunId  = 0,
 
   eventBuilder->SetEventOverlapMode(EOverlapMode::NoOverlap);
 
+/*
+ * Available Pre-defined detectors:
+ * kEventBuilderDetSts
+ * kEventBuilderDetMuch
+ * kEventBuilderDetTrd
+ * kEventBuilderDetTof
+ * kEventBuilderDetRich
+ * kEventBuilderDetPsd
+ * kEventBuilderDetT0
+ */
+
+  /// Change the selection window limits for T0 as ref
   eventBuilder->SetTriggerWindow(ECbmModuleId::kSts, -50, 100);
   eventBuilder->SetTriggerWindow(ECbmModuleId::kMuch, -150, 50);
   eventBuilder->SetTriggerWindow(ECbmModuleId::kTrd, -250, 100);
   eventBuilder->SetTriggerWindow(ECbmModuleId::kTof, -150, 10);
   eventBuilder->SetTriggerWindow(ECbmModuleId::kRich, -150, 20);
   eventBuilder->SetTriggerWindow(ECbmModuleId::kPsd, -50, 10);
-  //  eventBuilder->SetT0PulserTotLimits(   185, 191 );
+  /// To get T0 Digis (seed + close digis) in the event
+  eventBuilder->SetTriggerWindow(ECbmModuleId::kT0, -1, 10);
+
+/*
+  /// Use TOF as reference
+  eventBuilder->SetReferenceDetector( kEventBuilderDetTof );
+  eventBuilder->AddDetector( kEventBuilderDetT0 );
+
+  /// Change the selection window limits for TOF as ref
+  /// => Should always be after changes of detector lists!
+  eventBuilder->SetTriggerWindow(ECbmModuleId::kT0, -150, 0);
+  eventBuilder->SetTriggerWindow(ECbmModuleId::kSts, -50, 100);
+  eventBuilder->SetTriggerWindow(ECbmModuleId::kMuch, -50, 200);
+  eventBuilder->SetTriggerWindow(ECbmModuleId::kTrd, -50, 300);
+  eventBuilder->SetTriggerWindow(ECbmModuleId::kTof, 0, 60);
+  eventBuilder->SetTriggerWindow(ECbmModuleId::kRich, -100, 150);
+  eventBuilder->SetTriggerWindow(ECbmModuleId::kPsd, -200, 50);
+*/
+
+  /// Change the trigger requirements
+  /// => Should always be after changes of detector lists!
+  /// --- Minimum
   eventBuilder->SetTriggerMinNumber(ECbmModuleId::kT0, 1);
   eventBuilder->SetTriggerMinNumber(ECbmModuleId::kSts, 0);
   eventBuilder->SetTriggerMinNumber(ECbmModuleId::kMuch, 0);
@@ -69,13 +102,21 @@ void build_event_win(UInt_t uRunId  = 0,
   eventBuilder->SetTriggerMinNumber(ECbmModuleId::kTof, 10);
   eventBuilder->SetTriggerMinNumber(ECbmModuleId::kRich, 0);
   eventBuilder->SetTriggerMinNumber(ECbmModuleId::kPsd, 0);
+  /// --- Maximum  (-1 to disable cut)
+  eventBuilder->SetTriggerMaxNumber(ECbmModuleId::kT0, -1);
+  eventBuilder->SetTriggerMaxNumber(ECbmModuleId::kSts, -1);
+  eventBuilder->SetTriggerMaxNumber(ECbmModuleId::kMuch, -1);
+  eventBuilder->SetTriggerMaxNumber(ECbmModuleId::kTrd, -1);
+  eventBuilder->SetTriggerMaxNumber(ECbmModuleId::kTof, -1);
+  eventBuilder->SetTriggerMaxNumber(ECbmModuleId::kRich, -1);
+  eventBuilder->SetTriggerMaxNumber(ECbmModuleId::kPsd, -1);
+
+
+
   if (0 < uRunId)
     eventBuilder->SetOutFilename(
       Form("%sHistosEvtWin_%03u.root", outDir.Data(), uRunId));
 
-  // To get T0 Digis (seed + close digis) in the event
-  eventBuilder->SetTriggerWindow(ECbmModuleId::kT0, -1, 10);
-
   fRun->AddTask(eventBuilder);
 
   // -----  Parameter database   --------------------------------------------
diff --git a/macro/beamtime/mcbm2020/check_timing_any.C b/macro/beamtime/mcbm2020/check_timing_any.C
index 17885b382e691215089352956aa4c2df01e23ed9..ffcf285a28f7e34cb4a5f2c00904a0c333959cdc 100644
--- a/macro/beamtime/mcbm2020/check_timing_any.C
+++ b/macro/beamtime/mcbm2020/check_timing_any.C
@@ -34,7 +34,7 @@ void check_timing_any(TString fileName,
   CbmMcbmCheckTimingTask* timeChecker = new CbmMcbmCheckTimingTask();
   /// Default is using T0 as reference
   /// With Pulser rejection
-  /*
+/*
   timeChecker->SetReferenceDetector( ECbmModuleId::kT0, "T0",
                                      -1000., 1000., 320.,
                                      182, 190 );
@@ -45,11 +45,18 @@ void check_timing_any(TString fileName,
                                      -1000., 1000., 320.,
                                      190, 182 );
 */
-  /// Here swapping with MUCH
+  /// Here swapping with TOF
+
+  timeChecker->SetReferenceDetector(ECbmModuleId::kTof, "Tof");
+  timeChecker->RemoveCheckDetector(ECbmModuleId::kTof);
+  timeChecker->AddCheckDetector(ECbmModuleId::kT0, "T0");
 
+  /// Here swapping with MUCH
+/*
   timeChecker->SetReferenceDetector(ECbmModuleId::kMuch, "Much");
   timeChecker->RemoveCheckDetector(ECbmModuleId::kMuch);
   timeChecker->AddCheckDetector(ECbmModuleId::kT0, "T0");
+*/
 
   if (0 < uRunId)
     timeChecker->SetOutFilename(