Added debug code
More test code