Improve velocity tracker