moved aliases into own file, s function