Streams more complicated, polls removed, ++