add aliases
merge to add aliases for work
fix aliases issues