added group matching