Shortcut improvement