Incorporating some of the comments.