Ref now handles an entire match