Assignment 2 changes 12-7-2014