Tools Functionality Improved