More drawing speed optimizations