Now uses a mode-map.