Changed the draw code