possible tweak for streamed mode