speed up drawing a bit
Merge branch 'dev'