improve tracking example (wip)