Adds speed optimization for remapping