Adding more debug statements