Minimize waiting time

Minimize waiting time