rejig relationship matchers