Added some quick updates for matching