minor change of stream api