Added more tracing statements