Task 2 really done and working not like before