Redraw now finishes in constant time. #2