Change throttle to buffer