latency check added
latency check added
fixed conflicts