Updated with final comments