Andrew "Added field check for supplier"