Changes from the Assignment1