#50 Use yielding wait strategy