Add debug info and undo some changes for testing