Task 3 and 4 added