Modified Homework class slightly