remap functionality partially added