Improve cursor