A - Updated to match recent changes