Finally happy with trace