Reworked match