updated for hw7