Improved streamed version.