added some shortcuts (experimental)