work on remap functionality