Homework 2, revision 1