better latency handling