Improved task 26