Last changes for task 2