move tracking into head, not header