updated 5-23-18