Made tracking more clever.