update with AZ recommended corrections