Adding some more tools...