Modified Programming Assignment 2