Working on the buffer; imminent changes