Added more specialized functions and simplyfied the function names