Re: merging arne/new_buffer