Improve the performance#5