Updated files as of 7/8/13