need to get the remap working