added tool selection