removed some remapping