Do we also want a cap on the buffer size here?