Adding the remap function from last year.