On second thought, track latest API