Improve the number of functions calls