Version 2 of Programming Assignment 2