some changes for task2