Add stream function
Remove stream, fix time