Added waypoint selection