buffer changes for the better