2nd Update to Programming Assignment 2