Improve the implementation.