Changes to answer comments.