fix task1 and added task2