More AA updates