More changes for debugging and testing