Update to include final comments