More changes..

The tool works after a close monitoring by Fiddle Sticks