Final submission with comments added