Switching to using vinyl buffers