tweaked buffer control