Re-adding boundary buffers