revert and add more tools