Never mind, checked again and for 2017 the changed parts are actually box 1 to 6 and 15 to 20, which probably means I need to amend....
