add more tracing