Josh's and Patricks review comments.