debugging

More changes