Tweaked tracking
Merge pull request #3618 from guardian/soulmates

Tweaked tracking