- Added more debug