updated 6-7-2015