Updating to August 21, 2012 changes