Incorporate Chris' first round of comments.