adding logic for stream selection now