Incorporate Robert's suggested changes and comments.