Improve the hovering