Improve the performance#1