Homework 6, revision 1