new buffering logic part 6