Issue ITTE-692

Complete remake of task 6.