added buffer map