#2 reflected changes to the buffer schema