More waiting logic