Use rw instead of concat-stream, modernize