Modifications to Shortcut