Added some more debug statements