Added tool selection
Added tool selection