Changes due to hw6