rework cut buffers to match historic practice