Modified User-Stream to be a local-stream