Final changes for IRI.