Improves match updater (WIP)