merged in lates user-stream