Added more tracing.