Added task3/4