Added variable to indicate active waypoint