changed some alias to functions, more flexable to use