Improve position tracking