- added buffer support