Improving border-matching (unstable).