adding new stream support, in progress...