public version, and more tracking