Added latency correction
Merge conflict fix