Update to the review comments