made changes for Task1 and Task2
made changes for Task1 and Task2