upgrade to streaming model