Added options to disable it for certain streams

Rewrite