new buffer structure
Merge branch 'v2' into box.scaling