Task1 and 2 added