Small modifications and a new way of outputting the found streams