Changed draw function