Moved tracking to the logical place