added better timeout mechanism for evenStream