Optimise switch to fastPaint