Buffers working better finally