Some changes to AA done.