removed mac-key-mode and redo+