@jcredding much better "wait with timeout" mechanism, I think.