hw7 changes and additions