Programming assignment 2 updates