Changed the way latency is dealt with