Another TOOLS improvements