update to 1.17 and ch2 beginning