More refactoring of tools
Upgrades