Modify buffering