Made tracking even less stupid.