Changed the allocation of the buffers