add more matching functionality