US2222: Done with IDP changes