Ongoing work on buffering