Working on input remapping