AES made minor changes