1 files changed, 2 insertions, 5 deletions

diff --git a/src/universe.h b/src/universe.h
index 3adba4d..8244980 100644
--- a/src/universe.h
+++ b/src/universe.h
@@ -10,6 +10,7 @@ extern "C"
 #endif // __cplusplus
 
 #include "macros_and_utils.h"
+#include "tracker.h"
 #include "uniquekey.h"
 
 #include <mutex>
@@ -22,9 +23,6 @@ struct DeepPrelude;
 struct Keepers;
 class Lane;
 
-// Do we want to activate full lane tracking feature?
-#define HAVE_LANE_TRACKING() 1
-
 // #################################################################################################
 
 // everything we need to provide to lua_newstate()
@@ -158,8 +156,7 @@ class Universe
     DeepPrelude* timerLinda{ nullptr };
 
 #if HAVE_LANE_TRACKING()
-    std::mutex trackingMutex;
-    Lane* volatile trackingFirst{ nullptr }; // will change to TRACKING_END if we want to activate tracking
+    LaneTracker tracker;
 #endif // HAVE_LANE_TRACKING()
 
     // Protects modifying the selfdestruct chain