Improve the performance#2