Applied Jude's modification - Trace feature