wip
Improve trace tool