new matches logic improvements