more buffer changes