updated for new stream