Homework 7 and 8 changes