Submission v2 for assignment 2