Added additional debugging