Homework 8 changes