Add two more tools