Added more debug, more log