Tool improvements