Added extra debug statements