Just moved a few things from tracing