Remap to make switching between buffers easier