Programming Assignment 2 (update)