Final draft with comments