add tracing and stepping