improved tracing