Done task 1 and 2