Final version: now the partners fields are actually useful.