Tracing improved