Added more debug messages