Removed the old version of extend_match