Updating the system to actually use the remap array.