Added functionality for Acq/tracking (still not working!)