first cut at AA changes

also optimised FA some