Homework #6

Changes according to Homework #6