tracing fixed up