Updated Programming Assignmnet 2