updated 6-10-15