some modifs in task2