added non-shortcut option