Finally get rid of draw()