Debugging updates #1