new buffering logic part 5