Debugging

Continuation of debugging.