Updated for hw7 data