WIP: changed correspondence selection