Debug messages added
Debug fix