toolchoice added back