zero-copy
minor changes