added remapping arguments