Better waypoints