Added waypoints