Final hw2 changes