added buffer toggle