Removed aa.cls to facilitate review