- Removed hardcoded subjects from AA