Modified some shortcuts