remove todo
remove todo
add infinite stream
refacto infinite stream