More intelligent match method