Changed to no debug output, see previous commit