Changes according to Homework #3