Adding more debug messages