Updated tool functions