updated to handle new last name fields