Aes edits

NEXT