revamp matches again