updated aliases and functions;