Working on a better shortcuts.