Improved performance of implementation.