Circular buffer changes