Almost compted, need to check the stream surfaces