Update to make the remapping work more quickly