Updated waitFor semantics