Improve drawing core.