HW08 & 09 update