Homework 2 rev 1