More changes for hw6