updates for timeout and conditions