Assignment Submission #2 - updated