revised some aliases and ST2