Improve task4