Improvements after discussion.