New shortcut, improved comments.