Improved tool mode