Completed Task 2 and Task 3