More changes for debug