diff --git a/Docs/core_map.md b/Docs/core_map.md
index 5de8e0d7c..d3621067c 100644
--- a/Docs/core_map.md
+++ b/Docs/core_map.md
@@ -105,9 +105,9 @@ right_lm_color = waypoint.right_lane_marking.color
---
## Navigation in CARLA
-Navigation in CARLA is managed via the waypoint API. This consists of a summary of methods in [carla.Waypoint](python_api.md#carla.Waypoint) and [carla.Map](python_api.md#carla.Map) that provide connections between waypoints, and use these to generate a map navigation.
+Navigation in CARLA is managed via the waypoint API. This consists of a summary of methods in [carla.Waypoint](python_api.md#carla.Waypoint) and [carla.Map](python_api.md#carla.Map).
-All the queries happen on the client-side. The client only communicates with the server when retrieving the map object that will be used for the queries. Communication with the server is not needed after that, so the computational cost of the waypoint API is heavily reduced.
+All the queries happen on the client-side. The client only communicates with the server when retrieving the map object that will be used for the queries. There is no need to retrieve the map (`world.get_map()`) more than once.
### Navigating through waypoints
diff --git a/Docs/python_api.md b/Docs/python_api.md
index e997b08c8..732ece739 100644
--- a/Docs/python_api.md
+++ b/Docs/python_api.md
@@ -2447,7 +2447,7 @@ Compares every variable with `other` and returns True if any of these dif
---
## carla.Waypoint
-Waypoints in CARLA are described as 3D directed points. They store a certain [carla.Transform](#carla.Transform) which locates the waypoint in a road and orientates it according to the lane. They also store the road information belonging to said point regarding its lane and lane markings.
All the information regarding waypoints and the [waypoint API](https://[carla.readthedocs.io](#carla.readthedocs.io)/en/latest/core_map/#navigation-in-carla) is retrieved as provided by the OpenDRIVE file. Once the client asks for the map object to the server, no longer communication will be needed.
+Waypoints in CARLA are described as 3D directed points. They have a [carla.Transform](#carla.Transform) which locates the waypoint in a road and orientates it according to the lane. They also store the road information belonging to said point regarding its lane and lane markings.
All the information regarding waypoints and the [waypoint API](../../core_map/#navigation-in-carla) is retrieved as provided by the OpenDRIVE file. Once the client asks for the map object to the server, no longer communication will be needed.