Adding additional tracing...