update with final comments