Adding bits and pieces of AZ requested stuff