massive changes as of 8/27/13