[Jackie] waypoint collector modification