Added some more tools to the mix