Homework 7 rev2