Change to the code to get scanning to work in the new tool with the tools controller changes.