Update tracing + comment