Change to use primary contacts