updated 6-1-2018