Improve the drawing feature