- Improved for redraw.