Rewrite cell redrawing; major speedup