Removed old drawing code.
Added new code for drawing.