Updated messgaes for compatibility with AA
