Some streaming code added