added client and modified tools