modified all code rejected on ShortcutRecorder