First round of revisions based on Nick's comments.
After first round of revisions, based on Nick's comments.