adapt to new match format