Way better match handling on client