Support/redraw

@zhaohanweng Have a look at this PR.
do you need these two rules given the ones below?