It would be nice if this was not dependent on latency. No need to fix in this PR but if you feel like it go for it :).