Error Track Refactor