Code changes for A&AI add/update

No match.