updated 17.0 and 17.1