modification to increase tracking robustness