Improving the initial implementation.