HW 16 and 17 updated