changed the way streams get activated/disactivated