updated the stream that should be used
BUILD 24, minor redesign