full tracking refactored all iri's