Updating with changes for assignment 2"