Hotfix/stream editing

Hotfix/stream editing