Add task 2 and 3