Tried to improve the drawing performance