Changes for task 106