all new changes 7/4/14