Updated homework through 16.4