Redraw - part 2

Redraw - part 2