Redo repaint

Better than nothing by about 20%