Improvements to tools