Completed Task 2 & 3