This version have working buffers