Wip 2.6 tracing