updated 10/11/17