Modifications to improve performance of tracking