Homework 6 changes