Moved buffers into client