Better repainting