fixed part of task 2