Adjusted the buffer to the many changes in the main data structure