Adding the aa role. Also making some small changes to the fa role. wp-1256