Updated with Assignment 2 code