Update week 16 & 17

Update week 16 & 17

Contact