Introduce buffers. Encounter bug. Fix bug in Helper.