this should improve tracking performance