Added attempt to remove latency