[Jackie] waypoint collector added