Improved tools