2nd submission with added comments