Moved two code lines to Draw()