Remap boat too