Improved toolset