C4 salah 217 stream interaction

Issue #217 
Issue #236 
@linabasheer  @hishamelgezeery  @hesham9 @mahmoudhashish 
Pleas review