Extended Task1 and added Task2