Updated task 1 , part 1 and 2

Completed