Added more waypoints