merging arne/new_buffer