More changes from homework