Added more debug statments