Made hw6 changes