updated 17 to work