Added a circular/ring buffer