Wait more effectively