Even more tracing added...