adding buffer switching remap