refactoring + aliases for all