add stream selection
dry code