Changed a tracking stuff