Improve redraw