refactoring streamer detection. not complete yet