Edits to tracing