stream part is revised