Working on the tracing functionality