Task2 almost done