Adding experimental remap function