add shortcuts to improve performance