First pass to address the comments of the reviewers