Using new remap function