Updated Programming Assignment 2