EOSS-342 Tracking and Recovery