More work on the tool.