Programming assignment 2 updated