Changed names an improved the tracing