Improve drawing