Added a remapper (Added = stole from MCPC).