improve task 17