Reduce the wait time to improve performance