diff --git a/Docs/traffic_manager.md b/Docs/adv_traffic_manager.md
similarity index 99%
rename from Docs/traffic_manager.md
rename to Docs/adv_traffic_manager.md
index ec65c9f3d..05c1deaf8 100644
--- a/Docs/traffic_manager.md
+++ b/Docs/adv_traffic_manager.md
@@ -238,6 +238,9 @@ That creates a clear distinction between having multiple clients and multiple Tr
 
 * __MultiTM scenario:__ when there are different TM-Server, created with different port definitions.  
 
+!!! Note 
+    The script `TrafficManager.cpp` acts as a central hub managing all the different TM instances. 
+
 ---
 ## Other considerations
 
diff --git a/Docs/index.md b/Docs/index.md
index 44e78288c..e957d1d60 100644
--- a/Docs/index.md
+++ b/Docs/index.md
@@ -97,9 +97,9 @@ CARLA forum</a>
     Synchrony and time-step
     </b></a>
         — Client-server communication and simulation time.  
-    <b>
-    (soon) Traffic manager
-    </b>
+    <a href="../adv_traffic_manager"><b>
+    Traffic Manager
+    </b></a>
         — Feature to handle autopilot vehicles and emulate traffic.  
 
 ## References
diff --git a/mkdocs.yml b/mkdocs.yml
index 7e9c6ff65..ed7141f60 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -27,7 +27,7 @@ nav:
   - 'Recorder': 'adv_recorder.md'
   - 'Rendering options': 'adv_rendering_options.md'
   - 'Synchrony and time-step': 'adv_synchrony_timestep.md'
-  - 'Traffic Manager': 'traffic_manager.md'
+  - 'Traffic Manager': 'adv_traffic_manager.md'
 - References:
   - 'Python API reference': 'python_api.md'
   - 'Code recipes': 'ref_code_recipes.md'