update to 16/17