Updating everything as of 6.14.2013