Improve execution time