Assignment 2 changes completed