updated 4-2-18