-- more changes to hook CIVI-7