Branch choose_tools - commit 2

1. Bug fix,