Improve implementation.