implemented more tools