Updated main tool code to version used for results produced recently