Including Michael's comments from review.