Redraw - part 2