Shortcut changes
Case of null command already handled.
Shortcut changes