More updated Keyboard shortcut code