Updated

Got Tracking, and updating working