Support/redraw

@zhaohanweng Have a look at this PR.