Final Submission with comments