More buffer implementation