Improve the performance