improve tracking