Changes to tools