Added more debug statements