Improve the Tool