Jamie's assignment 10/28

Modified