new changes made as of 7/12/14