UNC and Davis agree on extension