Update files as of 7/28/14