rolled out buffering throughout the system