updated 10/18