1. Removed duplicate verification and checking of stream id