Reduce waiting time