Updated for new customer layout