Tweaked tracking

Better fits the commercial style