Fairly certain that AA is fixed, little more testing to do