Homework 2 -- Modified