changes for easier debug