Updated for hw 7b