Improve the tools.