Task 2 finally done