No need to remap the arrows anymore, either