updated to add shortcuts