Added extra debug messages