Use ID instead of tracking