Some debug messages added