optimize for stream
fix order
bump version