aa.2, preliminary changes and corrections per Matt