adding debugging support