Added circullar buffer