Starting working on the latency correction