Removed any need for randomly sized buffers