Added some streaming code