added hw7 stuff