Add buffer for performance.