more tracing changes