AA04 and AA02 edits