Improve live tracking