introduce time limit in Wait methods