Improving aliases
more improvments