Final additions to Homework 1.0