2nd Submission with comments