Homework 2 rev 2