- Added more debug messages