Task 2 update and complete