Updated for hw9