Quick update from AZ audit