added more debug statements
merge conflicts