- added shortcut functionality