Updated Task 1-4