Reorder mappings
Tweak unite mappings