Improved modification of matches per event.