AES define changed to use else notation