edited TrackingActivity