add aliases and return statements