waypoints routing correctly