Project AA changes