Added position tracking