Moved draw()