Updated for hw2