[aa] update code for AA compatibility