consolidated donor/payee fields into one