Optimisations to draw