Updated the Assignment 2 code